update to tricked slash commands akairo fork

3 files changed, 27 insertions, 26 deletions

diff --git a/package.json b/package.json
index 87a8330..3e8e9bc 100644
--- a/package.json
+++ b/package.json
@@ -31,8 +31,9 @@
 		"@top-gg/sdk": "^3.0.9",
 		"body-parser": "^1.19.0",
 		"common-tags": "^1.8.0",
-		"discord-akairo": "^8.1.0",
-		"discord.js": "^12.5.3",
+		"discord-akairo": "SkyBlockDev/discord-akairo",
+		"discord-api-types": "^0.18.1",
+		"discord.js": "discordjs/discord.js#f7643f7bbe64003ad8b221006190dd15529651e9",
 		"express": "^4.17.1",
 		"got": "^11.8.1",
 		"moment": "^2.29.1",
diff --git a/src/lib/extensions/BotClient.ts b/src/lib/extensions/BotClient.ts
index 6ec45f6..7cc4fec 100644
--- a/src/lib/extensions/BotClient.ts
+++ b/src/lib/extensions/BotClient.ts
@@ -6,7 +6,7 @@ import {
 } from 'discord-akairo';
 import { Guild } from 'discord.js';
 import * as path from 'path';
-import { DataTypes, Model, Sequelize } from 'sequelize';
+import { DataTypes, Sequelize } from 'sequelize';
 import * as Models from '../types/Models';
 import { BotGuild } from './BotGuild';
 import { BotMessage } from './BotMessage';
@@ -14,6 +14,7 @@ import { Util } from './Util';
 import * as Tasks from '../../tasks';
 import { v4 as uuidv4 } from 'uuid';
 import { exit } from 'process';
+import { Intents } from 'discord.js';
 
 export interface BotConfig {
 	credentials: {
@@ -47,10 +48,12 @@ export class BotClient extends AkairoClient {
 	constructor(config: BotConfig) {
 		super(
 			{
-				ownerID: config.owners
+				ownerID: config.owners,
+				intents: Intents.NON_PRIVILEGED
 			},
 			{
-				allowedMentions: { parse: ['users'] } // No everyone or role mentions by default
+				allowedMentions: { parse: ['users'] }, // No everyone or role mentions by default
+				intents: Intents.NON_PRIVILEGED
 			}
 		);
 
@@ -196,7 +199,7 @@ export class BotClient extends AkairoClient {
 				guild: {
 					type: DataTypes.STRING,
 					references: {
-						model: Models.Guild as typeof Model
+						model: Models.Guild
 					}
 				}
 			},
@@ -218,7 +221,7 @@ export class BotClient extends AkairoClient {
 					type: DataTypes.STRING,
 					allowNull: false,
 					references: {
-						model: Models.Guild as typeof Model,
+						model: Models.Guild,
 						key: 'id'
 					}
 				},
@@ -234,7 +237,7 @@ export class BotClient extends AkairoClient {
 					type: DataTypes.STRING,
 					allowNull: false,
 					references: {
-						model: Models.Modlog as typeof Model
+						model: Models.Modlog
 					}
 				}
 			},
diff --git a/yarn.lock b/yarn.lock
index 96b23a0..1480a98 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -598,24 +598,26 @@ dir-glob@^3.0.1:
   dependencies:
     path-type "^4.0.0"
 
-discord-akairo@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/discord-akairo/-/discord-akairo-8.1.0.tgz#9f3d910e12c197d40d3522a3a93679e2a746a6ca"
-  integrity sha512-INWYmHo6NgyYx1ZKGSCmgznVfvkXpWGj4fGCGjO8IPkZ06Bidb9YKr4rXy2lwG0kprCjvqY0qbbhcw6N050abQ==
+discord-akairo@SkyBlockDev/discord-akairo:
+  version "8.1.1"
+  resolved "https://codeload.github.com/SkyBlockDev/discord-akairo/tar.gz/a1820abd0cb729db521dd7ff4b79ed8d5b3bf62c"
 
-discord.js@^12.5.3:
-  version "12.5.3"
-  resolved "https://registry.yarnpkg.com/discord.js/-/discord.js-12.5.3.tgz#56820d473c24320871df9ea0bbc6b462f21cf85c"
-  integrity sha512-D3nkOa/pCkNyn6jLZnAiJApw2N9XrIsXUAdThf01i7yrEuqUmDGc7/CexVWwEcgbQR97XQ+mcnqJpmJ/92B4Aw==
+discord-api-types@^0.18.1:
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.18.1.tgz#5d08ed1263236be9c21a22065d0e6b51f790f492"
+  integrity sha512-hNC38R9ZF4uaujaZQtQfm5CdQO58uhdkoHQAVvMfIL0LgOSZeW575W8H6upngQOuoxWd8tiRII3LLJm9zuQKYg==
+
+discord.js@discordjs/discord.js#f7643f7bbe64003ad8b221006190dd15529651e9:
+  version "12.5.0"
+  resolved "https://codeload.github.com/discordjs/discord.js/tar.gz/f7643f7bbe64003ad8b221006190dd15529651e9"
   dependencies:
     "@discordjs/collection" "^0.1.6"
     "@discordjs/form-data" "^3.0.1"
     abort-controller "^3.0.0"
     node-fetch "^2.6.1"
-    prism-media "^1.2.9"
-    setimmediate "^1.0.5"
+    prism-media "^1.2.2"
     tweetnacl "^1.0.3"
-    ws "^7.4.4"
+    ws "^7.3.1"
 
 doctrine@^3.0.0:
   version "3.0.0"
@@ -1475,7 +1477,7 @@ prettier@^2.2.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
   integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
 
-prism-media@^1.2.9:
+prism-media@^1.2.2:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/prism-media/-/prism-media-1.2.9.tgz#8d4f97b36efdfc82483eb8d3db64020767866f36"
   integrity sha512-UHCYuqHipbTR1ZsXr5eg4JUmHER8Ss4YEb9Azn+9zzJ7/jlTtD1h0lc4g6tNx3eMlB8Mp6bfll0LPMAV4R6r3Q==
@@ -1683,11 +1685,6 @@ serve-static@1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
-setimmediate@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285"
-  integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=
-
 setprototypeof@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
@@ -1944,7 +1941,7 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
-ws@^7.4.4:
+ws@^7.3.1:
   version "7.4.5"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
   integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==