illegitimate/illegitimate-bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge conflict fix

Browse Source 
Signed-off-by: Taken <taken@mairimashita.org>
This commit is contained in:
Taken
2024-08-12 22:25:53 +02:00
parent 87a51d24e2 f9f510b45a
commit eb4b0686bf
2 changed files with 168 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
package.json
View File

@@ -25,34 +25,35 @@
"author": "Taken",
"license": "GPL-3.0-only",
"dependencies": {
"@discord-player/extractor": "^4.5.1",
"@discord-player/extractor": "^4.4.7",
"@evan/opus": "^1.0.3",
"anilist": "^0.12.4",
"axios": "^1.7.3",
"anilist": "^0.12.3",
"axios": "^1.7.2",
"chalk": "^4.1.2",
"cron": "^3.1.7",
"discord-player": "^6.7.1",
"discord-player": "^6.6.10",
"discord.js": "^14.15.3",
"dotenv": "^16.4.5",
"ioredis": "^5.4.1",
"mongoose": "^8.5.2",
"mongoose": "^8.4.4",
"ms": "^2.1.3",
"pg": "^8.12.0",
"pretty-ms": "^9.1.0",
"pretty-ms": "^9.0.0",
"sequelize": "^6.37.3",
"youtube-ext": "^1.1.25"
},
"devDependencies": {
"@types/ms": "^0.7.34",
"@types/node": "^20.14.15",
"@types/node": "^20.14.9",
"@types/pg": "^8",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"concurrently": "^8.2.2",
"cross-env": "^7.0.3",
"eslint": "^8.57.0",
"ts-node": "^10.9.2",
"typescript": "^5.5.4"
"typescript": "^5.5.2"
},
"packageManager": "yarn@4.4.0"
}
"packageManager": "yarn@4.1.1"
}

212
yarn.lock
View File

@@ -37,9 +37,9 @@ __metadata:
languageName: node
linkType: hard
"@discord-player/extractor@npm:^4.5.1":
version: 4.5.1
resolution: "@discord-player/extractor@npm:4.5.1"
"@discord-player/extractor@npm:^4.4.7":
version: 4.4.7
resolution: "@discord-player/extractor@npm:4.4.7"
dependencies:
file-type: "npm:^16.5.4"
genius-lyrics: "npm:^4.4.6"
@@ -49,7 +49,7 @@ __metadata:
soundcloud.ts: "npm:^0.5.2"
spotify-url-info: "npm:^3.2.6"
youtube-sr: "npm:^4.3.9"
checksum: 10c0/a55884bf391e4053a711e474c4757029753cc0da1f307a9f827870b901f889d10388b301753d6aafce0aa5777d426a9e1f8b5403c9704029cdf12998ce81658a
checksum: 10c0/54f58ccecc8ad1520aeb699cdf0f7825fbe3e71ef4af222072a763ffcb9d52084f579cbeba3aa64d47fed9925bc9eda7f71e14c93569f040fd793177f333aa1e
languageName: node
linkType: hard
@@ -394,12 +394,12 @@ __metadata:
languageName: node
linkType: hard
"@types/node@npm:^20.14.15":
version: 20.14.15
resolution: "@types/node@npm:20.14.15"
"@types/node@npm:^20.14.9":
version: 20.14.9
resolution: "@types/node@npm:20.14.9"
dependencies:
undici-types: "npm:~5.26.4"
checksum: 10c0/093713db52dc544f3931a3dec9d7d8ef661f323e57becd083a7918c778cef1eb6ec32d1017bf5ade06bb06dc5c7551f4f4d749a14e40868cce44d51e54acd8ed
checksum: 10c0/911ffa444dc032897f4a23ed580c67903bd38ea1c5ec99b1d00fa10b83537a3adddef8e1f29710cbdd8e556a61407ed008e06537d834e48caf449ce59f87d387
languageName: node
linkType: hard
@@ -446,15 +446,15 @@ __metadata:
languageName: node
linkType: hard
"@typescript-eslint/eslint-plugin@npm:^7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/eslint-plugin@npm:7.18.0"
"@typescript-eslint/eslint-plugin@npm:^7.14.1":
version: 7.14.1
resolution: "@typescript-eslint/eslint-plugin@npm:7.14.1"
dependencies:
"@eslint-community/regexpp": "npm:^4.10.0"
"@typescript-eslint/scope-manager": "npm:7.18.0"
"@typescript-eslint/type-utils": "npm:7.18.0"
"@typescript-eslint/utils": "npm:7.18.0"
"@typescript-eslint/visitor-keys": "npm:7.18.0"
"@typescript-eslint/scope-manager": "npm:7.14.1"
"@typescript-eslint/type-utils": "npm:7.14.1"
"@typescript-eslint/utils": "npm:7.14.1"
"@typescript-eslint/visitor-keys": "npm:7.14.1"
graphemer: "npm:^1.4.0"
ignore: "npm:^5.3.1"
natural-compare: "npm:^1.4.0"
@@ -465,44 +465,44 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/2b37948fa1b0dab77138909dabef242a4d49ab93e4019d4ef930626f0a7d96b03e696cd027fa0087881c20e73be7be77c942606b4a76fa599e6b37f6985304c3
checksum: 10c0/7c2b9b98a38d78326b0ff7348fe001203eda10817ca7834a7a01f492ae7c2508469bbafaa933208d6459f8ff6685277685983cf6f6843e556a6ab2aa5c05080c
languageName: node
linkType: hard
"@typescript-eslint/parser@npm:^7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/parser@npm:7.18.0"
"@typescript-eslint/parser@npm:^7.14.1":
version: 7.14.1
resolution: "@typescript-eslint/parser@npm:7.14.1"
dependencies:
"@typescript-eslint/scope-manager": "npm:7.18.0"
"@typescript-eslint/types": "npm:7.18.0"
"@typescript-eslint/typescript-estree": "npm:7.18.0"
"@typescript-eslint/visitor-keys": "npm:7.18.0"
"@typescript-eslint/scope-manager": "npm:7.14.1"
"@typescript-eslint/types": "npm:7.14.1"
"@typescript-eslint/typescript-estree": "npm:7.14.1"
"@typescript-eslint/visitor-keys": "npm:7.14.1"
debug: "npm:^4.3.4"
peerDependencies:
eslint: ^8.56.0
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/370e73fca4278091bc1b657f85e7d74cd52b24257ea20c927a8e17546107ce04fbf313fec99aed0cc2a145ddbae1d3b12e9cc2c1320117636dc1281bcfd08059
checksum: 10c0/db3169d4852685cfb27db741c557f58a3e52104bfacc7621beb7c94ec36ac2a08d4e410ac86745db52f482fbfc87e99fa0a26c1d7a10d37a215cce85e1661f0e
languageName: node
linkType: hard
"@typescript-eslint/scope-manager@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/scope-manager@npm:7.18.0"
"@typescript-eslint/scope-manager@npm:7.14.1":
version: 7.14.1
resolution: "@typescript-eslint/scope-manager@npm:7.14.1"
dependencies:
"@typescript-eslint/types": "npm:7.18.0"
"@typescript-eslint/visitor-keys": "npm:7.18.0"
checksum: 10c0/038cd58c2271de146b3a594afe2c99290034033326d57ff1f902976022c8b0138ffd3cb893ae439ae41003b5e4bcc00cabf6b244ce40e8668f9412cc96d97b8e
"@typescript-eslint/types": "npm:7.14.1"
"@typescript-eslint/visitor-keys": "npm:7.14.1"
checksum: 10c0/f8c05a0d6f8de4cc19b90a4da308817c66e53f36f7ec48f6cc23e93c7399bc418643d8135933aaf5fc013199cbef0e1ea4223f5147db5ca401b239eaf087011e
languageName: node
linkType: hard
"@typescript-eslint/type-utils@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/type-utils@npm:7.18.0"
"@typescript-eslint/type-utils@npm:7.14.1":
version: 7.14.1
resolution: "@typescript-eslint/type-utils@npm:7.14.1"
dependencies:
"@typescript-eslint/typescript-estree": "npm:7.18.0"
"@typescript-eslint/utils": "npm:7.18.0"
"@typescript-eslint/typescript-estree": "npm:7.14.1"
"@typescript-eslint/utils": "npm:7.14.1"
debug: "npm:^4.3.4"
ts-api-utils: "npm:^1.3.0"
peerDependencies:
@@ -510,23 +510,23 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/ad92a38007be620f3f7036f10e234abdc2fdc518787b5a7227e55fd12896dacf56e8b34578723fbf9bea8128df2510ba8eb6739439a3879eda9519476d5783fd
checksum: 10c0/bd1c4a8db6273e24156fb10da2cbeb52b4eb03f819da193d4b6bd5a95db3b5524c6fe00d088308d8855b9ae60a3b82afa3a06e89982a09a8573561da960758fd
languageName: node
linkType: hard
"@typescript-eslint/types@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/types@npm:7.18.0"
checksum: 10c0/eb7371ac55ca77db8e59ba0310b41a74523f17e06f485a0ef819491bc3dd8909bb930120ff7d30aaf54e888167e0005aa1337011f3663dc90fb19203ce478054
"@typescript-eslint/types@npm:7.14.1":
version: 7.14.1
resolution: "@typescript-eslint/types@npm:7.14.1"
checksum: 10c0/5b7bda83c47a9b386482e63447c6b0ed7bd4e82eb43f11a180c6e2f3d2e7a2828f57bcbed82196ad761c49e363cccf4c81a89f1fc976e9f5f0a79dcc928fa2d2
languageName: node
linkType: hard
"@typescript-eslint/typescript-estree@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/typescript-estree@npm:7.18.0"
"@typescript-eslint/typescript-estree@npm:7.14.1":
version: 7.14.1
resolution: "@typescript-eslint/typescript-estree@npm:7.14.1"
dependencies:
"@typescript-eslint/types": "npm:7.18.0"
"@typescript-eslint/visitor-keys": "npm:7.18.0"
"@typescript-eslint/types": "npm:7.14.1"
"@typescript-eslint/visitor-keys": "npm:7.14.1"
debug: "npm:^4.3.4"
globby: "npm:^11.1.0"
is-glob: "npm:^4.0.3"
@@ -536,31 +536,31 @@ __metadata:
peerDependenciesMeta:
typescript:
optional: true
checksum: 10c0/0c7f109a2e460ec8a1524339479cf78ff17814d23c83aa5112c77fb345e87b3642616291908dcddea1e671da63686403dfb712e4a4435104f92abdfddf9aba81
checksum: 10c0/a8da9bcc4de3334a225424946abd99374de05c42098455419224bc0f46bb1b66115f8bd6ae268461294b90943ed4a407bcd255c0fa60eb76ba4cdc5fc7c20855
languageName: node
linkType: hard
"@typescript-eslint/utils@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/utils@npm:7.18.0"
"@typescript-eslint/utils@npm:7.14.1":
version: 7.14.1
resolution: "@typescript-eslint/utils@npm:7.14.1"
dependencies:
"@eslint-community/eslint-utils": "npm:^4.4.0"
"@typescript-eslint/scope-manager": "npm:7.18.0"
"@typescript-eslint/types": "npm:7.18.0"
"@typescript-eslint/typescript-estree": "npm:7.18.0"
"@typescript-eslint/scope-manager": "npm:7.14.1"
"@typescript-eslint/types": "npm:7.14.1"
"@typescript-eslint/typescript-estree": "npm:7.14.1"
peerDependencies:
eslint: ^8.56.0
checksum: 10c0/a25a6d50eb45c514469a01ff01f215115a4725fb18401055a847ddf20d1b681409c4027f349033a95c4ff7138d28c3b0a70253dfe8262eb732df4b87c547bd1e
checksum: 10c0/c7f635a3c2c6c085e1d51a52088e55cad9d7e1257b1f60378e5eeb6eb0871db027d42747e9ef60a2f557cf9dd68b2ce014d488d795db8f771506290b164b0e5a
languageName: node
linkType: hard
"@typescript-eslint/visitor-keys@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/visitor-keys@npm:7.18.0"
"@typescript-eslint/visitor-keys@npm:7.14.1":
version: 7.14.1
resolution: "@typescript-eslint/visitor-keys@npm:7.14.1"
dependencies:
"@typescript-eslint/types": "npm:7.18.0"
"@typescript-eslint/types": "npm:7.14.1"
eslint-visitor-keys: "npm:^3.4.3"
checksum: 10c0/538b645f8ff1d9debf264865c69a317074eaff0255e63d7407046176b0f6a6beba34a6c51d511f12444bae12a98c69891eb6f403c9f54c6c2e2849d1c1cb73c0
checksum: 10c0/39ac489990fcfdcee442f27658431a0eb44ccf694f701a45df2a108c47cea9582e0955bff0d449047549149385f72895a5d7e6c1622ece1fe32594b7cecb85f3
languageName: node
linkType: hard
@@ -622,12 +622,12 @@ __metadata:
languageName: node
linkType: hard
"anilist@npm:^0.12.4":
version: 0.12.4
resolution: "anilist@npm:0.12.4"
"anilist@npm:^0.12.3":
version: 0.12.3
resolution: "anilist@npm:0.12.3"
dependencies:
tslib: "npm:^2.6.2"
checksum: 10c0/6ec2f73df98a1b9be6cba6d6d3c872e35aa443530cb0bbad01ee4da7c2bf71de2839f30b18291cd4de7f014cd382302af8a73672a10b9edf70e31e28962cb324
checksum: 10c0/7be0f38739925337879a7f733f5f9d77454e580c2a9942030397229c59d6db45bdf6f9498a5601a5770fd235fd0944e7f5cf1304d61d4161f5fa9927c5ae2c9d
languageName: node
linkType: hard
@@ -675,14 +675,14 @@ __metadata:
languageName: node
linkType: hard
"axios@npm:^1.7.3":
version: 1.7.3
resolution: "axios@npm:1.7.3"
"axios@npm:^1.7.2":
version: 1.7.2
resolution: "axios@npm:1.7.2"
dependencies:
follow-redirects: "npm:^1.15.6"
form-data: "npm:^4.0.0"
proxy-from-env: "npm:^1.1.0"
checksum: 10c0/a18cbe559203efa05fb1fec2d1898e23bf6329bd2575784ee32aa11b5bbe1d54b9f472c49a261294125519cf62aa4fe5ef6e647bb7482eafc15bffe15ab314ce
checksum: 10c0/cbd47ce380fe045313364e740bb03b936420b8b5558c7ea36a4563db1258c658f05e40feb5ddd41f6633fdd96d37ac2a76f884dad599c5b0224b4c451b3fa7ae
languageName: node
linkType: hard
@@ -961,19 +961,20 @@ __metadata:
languageName: node
linkType: hard
"discord-player@npm:^6.7.1":
version: 6.7.1
resolution: "discord-player@npm:6.7.1"
"discord-player@npm:^6.6.10":
version: 6.6.10
resolution: "discord-player@npm:6.6.10"
dependencies:
"@discord-player/equalizer": "npm:^0.2.3"
"@discord-player/ffmpeg": "npm:^0.1.0"
"@discord-player/utils": "npm:^0.2.2"
"@web-scrobbler/metadata-filter": "npm:^3.1.0"
discord-voip: "npm:^0.1.3"
ip: "npm:^2.0.1"
libsodium-wrappers: "npm:^0.7.13"
peerDependencies:
"@discord-player/extractor": ^4.5.0
checksum: 10c0/e5843e77c14f0807e4f232b8279ece7eba827a33c7b1f37c069e0451d5841590b9a77d112cc4333826a9d475695f01cc0ca825e8a76a74062668ce5e908759ec
"@discord-player/extractor": ^4.4.7
checksum: 10c0/67766b907e94f030b9e39639b046713075f2d303c077e761cf1e8ec76fb7e631d0ee50f89148f402166ad1deaacafd50d4bc80eb216c2850a4cd9ca32240a704
languageName: node
linkType: hard
@@ -1476,31 +1477,31 @@ __metadata:
version: 0.0.0-use.local
resolution: "illegitimate-bot@workspace:."
dependencies:
"@discord-player/extractor": "npm:^4.5.1"
"@discord-player/extractor": "npm:^4.4.7"
"@evan/opus": "npm:^1.0.3"
"@types/ms": "npm:^0.7.34"
"@types/node": "npm:^20.14.15"
"@types/node": "npm:^20.14.9"
"@types/pg": "npm:^8"
"@typescript-eslint/eslint-plugin": "npm:^7.18.0"
"@typescript-eslint/parser": "npm:^7.18.0"
anilist: "npm:^0.12.4"
axios: "npm:^1.7.3"
"@typescript-eslint/eslint-plugin": "npm:^7.14.1"
"@typescript-eslint/parser": "npm:^7.14.1"
anilist: "npm:^0.12.3"
axios: "npm:^1.7.2"
chalk: "npm:^4.1.2"
concurrently: "npm:^8.2.2"
cron: "npm:^3.1.7"
cross-env: "npm:^7.0.3"
discord-player: "npm:^6.7.1"
discord-player: "npm:^6.6.10"
discord.js: "npm:^14.15.3"
dotenv: "npm:^16.4.5"
eslint: "npm:^8.57.0"
ioredis: "npm:^5.4.1"
mongoose: "npm:^8.5.2"
mongoose: "npm:^8.4.4"
ms: "npm:^2.1.3"
pg: "npm:^8.12.0"
pretty-ms: "npm:^9.1.0"
pretty-ms: "npm:^9.0.0"
sequelize: "npm:^6.37.3"
ts-node: "npm:^10.9.2"
typescript: "npm:^5.5.4"
typescript: "npm:^5.5.2"
youtube-ext: "npm:^1.1.25"
languageName: unknown
linkType: soft
@@ -1563,6 +1564,13 @@ __metadata:
languageName: node
linkType: hard
"ip@npm:^2.0.1":
version: 2.0.1
resolution: "ip@npm:2.0.1"
checksum: 10c0/cab8eb3e88d0abe23e4724829621ec4c4c5cb41a7f936a2e626c947128c1be16ed543448d42af7cca95379f9892bfcacc1ccd8d09bc7e8bea0e86d492ce33616
languageName: node
linkType: hard
"is-extglob@npm:^2.1.1":
version: 2.1.1
resolution: "is-extglob@npm:2.1.1"
@@ -1849,9 +1857,9 @@ __metadata:
languageName: node
linkType: hard
"mongodb@npm:6.7.0":
version: 6.7.0
resolution: "mongodb@npm:6.7.0"
"mongodb@npm:6.6.2":
version: 6.6.2
resolution: "mongodb@npm:6.6.2"
dependencies:
"@mongodb-js/saslprep": "npm:^1.1.5"
bson: "npm:^6.7.0"
@@ -1879,22 +1887,22 @@ __metadata:
optional: true
socks:
optional: true
checksum: 10c0/4a8a3781b6c4851dc211df559ac2b82b62f6c1bcc0dcd14c86264891221c081436d03254cb257d0da696efbba9f426919c0e6a9e14398faac4a93db3c1c8d335
checksum: 10c0/c07bc5339322325f82bd598c782412aa5c7adbf0d8f3d9ab530d1e6578901008def2185fb54e755e6a65592ad94389dc5f5dab5bac5fa4174934dcb67ad1dd2d
languageName: node
linkType: hard
"mongoose@npm:^8.5.2":
version: 8.5.2
resolution: "mongoose@npm:8.5.2"
"mongoose@npm:^8.4.4":
version: 8.4.4
resolution: "mongoose@npm:8.4.4"
dependencies:
bson: "npm:^6.7.0"
kareem: "npm:2.6.3"
mongodb: "npm:6.7.0"
mongodb: "npm:6.6.2"
mpath: "npm:0.9.0"
mquery: "npm:5.0.0"
ms: "npm:2.1.3"
sift: "npm:17.1.3"
checksum: 10c0/9c0357751a2620b9bdc48bde437b54ad11c97e9e3cd0f10c0c144f02c4044638c80f21bcfa62a57789864586af9243cf0f3ec003da390a2e7f62ccc6d3ebbc26
checksum: 10c0/0cdf0fc739e1c14b510dd0f2c46639194fea56017c358f8537645d65bb2bb89354d09a0a18b6615d2aaf042230075913d583cdda921cbcbc6d279145fcc267eb
languageName: node
linkType: hard
@@ -2269,12 +2277,12 @@ __metadata:
languageName: node
linkType: hard
"pretty-ms@npm:^9.1.0":
version: 9.1.0
resolution: "pretty-ms@npm:9.1.0"
"pretty-ms@npm:^9.0.0":
version: 9.0.0
resolution: "pretty-ms@npm:9.0.0"
dependencies:
parse-ms: "npm:^4.0.0"
checksum: 10c0/fd111aad8800a04dfd654e6016da69bdaa6fc6a4c280f8e727cffd8b5960558e94942f1a94d4aa6e4d179561a0fbb0366a9ebe0ccefbbb0f8ff853b129cdefb9
checksum: 10c0/ba4a2acd1fe92a1c629e5cdeb555d7fa344ae9920e20fa00e8ac1db61b8d3dff8638ffc70c7569f681e375df68c9f31291c2c1912cefd02ef1b1bdd0861a4aed
languageName: node
linkType: hard
@@ -2789,23 +2797,23 @@ __metadata:
languageName: node
linkType: hard
"typescript@npm:^5.5.4":
version: 5.5.4
resolution: "typescript@npm:5.5.4"
"typescript@npm:^5.5.2":
version: 5.5.2
resolution: "typescript@npm:5.5.2"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10c0/422be60f89e661eab29ac488c974b6cc0a660fb2228003b297c3d10c32c90f3bcffc1009b43876a082515a3c376b1eefcce823d6e78982e6878408b9a923199c
checksum: 10c0/8ca39b27b5f9bd7f32db795045933ab5247897660627251e8254180b792a395bf061ea7231947d5d7ffa5cb4cc771970fd4ef543275f9b559f08c9325cccfce3
languageName: node
linkType: hard
"typescript@patch:typescript@npm%3A^5.5.4#optional!builtin<compat/typescript>":
version: 5.5.4
resolution: "typescript@patch:typescript@npm%3A5.5.4#optional!builtin<compat/typescript>::version=5.5.4&hash=379a07"
"typescript@patch:typescript@npm%3A^5.5.2#optional!builtin<compat/typescript>":
version: 5.5.2
resolution: "typescript@patch:typescript@npm%3A5.5.2#optional!builtin<compat/typescript>::version=5.5.2&hash=5adc0c"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
checksum: 10c0/73409d7b9196a5a1217b3aaad929bf76294d3ce7d6e9766dd880ece296ee91cf7d7db6b16c6c6c630ee5096eccde726c0ef17c7dfa52b01a243e57ae1f09ef07
checksum: 10c0/6721ac8933a70c252d7b640b345792e103d881811ff660355617c1836526dbb71c2044e2e77a8823fb3570b469f33276875a4cab6d3c4de4ae7d7ee1c3074ae4
languageName: node
linkType: hard