Merge conflict fix

Signed-off-by: Taken <taken@mairimashita.org>
2024-08-12 22:25:53 +02:00
parent 87a51d24e2 f9f510b45a
commit eb4b0686bf
2 changed files with 168 additions and 159 deletions
--- a/package.json
+++ b/package.json
@@ -1,58 +1,59 @@
 {
-    "name": "illegitimate-bot",
-    "displayName": "Illegitimate Bot",
-    "version": "1.0.0",
-    "description": "",
-    "main": "src/index.ts",
-    "repository": {
-        "type": "git",
-        "url": "https://gitlab.com/illegitimate/illegitimate-bot"
-    },
-    "homepage": "https://gitlab.com/illegitimate/illegitimate-bot",
-    "scripts": {
-        "start": "node dist/index.js",
-        "build": "tsc",
-        "watch": "tsc -w",
-        "dev": "conc --names \"TSC,BOT\" --prefix-colors \"blue, magenta\" \"tsc -w\" \"yarn dev:js\"",
-        "dev:ts": "nodemon --config nodemon.json src/index.ts",
-        "dev:js": "nodemon --config nodemon-js.json dist/index.js",
-        "dev:build": "cross-env NODE_PATH=src/ \"ts-node scripts/dev-deploy.ts\"",
-        "dev:delete": "ts-node scripts/delete-commands.ts",
-        "lint": "eslint src",
-        "lint:fix": "eslint --fix src",
-        "prod:build": "cross-env NODE_PATH=src/ \"ts-node scripts/deploy-commands.ts\""
-    },
-    "author": "Taken",
-    "license": "GPL-3.0-only",
-    "dependencies": {
-        "@discord-player/extractor": "^4.5.1",
-        "@evan/opus": "^1.0.3",
-        "anilist": "^0.12.4",
-        "axios": "^1.7.3",
-        "chalk": "^4.1.2",
-        "cron": "^3.1.7",
-        "discord-player": "^6.7.1",
-        "discord.js": "^14.15.3",
-        "dotenv": "^16.4.5",
-        "ioredis": "^5.4.1",
-        "mongoose": "^8.5.2",
-        "ms": "^2.1.3",
-        "pg": "^8.12.0",
-        "pretty-ms": "^9.1.0",
-        "sequelize": "^6.37.3",
-        "youtube-ext": "^1.1.25"
-    },
-    "devDependencies": {
-        "@types/ms": "^0.7.34",
-        "@types/node": "^20.14.15",
-        "@types/pg": "^8",
-        "@typescript-eslint/eslint-plugin": "^7.18.0",
-        "@typescript-eslint/parser": "^7.18.0",
-        "concurrently": "^8.2.2",
-        "cross-env": "^7.0.3",
-        "eslint": "^8.57.0",
-        "ts-node": "^10.9.2",
-        "typescript": "^5.5.4"
-    },
-    "packageManager": "yarn@4.4.0"
-}
+        "name": "illegitimate-bot",
+        "displayName": "Illegitimate Bot",
+        "version": "1.0.0",
+        "description": "",
+        "main": "src/index.ts",
+        "repository": {
+            "type": "git",
+            "url": "https://gitlab.com/illegitimate/illegitimate-bot"
+        },
+        "homepage": "https://gitlab.com/illegitimate/illegitimate-bot",
+        "scripts": {
+            "start": "node dist/index.js",
+            "build": "tsc",
+            "watch": "tsc -w",
+            "dev": "conc --names \"TSC,BOT\" --prefix-colors \"blue, magenta\" \"tsc -w\" \"yarn dev:js\"",
+            "dev:ts": "nodemon --config nodemon.json src/index.ts",
+            "dev:js": "nodemon --config nodemon-js.json dist/index.js",
+            "dev:build": "cross-env NODE_PATH=src/ \"ts-node scripts/dev-deploy.ts\"",
+            "dev:delete": "ts-node scripts/delete-commands.ts",
+            "lint": "eslint src",
+            "lint:fix": "eslint --fix src",
+            "prod:build": "cross-env NODE_PATH=src/ \"ts-node scripts/deploy-commands.ts\""
+        },
+        "author": "Taken",
+        "license": "GPL-3.0-only",
+        "dependencies": {
+            "@discord-player/extractor": "^4.4.7",
+            "@evan/opus": "^1.0.3",
+            "anilist": "^0.12.3",
+            "axios": "^1.7.2",
+            "chalk": "^4.1.2",
+            "cron": "^3.1.7",
+            "discord-player": "^6.6.10",
+            "discord.js": "^14.15.3",
+            "dotenv": "^16.4.5",
+            "ioredis": "^5.4.1",
+            "mongoose": "^8.4.4",
+            "ms": "^2.1.3",
+            "pg": "^8.12.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.9",
+            "@types/pg": "^8",
+            "@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.2"
+        },
+        "packageManager": "yarn@4.1.1"
+    }
+