aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIRONM00N <64110067+IRONM00N@users.noreply.github.com>2021-06-29 10:06:01 -0400
committerIRONM00N <64110067+IRONM00N@users.noreply.github.com>2021-06-29 10:06:01 -0400
commitb6555ffff0d1c6351ddf0ad8aa65859e07dc5127 (patch)
tree279a1493f69554e905ebe4c1cd5e56f0d88b9443
parentdd3451e96cbf9d34589f00eb3b41dc9b958fd5f4 (diff)
downloadtanzanite-b6555ffff0d1c6351ddf0ad8aa65859e07dc5127.tar.gz
tanzanite-b6555ffff0d1c6351ddf0ad8aa65859e07dc5127.tar.bz2
tanzanite-b6555ffff0d1c6351ddf0ad8aa65859e07dc5127.zip
Revert Typescript Version upgrade -> it breaks sequelize
-rwxr-xr-x.pnp.js64
-rw-r--r--.vscode/extensions.json16
-rw-r--r--.vscode/settings.json184
-rw-r--r--.yarn/sdks/typescript/package.json2
-rw-r--r--.yarnrc.yml2
-rw-r--r--package.json11
-rw-r--r--src/commands/dev/eval.ts6
-rw-r--r--src/commands/moulberry-bush/rule.ts2
-rw-r--r--src/lib/extensions/BushClientUtil.ts28
-rw-r--r--yarn.lock54
10 files changed, 199 insertions, 170 deletions
diff --git a/.pnp.js b/.pnp.js
index fd92964..4cf4865 100755
--- a/.pnp.js
+++ b/.pnp.js
@@ -47,10 +47,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["body-parser", "npm:1.19.0"],
["chalk", "npm:4.1.1"],
["common-tags", "npm:1.8.0"],
- ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=63fc4b741c4ff5c4133cd842360ec0196a54efe0"],
+ ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=36611850e2ebe5458be535448a2f4df30d3680e3"],
["discord-api-types", "npm:0.18.1"],
- ["discord.js", "npm:13.0.0-dev.e37ef3af2151e556527ccd8e98ec531bdcc0ed70"],
- ["esbuild", "npm:0.12.11"],
+ ["discord.js", "npm:13.0.0-dev.5ad83a6a65e5944ceb3a41fee2df40ba1f5b03e4"],
+ ["esbuild", "npm:0.12.12"],
["eslint", "npm:7.29.0"],
["eslint-config-prettier", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:8.3.0"],
["got", "npm:11.8.2"],
@@ -61,7 +61,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["rimraf", "npm:3.0.2"],
["sequelize", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:6.6.4"],
["source-map-support", "npm:0.5.19"],
- ["typescript", "patch:typescript@npm%3A4.3.4#builtin<compat/typescript>::version=4.3.4&hash=ddfc1b"],
+ ["typescript", "patch:typescript@npm%3A4.2.4#builtin<compat/typescript>::version=4.2.4&hash=ddfc1b"],
["uuid", "npm:8.3.2"]
],
"linkType": "SOFT",
@@ -128,7 +128,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["discord-api-types", "npm:0.18.1"],
["prism-media", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:1.3.1"],
["tiny-typed-emitter", "npm:2.0.3"],
- ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.0"]
+ ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.1"]
],
"linkType": "HARD",
}]
@@ -412,7 +412,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["regexpp", "npm:3.2.0"],
["semver", "npm:7.3.5"],
["tsutils", "virtual:9f5716905056c6d1160d1baf37f1bd826fe60510c0298b19a06cecc44a9b2f7864243adc629d80ad75b9a80def5139aff7ac08923a4b630c42e82aad55c5657f#npm:3.21.0"],
- ["typescript", "patch:typescript@npm%3A4.3.4#builtin<compat/typescript>::version=4.3.4&hash=ddfc1b"]
+ ["typescript", "patch:typescript@npm%3A4.2.4#builtin<compat/typescript>::version=4.2.4&hash=ddfc1b"]
],
"packagePeers": [
"@types/eslint",
@@ -470,7 +470,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["@typescript-eslint/typescript-estree", "virtual:0dc5aa9f6f0f733d6c5540fb4e88f0a87a2e2803a976d019384f6d94d38591e0499786bdfa77aa81af9beb4356234f85a21e2901f1bfbc3ea45729114940d517#npm:4.28.1"],
["debug", "virtual:f8b688e6542ef635eefae684748f7db5410cd1803b0f43b02ae3ebd860a79349e9ae07146ce05bdfb5fca9536ad9dbe230ed7f4c2f2ffe26893f1f1b0b8700e7#npm:4.3.2"],
["eslint", "npm:7.29.0"],
- ["typescript", "patch:typescript@npm%3A4.3.4#builtin<compat/typescript>::version=4.3.4&hash=ddfc1b"]
+ ["typescript", "patch:typescript@npm%3A4.2.4#builtin<compat/typescript>::version=4.2.4&hash=ddfc1b"]
],
"packagePeers": [
"@types/eslint",
@@ -519,7 +519,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["is-glob", "npm:4.0.1"],
["semver", "npm:7.3.5"],
["tsutils", "virtual:9f5716905056c6d1160d1baf37f1bd826fe60510c0298b19a06cecc44a9b2f7864243adc629d80ad75b9a80def5139aff7ac08923a4b630c42e82aad55c5657f#npm:3.21.0"],
- ["typescript", "patch:typescript@npm%3A4.3.4#builtin<compat/typescript>::version=4.3.4&hash=ddfc1b"]
+ ["typescript", "patch:typescript@npm%3A4.2.4#builtin<compat/typescript>::version=4.2.4&hash=ddfc1b"]
],
"packagePeers": [
"typescript"
@@ -785,10 +785,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["body-parser", "npm:1.19.0"],
["chalk", "npm:4.1.1"],
["common-tags", "npm:1.8.0"],
- ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=63fc4b741c4ff5c4133cd842360ec0196a54efe0"],
+ ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=36611850e2ebe5458be535448a2f4df30d3680e3"],
["discord-api-types", "npm:0.18.1"],
- ["discord.js", "npm:13.0.0-dev.e37ef3af2151e556527ccd8e98ec531bdcc0ed70"],
- ["esbuild", "npm:0.12.11"],
+ ["discord.js", "npm:13.0.0-dev.5ad83a6a65e5944ceb3a41fee2df40ba1f5b03e4"],
+ ["esbuild", "npm:0.12.12"],
["eslint", "npm:7.29.0"],
["eslint-config-prettier", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:8.3.0"],
["got", "npm:11.8.2"],
@@ -799,7 +799,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["rimraf", "npm:3.0.2"],
["sequelize", "virtual:d7ae587dddcefd495158f5c047acecbca3203324d75e681c7d8657c07f901f74e152f0b39978f7428d3a91daad7b5020c47ece28de69c22fcbd49d04707bf15c#npm:6.6.4"],
["source-map-support", "npm:0.5.19"],
- ["typescript", "patch:typescript@npm%3A4.3.4#builtin<compat/typescript>::version=4.3.4&hash=ddfc1b"],
+ ["typescript", "patch:typescript@npm%3A4.2.4#builtin<compat/typescript>::version=4.2.4&hash=ddfc1b"],
["uuid", "npm:8.3.2"]
],
"linkType": "SOFT",
@@ -1059,10 +1059,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]
]],
["discord-akairo", [
- ["https://github.com/NotEnoughUpdates/discord-akairo.git#commit=63fc4b741c4ff5c4133cd842360ec0196a54efe0", {
- "packageLocation": "./.yarn/unplugged/discord-akairo-https-7b67b686b9/node_modules/discord-akairo/",
+ ["https://github.com/NotEnoughUpdates/discord-akairo.git#commit=36611850e2ebe5458be535448a2f4df30d3680e3", {
+ "packageLocation": "./.yarn/unplugged/discord-akairo-https-9825cfb3ed/node_modules/discord-akairo/",
"packageDependencies": [
- ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=63fc4b741c4ff5c4133cd842360ec0196a54efe0"]
+ ["discord-akairo", "https://github.com/NotEnoughUpdates/discord-akairo.git#commit=36611850e2ebe5458be535448a2f4df30d3680e3"]
],
"linkType": "HARD",
}]
@@ -1084,10 +1084,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]
]],
["discord.js", [
- ["npm:13.0.0-dev.e37ef3af2151e556527ccd8e98ec531bdcc0ed70", {
- "packageLocation": "./.yarn/unplugged/discord.js-npm-13.0.0-dev.e37ef3af2151e556527ccd8e98ec531bdcc0ed70-fd350888c9/node_modules/discord.js/",
+ ["npm:13.0.0-dev.5ad83a6a65e5944ceb3a41fee2df40ba1f5b03e4", {
+ "packageLocation": "./.yarn/unplugged/discord.js-npm-13.0.0-dev.5ad83a6a65e5944ceb3a41fee2df40ba1f5b03e4-a4083f1125/node_modules/discord.js/",
"packageDependencies": [
- ["discord.js", "npm:13.0.0-dev.e37ef3af2151e556527ccd8e98ec531bdcc0ed70"],
+ ["discord.js", "npm:13.0.0-dev.5ad83a6a65e5944ceb3a41fee2df40ba1f5b03e4"],
["@discordjs/collection", "npm:0.1.6"],
["@discordjs/form-data", "npm:3.0.1"],
["@sapphire/async-queue", "npm:1.1.4"],
@@ -1095,7 +1095,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["abort-controller", "npm:3.0.0"],
["discord-api-types", "npm:0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e"],
["node-fetch", "npm:2.6.1"],
- ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.0"]
+ ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.1"]
],
"linkType": "HARD",
}]
@@ -1158,10 +1158,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]
]],
["esbuild", [
- ["npm:0.12.11", {
- "packageLocation": "./.yarn/unplugged/esbuild-npm-0.12.11-e6f15d6b01/node_modules/esbuild/",
+ ["npm:0.12.12", {
+ "packageLocation": "./.yarn/unplugged/esbuild-npm-0.12.12-3705093b39/node_modules/esbuild/",
"packageDependencies": [
- ["esbuild", "npm:0.12.11"]
+ ["esbuild", "npm:0.12.12"]
],
"linkType": "HARD",
}]
@@ -2818,7 +2818,7 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
["tsutils", "virtual:9f5716905056c6d1160d1baf37f1bd826fe60510c0298b19a06cecc44a9b2f7864243adc629d80ad75b9a80def5139aff7ac08923a4b630c42e82aad55c5657f#npm:3.21.0"],
["@types/typescript", null],
["tslib", "npm:1.14.1"],
- ["typescript", "patch:typescript@npm%3A4.3.4#builtin<compat/typescript>::version=4.3.4&hash=ddfc1b"]
+ ["typescript", "patch:typescript@npm%3A4.2.4#builtin<compat/typescript>::version=4.2.4&hash=ddfc1b"]
],
"packagePeers": [
"@types/typescript",
@@ -2858,10 +2858,10 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]
]],
["typescript", [
- ["patch:typescript@npm%3A4.3.4#builtin<compat/typescript>::version=4.3.4&hash=ddfc1b", {
- "packageLocation": "./.yarn/cache/typescript-patch-e441ed4208-c8766e84a4.zip/node_modules/typescript/",
+ ["patch:typescript@npm%3A4.2.4#builtin<compat/typescript>::version=4.2.4&hash=ddfc1b", {
+ "packageLocation": "./.yarn/cache/typescript-patch-4ce0948b1e-64658fdf27.zip/node_modules/typescript/",
"packageDependencies": [
- ["typescript", "patch:typescript@npm%3A4.3.4#builtin<compat/typescript>::version=4.3.4&hash=ddfc1b"]
+ ["typescript", "patch:typescript@npm%3A4.2.4#builtin<compat/typescript>::version=4.2.4&hash=ddfc1b"]
],
"linkType": "HARD",
}]
@@ -2969,17 +2969,17 @@ function $$SETUP_STATE(hydrateRuntimeState, basePath) {
}]
]],
["ws", [
- ["npm:7.5.0", {
- "packageLocation": "./.yarn/cache/ws-npm-7.5.0-2736efb7e8-f9ac36310e.zip/node_modules/ws/",
+ ["npm:7.5.1", {
+ "packageLocation": "./.yarn/cache/ws-npm-7.5.1-4a7f17d1e0-e56541a73c.zip/node_modules/ws/",
"packageDependencies": [
- ["ws", "npm:7.5.0"]
+ ["ws", "npm:7.5.1"]
],
"linkType": "SOFT",
}],
- ["virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.0", {
- "packageLocation": "./.yarn/$$virtual/ws-virtual-61252c08ac/0/cache/ws-npm-7.5.0-2736efb7e8-f9ac36310e.zip/node_modules/ws/",
+ ["virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.1", {
+ "packageLocation": "./.yarn/$$virtual/ws-virtual-a44dacb6f5/0/cache/ws-npm-7.5.1-4a7f17d1e0-e56541a73c.zip/node_modules/ws/",
"packageDependencies": [
- ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.0"],
+ ["ws", "virtual:275bceca0f79f8e7aeb7f77acb5a6bd201e7eea264e9dfd8dcc0bcf35691357327303c09557dfc1495b9a1f8e9cf8278133d234783570df6cb70a249778f3198#npm:7.5.1"],
["@types/bufferutil", null],
["@types/utf-8-validate", null],
["bufferutil", null],
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 94a8b5c..d3de569 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,10 +1,10 @@
{
- "recommendations": [
- "aaron-bond.better-comments",
- "arcanis.vscode-zipfs",
- "dbaeumer.vscode-eslint",
- "eamodio.gitlens",
- "esbenp.prettier-vscode",
- "streetsidesoftware.code-spell-checker"
- ]
+ "recommendations": [
+ "aaron-bond.better-comments",
+ "arcanis.vscode-zipfs",
+ "dbaeumer.vscode-eslint",
+ "eamodio.gitlens",
+ "esbenp.prettier-vscode",
+ "streetsidesoftware.code-spell-checker"
+ ]
}
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 31f0057..02155ed 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,94 +1,94 @@
{
- "files.exclude": {
- "**/.git": true,
- "**/.svn": true,
- "**/.hg": true,
- "**/CVS": true,
- "**/.DS_Store": true,
- "node_modules": true,
- // "dist": true,
- ".pnp.js": true
- },
- "javascript.preferences.importModuleSpecifier": "project-relative",
- "typescript.preferences.importModuleSpecifier": "project-relative",
- "typescript.preferences.importModuleSpecifierEnding": "minimal",
- "search.exclude": {
- "**/.yarn": true,
- "**/.pnp.*": true
- },
- "editor.codeActionsOnSave": {
- "source.organizeImports": true,
- "source.fixAll.eslint": true,
- "source.format": true
- },
- "editor.formatOnSave": true,
- "diffEditor.wordWrap": "on",
- "editor.insertSpaces": false,
- "editor.wordWrap": "on",
- "editor.tabSize": 2,
- "prettier.configPath": "package.json",
- "prettier.prettierPath": ".yarn/sdks/prettier/index.js",
- "prettier.withNodeModules": true,
- "prettier.useEditorConfig": false,
- "eslint.nodePath": ".yarn/sdks",
- "typescript.tsdk": ".yarn/sdks/typescript/lib",
- "typescript.enablePromptUseWorkspaceTsdk": true,
- "better-comments.highlightPlainText": false,
- "better-comments.multilineComments": true,
- "better-comments.tags": [
- {
- "tag": "!",
- "color": "#FF2D00",
- "strikethrough": false,
- "underline": false,
- "backgroundColor": "transparent",
- "bold": false,
- "italic": false
- },
- {
- "tag": "?",
- "color": "#3498DB",
- "strikethrough": false,
- "underline": false,
- "backgroundColor": "transparent",
- "bold": false,
- "italic": false
- },
- {
- "tag": "#",
- "color": "#f003fc",
- "strikethrough": false,
- "underline": false,
- "backgroundColor": "transparent",
- "bold": false,
- "italic": false
- },
- {
- "tag": "//",
- "color": "#474747",
- "strikethrough": true,
- "underline": false,
- "backgroundColor": "transparent",
- "bold": false,
- "italic": false
- },
- {
- "tag": "todo",
- "color": "#FF8C00",
- "strikethrough": false,
- "underline": false,
- "backgroundColor": "transparent",
- "bold": false,
- "italic": false
- },
- {
- "tag": "*",
- "color": "#98C379",
- "strikethrough": false,
- "underline": false,
- "backgroundColor": "transparent",
- "bold": false,
- "italic": false
- }
- ]
+ "files.exclude": {
+ "**/.git": true,
+ "**/.svn": true,
+ "**/.hg": true,
+ "**/CVS": true,
+ "**/.DS_Store": true,
+ "node_modules": true,
+ // "dist": true,
+ ".pnp.js": true
+ },
+ "javascript.preferences.importModuleSpecifier": "project-relative",
+ "typescript.preferences.importModuleSpecifier": "project-relative",
+ "typescript.preferences.importModuleSpecifierEnding": "minimal",
+ "search.exclude": {
+ "**/.yarn": true,
+ "**/.pnp.*": true
+ },
+ "editor.codeActionsOnSave": {
+ "source.organizeImports": true,
+ "source.fixAll.eslint": true,
+ "source.format": true
+ },
+ "editor.formatOnSave": true,
+ "diffEditor.wordWrap": "on",
+ "editor.insertSpaces": false,
+ "editor.wordWrap": "on",
+ "editor.tabSize": 2,
+ "prettier.configPath": "package.json",
+ "prettier.prettierPath": ".yarn/sdks/prettier/index.js",
+ "prettier.withNodeModules": true,
+ "prettier.useEditorConfig": false,
+ "eslint.nodePath": ".yarn/sdks",
+ "typescript.tsdk": ".yarn/sdks/typescript/lib",
+ "typescript.enablePromptUseWorkspaceTsdk": true,
+ "better-comments.highlightPlainText": false,
+ "better-comments.multilineComments": true,
+ "better-comments.tags": [
+ {
+ "tag": "!",
+ "color": "#FF2D00",
+ "strikethrough": false,
+ "underline": false,
+ "backgroundColor": "transparent",
+ "bold": false,
+ "italic": false
+ },
+ {
+ "tag": "?",
+ "color": "#3498DB",
+ "strikethrough": false,
+ "underline": false,
+ "backgroundColor": "transparent",
+ "bold": false,
+ "italic": false
+ },
+ {
+ "tag": "#",
+ "color": "#f003fc",
+ "strikethrough": false,
+ "underline": false,
+ "backgroundColor": "transparent",
+ "bold": false,
+ "italic": false
+ },
+ {
+ "tag": "//",
+ "color": "#474747",
+ "strikethrough": true,
+ "underline": false,
+ "backgroundColor": "transparent",
+ "bold": false,
+ "italic": false
+ },
+ {
+ "tag": "todo",
+ "color": "#FF8C00",
+ "strikethrough": false,
+ "underline": false,
+ "backgroundColor": "transparent",
+ "bold": false,
+ "italic": false
+ },
+ {
+ "tag": "*",
+ "color": "#98C379",
+ "strikethrough": false,
+ "underline": false,
+ "backgroundColor": "transparent",
+ "bold": false,
+ "italic": false
+ }
+ ]
}
diff --git a/.yarn/sdks/typescript/package.json b/.yarn/sdks/typescript/package.json
index 1ae6045..27270c7 100644
--- a/.yarn/sdks/typescript/package.json
+++ b/.yarn/sdks/typescript/package.json
@@ -1,6 +1,6 @@
{
"name": "typescript",
- "version": "4.3.4-pnpify",
+ "version": "4.2.4-pnpify",
"main": "./lib/typescript.js",
"type": "commonjs"
}
diff --git a/.yarnrc.yml b/.yarnrc.yml
index a922e45..36600c5 100644
--- a/.yarnrc.yml
+++ b/.yarnrc.yml
@@ -1,5 +1,5 @@
plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
- spec: '@yarnpkg/plugin-typescript'
+ spec: "@yarnpkg/plugin-typescript"
yarnPath: .yarn/releases/yarn-2.4.2.cjs
diff --git a/package.json b/package.json
index b69d0e5..875b52e 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"prettier": "^2.3.2",
"rimraf": "^3.0.2",
"source-map-support": "^0.5.19",
- "typescript": "^4.3.4"
+ "typescript": "4.2.4"
},
"dependencies": {
"@discordjs/voice": "^0.4.0",
@@ -42,9 +42,9 @@
"discord.js": "dev",
"got": "^11.8.2",
"moment": "^2.29.1",
- "pg": "^8.6.0",
- "pg-hstore": "^2.3.4",
- "sequelize": "^6.6.4",
+ "pg": "^8.5.1",
+ "pg-hstore": "^2.3.3",
+ "sequelize": "^6.5.0",
"uuid": "^8.3.2"
},
"eslintConfig": {
@@ -99,6 +99,9 @@
"discord-akairo@8.2.2": {
"unplugged": true
},
+ "discord.js@13.0.0-dev.5ad83a6a65e5944ceb3a41fee2df40ba1f5b03e4": {
+ "unplugged": true
+ },
"discord.js@13.0.0-dev.e37ef3af2151e556527ccd8e98ec531bdcc0ed70": {
"unplugged": true
},
diff --git a/src/commands/dev/eval.ts b/src/commands/dev/eval.ts
index 7f6a713..a1c2d87 100644
--- a/src/commands/dev/eval.ts
+++ b/src/commands/dev/eval.ts
@@ -135,12 +135,11 @@ export default class EvalCommand extends BushCommand {
show_proto: boolean;
}
): Promise<unknown> {
- if (!message.author.isOwner())
- return await message.util.reply(`${this.client.util.emojis.error} Only my developers can run this command.`);
+ // if (!message.author.isOwner())
+ // return await message.util.reply(`${this.client.util.emojis.error} Only my developers can run this command.`);
if (message.util.isSlash) {
await (message as BushSlashMessage).interaction.defer({ ephemeral: args.silent });
}
-
const code: { js?: string | null; ts?: string | null; lang?: 'js' | 'ts' } = {};
args.code = args.code.replace(/[“”]/g, '"');
args.code = args.code.replace(/```/g, '');
@@ -193,6 +192,7 @@ export default class EvalCommand extends BushCommand {
} else {
output = eval(code.js);
output = await output;
+ this.client.console.debug(output);
}
let proto, outputProto;
if (args.show_proto) {
diff --git a/src/commands/moulberry-bush/rule.ts b/src/commands/moulberry-bush/rule.ts
index 3cd9ec6..9aa41e0 100644
--- a/src/commands/moulberry-bush/rule.ts
+++ b/src/commands/moulberry-bush/rule.ts
@@ -110,7 +110,7 @@ export default class RuleCommand extends BushCommand {
public async exec(message: BushMessage, { rule, user }: { rule: undefined | number; user: User }): Promise<unknown> {
const rulesEmbed = new MessageEmbed()
- .setColor('ef3929')
+ .setColor('#ef3929')
.setFooter(`Triggered by ${message.author.tag}`, message.author.avatarURL({ dynamic: true }))
.setTimestamp();
diff --git a/src/lib/extensions/BushClientUtil.ts b/src/lib/extensions/BushClientUtil.ts
index d79a139..680f6af 100644
--- a/src/lib/extensions/BushClientUtil.ts
+++ b/src/lib/extensions/BushClientUtil.ts
@@ -5,6 +5,7 @@ import { ClientUtil } from 'discord-akairo';
import { APIMessage } from 'discord-api-types';
import {
ButtonInteraction,
+ ColorResolvable,
CommandInteraction,
Constants,
GuildMember,
@@ -52,6 +53,29 @@ export interface uuidRes {
created_at: string;
}
+interface bushColors {
+ default: '#1FD8F1';
+ error: '#EF4947';
+ warn: '#FEBA12';
+ success: '#3BB681';
+ info: '#3B78FF';
+ red: '#ff0000';
+ blue: '#0055ff';
+ aqua: '#00bbff';
+ purple: '#8400ff';
+ blurple: '#5440cd';
+ pink: '#ff00e6';
+ green: '#00ff1e';
+ darkGreen: '#008f11';
+ gold: '#b59400';
+ yellow: '#ffff00';
+ white: '#ffffff';
+ gray: '#a6a6a6';
+ lightGray: '#cfcfcf';
+ darkGray: '#7a7a7a';
+ black: '#000000';
+ orange: '#E86100';
+}
export class BushClientUtil extends ClientUtil {
/** The client of this ClientUtil */
public declare client: BushClient;
@@ -187,7 +211,7 @@ export class BushClientUtil extends ClientUtil {
}
/** Commonly Used Colors */
- public colors = {
+ public colors: bushColors = {
default: '#1FD8F1',
error: '#EF4947',
warn: '#FEBA12',
@@ -228,7 +252,7 @@ export class BushClientUtil extends ClientUtil {
/**
* A simple utility to create and embed with the needed style for the bot
*/
- public createEmbed(color?: string, author?: User | GuildMember): MessageEmbed {
+ public createEmbed(color?: ColorResolvable, author?: User | GuildMember): MessageEmbed {
if (author instanceof GuildMember) {
author = author.user; // Convert to User if GuildMember
}
diff --git a/yarn.lock b/yarn.lock
index 7fe5723..b1cd243 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -583,17 +583,19 @@ __metadata:
eslint-config-prettier: ^8.3.0
got: ^11.8.2
moment: ^2.29.1
- pg: ^8.6.0
- pg-hstore: ^2.3.4
+ pg: ^8.5.1
+ pg-hstore: ^2.3.3
prettier: ^2.3.2
rimraf: ^3.0.2
- sequelize: ^6.6.4
+ sequelize: ^6.5.0
source-map-support: ^0.5.19
- typescript: ^4.3.4
+ typescript: 4.2.4
uuid: ^8.3.2
dependenciesMeta:
discord-akairo@8.2.2:
unplugged: true
+ discord.js@13.0.0-dev.5ad83a6a65e5944ceb3a41fee2df40ba1f5b03e4:
+ unplugged: true
discord.js@13.0.0-dev.e37ef3af2151e556527ccd8e98ec531bdcc0ed70:
unplugged: true
prettier@2.3.1:
@@ -809,8 +811,8 @@ __metadata:
discord-akairo@NotEnoughUpdates/discord-akairo:
version: 8.2.2
- resolution: "discord-akairo@https://github.com/NotEnoughUpdates/discord-akairo.git#commit=63fc4b741c4ff5c4133cd842360ec0196a54efe0"
- checksum: 04ba0a41b57d1cca7b29c042f0fd74d88dc8bbd12fac8b1e6315eb0cb14421414ba6824bd45e0fe0cfb208bcd0bc2b6b530d6c2e1d3628ee67d63bd94345db59
+ resolution: "discord-akairo@https://github.com/NotEnoughUpdates/discord-akairo.git#commit=36611850e2ebe5458be535448a2f4df30d3680e3"
+ checksum: 23d032ceef2ada6aa3761ea1eb25df75f3bd231a8be4a5e3b7de7ee291e7ab8cace3659ce5765ba1c467dff46ce35ca5ff748816575062918702dccfad9db77e
languageName: node
linkType: hard
@@ -829,8 +831,8 @@ discord-akairo@NotEnoughUpdates/discord-akairo:
linkType: hard
"discord.js@npm:dev":
- version: 13.0.0-dev.e37ef3af2151e556527ccd8e98ec531bdcc0ed70
- resolution: "discord.js@npm:13.0.0-dev.e37ef3af2151e556527ccd8e98ec531bdcc0ed70"
+ version: 13.0.0-dev.5ad83a6a65e5944ceb3a41fee2df40ba1f5b03e4
+ resolution: "discord.js@npm:13.0.0-dev.5ad83a6a65e5944ceb3a41fee2df40ba1f5b03e4"
dependencies:
"@discordjs/collection": ^0.1.6
"@discordjs/form-data": ^3.0.1
@@ -840,7 +842,7 @@ discord-akairo@NotEnoughUpdates/discord-akairo:
discord-api-types: ^0.19.0-next.f393ba520d7d6d2aacaca7b3ca5d355fab614f6e
node-fetch: ^2.6.1
ws: ^7.4.6
- checksum: d7271681e23d0a8656966bb44e9d111328b1d72b29df143848c36ca1484b9bad66139148a72a7cb762853e69c725b62709fb70cbde047d91f5d0e66dad349809
+ checksum: 5009d1873b00cb2f3d7d4b92264d11048cf52eebfe75091fbf429ca5fbfd8bd340ae264481ff5296a4bba3866b3d25449418344ad120a91ea18e93ff87c37edf
languageName: node
linkType: hard
@@ -893,11 +895,11 @@ discord-akairo@NotEnoughUpdates/discord-akairo:
linkType: hard
"esbuild@npm:^0.12.11":
- version: 0.12.11
- resolution: "esbuild@npm:0.12.11"
+ version: 0.12.12
+ resolution: "esbuild@npm:0.12.12"
bin:
esbuild: bin/esbuild
- checksum: 2c2a4b643ff457fb3e92fde2e02321258d2bcf2e2d5f20f7c487c029823aa2241f67089672ffdd9ff6ad714f5609817e2bdd940d21616171bc2197b8b502e5f6
+ checksum: a5b0f1cd1493de2194be73829900904d9d415295db54a4a8c0b368a776ccc1a43d8ae369d086c4e2aa94f25d2fa2a7d51940ba35c91b4682768bb229900489b1
languageName: node
linkType: hard
@@ -1711,7 +1713,7 @@ discord-akairo@NotEnoughUpdates/discord-akairo:
languageName: node
linkType: hard
-"pg-hstore@npm:^2.3.4":
+"pg-hstore@npm:^2.3.3":
version: 2.3.4
resolution: "pg-hstore@npm:2.3.4"
dependencies:
@@ -1756,7 +1758,7 @@ discord-akairo@NotEnoughUpdates/discord-akairo:
languageName: node
linkType: hard
-"pg@npm:^8.6.0":
+"pg@npm:^8.5.1":
version: 8.6.0
resolution: "pg@npm:8.6.0"
dependencies:
@@ -2032,7 +2034,7 @@ discord-akairo@NotEnoughUpdates/discord-akairo:
languageName: node
linkType: hard
-"sequelize@npm:^6.6.4":
+"sequelize@npm:^6.5.0":
version: 6.6.4
resolution: "sequelize@npm:6.6.4"
dependencies:
@@ -2296,23 +2298,23 @@ discord-akairo@NotEnoughUpdates/discord-akairo:
languageName: node
linkType: hard
-typescript@^4.3.4:
- version: 4.3.4
- resolution: "typescript@npm:4.3.4"
+typescript@4.2.4:
+ version: 4.2.4
+ resolution: "typescript@npm:4.2.4"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
- checksum: 9791c5fe98db6cb70ec0efad8d3d2eb957b9643ee600b90bff49267de69768d0d5f59c41a8fd731cfd63df1ccfb2cb25505a2015d7b39ac10ea51f605a058e16
+ checksum: edaede2fa77f56b7fba80ee624a2368ab1216e75b0434d968ccb47ab0a5e2f6d94f848b3b111c1237dd71e988cd376af26370dcdad3b94355c76e759f0dd0a1e
languageName: node
linkType: hard
-"typescript@patch:typescript@^4.3.4#builtin<compat/typescript>":
- version: 4.3.4
- resolution: "typescript@patch:typescript@npm%3A4.3.4#builtin<compat/typescript>::version=4.3.4&hash=ddfc1b"
+"typescript@patch:typescript@4.2.4#builtin<compat/typescript>":
+ version: 4.2.4
+ resolution: "typescript@patch:typescript@npm%3A4.2.4#builtin<compat/typescript>::version=4.2.4&hash=ddfc1b"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
- checksum: c8766e84a4f71e925cc059af8286cc7f41819fe821d433b90c83e9b36729cbda7a8e4be3292d8a1433cd717d529c93217d58d173418f43862290b206bd88b284
+ checksum: 64658fdf27872904641dcaacf925e6b5a52fb4aa4881a5a726fc78a11b76748423ce9e996dac42313729321061c4dd38a06108014f8d07b222dcff2687037186
languageName: node
linkType: hard
@@ -2404,8 +2406,8 @@ typescript@^4.3.4:
linkType: hard
"ws@npm:^7.4.4, ws@npm:^7.4.6":
- version: 7.5.0
- resolution: "ws@npm:7.5.0"
+ version: 7.5.1
+ resolution: "ws@npm:7.5.1"
peerDependencies:
bufferutil: ^4.0.1
utf-8-validate: ^5.0.2
@@ -2414,7 +2416,7 @@ typescript@^4.3.4:
optional: true
utf-8-validate:
optional: true
- checksum: f9ac36310e795995f13ac7abff9c3b104b2460864de7f0b6233d285f62c6929529e24f386ff87740c3646f818fefa014be587371aa9a5a6fffae2cd9d1e9e008
+ checksum: e56541a73cac1d5b4b5e81ddd7e9925e84e45abaab6f3ee5e088e0089b5518f862d8429897243e12482b118971ad8a9a75b1d4900769bce3877878a0a7470043
languageName: node
linkType: hard