fix(discord): slash command perms & choice issues with newer API

YappyBots · Mar 4, 2023 · 9ca45d0 · 9ca45d0
1 parent 3b83c58
commit 9ca45d0
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 16 deletions.
diff --git a/lib/Discord/Commands/Conf.js b/lib/Discord/Commands/Conf.js
@@ -51,20 +51,20 @@ class ConfCommand extends Command {
             option
               .setName('type')
               .setDescription('Choose what object to configuring filtering for')
-              .addChoices(['events', 'users', 'branches'].map((v) => [v, v]))
+              .addChoices(...['events', 'users', 'branches'].map((v) => ({ name: v, value: v })))
               .setRequired(true)
           )
           .addStringOption((option) =>
             option
               .setName('action')
               .setDescription('Action to perform')
-              .addChoices([
-                ['Turn into Blacklist', 'blacklist'],
-                ['Turn into Whitelist', 'whitelist'],
-                ['Add Item', 'add'],
-                ['Remove Item', 'remove'],
-                ['View Options (Events Only)', 'list'],
-              ])
+              .addChoices(
+                {name: 'Turn into Blacklist', value: 'blacklist'},
+                {name: 'Turn into Whitelist', value: 'whitelist'},
+                {name: 'Add Item', value: 'add'},
+                {name: 'Remove Item', value: 'remove'},
+                {name: 'View Options (Events Only)', value: 'list'},
+              )
           )
           .addStringOption(
             (option) =>
@@ -86,7 +86,7 @@ class ConfCommand extends Command {
                 option
                   .setName('item')
                   .setDescription('Config item to view/change')
-                  .addChoices(Channel.validKeys.map((v) => [v, v]))
+                  .addChoices(...Channel.validKeys.map((v) => ({ name: v, value: v })))
               )
               .addStringOption((option) =>
                 option.setName('value').setDescription('New value for config')
@@ -100,7 +100,7 @@ class ConfCommand extends Command {
                 option
                   .setName('item')
                   .setDescription('Config item to view/change')
-                  .addChoices(Guild.validKeys.map((v) => [v, v]))
+                  .addChoices(...Guild.validKeys.map((v) => ({ name: v, value: v })))
               )
               .addStringOption((option) =>
                 option.setName('value').setDescription('New value for config')

diff --git a/lib/Discord/Commands/Reload.js b/lib/Discord/Commands/Reload.js
@@ -19,7 +19,7 @@ class ReloadCommand extends Command {
       option
         .setName('command')
         .setDescription('The name of the command to reload')
-        .addChoices(['all', ...this.bot.commands.keys()].map((v) => [v, v]))
+        .addChoices(...['all', ...this.bot.commands.keys()].map((v) => ({ name: v, value: v })))
         .setRequired(true)
     );
   }

diff --git a/package.json b/package.json
@@ -17,8 +17,8 @@
   "author": "David Sevilla Martin <[email protected]>",
   "license": "MIT",
   "dependencies": {
-    "@YappyBots/addons": "https://github.com/YappyBots/yappy-addons#408c1f6",
-    "@discordjs/builders": "^0.10.0",
+    "@YappyBots/addons": "https://github.com/YappyBots/yappy-addons#1a5b7e9",
+    "@discordjs/builders": "^1.4.0",
     "@discordjs/rest": "^1.5.0",
     "@octokit/rest": "^18.12.0",
     "@sentry/node": "^5.19.1",

diff --git a/yarn.lock b/yarn.lock
@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@YappyBots/addons@https://github.com/YappyBots/yappy-addons#408c1f6":
+"@YappyBots/addons@https://github.com/YappyBots/yappy-addons#1a5b7e9":
   version "0.2.0-dev"
-  resolved "https://github.com/YappyBots/yappy-addons#408c1f6783e970de95cf52a2084ad43ead8f2992"
+  resolved "https://github.com/YappyBots/yappy-addons#1a5b7e9661739247cd93af8e8228c9b5703136a5"
   dependencies:
     cookie-parser "^1.4.5"
     swag "^0.7.0"
@@ -34,6 +34,18 @@
     tslib "^2.3.1"
     zod "^3.11.6"
 
+"@discordjs/builders@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.4.0.tgz#b951b5e6ce4e459cd06174ce50dbd51c254c1d47"
+  integrity sha512-nEeTCheTTDw5kO93faM1j8ZJPonAX86qpq/QVoznnSa8WWcCgJpjlu6GylfINTDW6o7zZY0my2SYdxx2mfNwGA==
+  dependencies:
+    "@discordjs/util" "^0.1.0"
+    "@sapphire/shapeshift" "^3.7.1"
+    discord-api-types "^0.37.20"
+    fast-deep-equal "^3.1.3"
+    ts-mixer "^6.0.2"
+    tslib "^2.4.1"
+
 "@discordjs/collection@^0.4.0":
   version "0.4.0"
   resolved "https://registry.npmjs.org/@discordjs/collection/-/collection-0.4.0.tgz"
@@ -174,6 +186,14 @@
   resolved "https://registry.yarnpkg.com/@sapphire/async-queue/-/async-queue-1.5.0.tgz#2f255a3f186635c4fb5a2381e375d3dfbc5312d8"
   integrity sha512-JkLdIsP8fPAdh9ZZjrbHWR/+mZj0wvKS5ICibcLrRI1j84UmLMshx5n9QmL8b95d4onJ2xxiyugTgSAX7AalmA==
 
+"@sapphire/shapeshift@^3.7.1":
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/@sapphire/shapeshift/-/shapeshift-3.8.1.tgz#b98dc6a7180f9b38219267917b2e6fa33f9ec656"
+  integrity sha512-xG1oXXBhCjPKbxrRTlox9ddaZTvVpOhYLmKmApD/vIWOV1xEYXnpoFs68zHIZBGbqztq6FrUPNPerIrO1Hqeaw==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+    lodash "^4.17.21"
+
 "@sapphire/snowflake@^3.2.2":
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/@sapphire/snowflake/-/snowflake-3.4.0.tgz#25c012158a9feea2256c718985dbd6c1859a5022"
@@ -1053,7 +1073,7 @@ discord-api-types@^0.25.2:
   resolved "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.25.2.tgz"
   integrity sha512-O243LXxb5gLLxubu5zgoppYQuolapGVWPw3ll0acN0+O8TnPUE2kFp9Bt3sTRYodw8xFIknOVxjSeyWYBpVcEQ==
 
-discord-api-types@^0.37.23, discord-api-types@^0.37.35:
+discord-api-types@^0.37.20, discord-api-types@^0.37.23, discord-api-types@^0.37.35:
   version "0.37.35"
   resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.35.tgz#d0dad0bce7ce5bffc633030f17464e45148d9f28"
   integrity sha512-iyKZ/82k7FX3lcmHiAvvWu5TmyfVo78RtghBV/YsehK6CID83k5SI03DKKopBcln+TiEIYw5MGgq7SJXSpNzMg==
@@ -1295,6 +1315,11 @@ fast-deep-equal@^2.0.1:
   resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz"
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
+fast-deep-equal@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz"
@@ -3395,6 +3420,11 @@ ts-mixer@^6.0.0:
   resolved "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.0.tgz"
   integrity sha512-nXIb1fvdY5CBSrDIblLn73NW0qRDk5yJ0Sk1qPBF560OdJfQp9jhl+0tzcY09OZ9U+6GpeoI9RjwoIKFIoB9MQ==
 
+ts-mixer@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/ts-mixer/-/ts-mixer-6.0.3.tgz#69bd50f406ff39daa369885b16c77a6194c7cae6"
+  integrity sha512-k43M7uCG1AkTyxgnmI5MPwKoUvS/bRvLvUb7+Pgpdlmok8AoqmUaZxUUw8zKM5B1lqZrt41GjYgnvAi0fppqgQ==
+
 tslib@^1.9.3:
   version "1.13.0"
   resolved "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz"