From d56c13ae0741e8690015276eed549a76a774c0d9 Mon Sep 17 00:00:00 2001 From: Taken Date: Sun, 31 Dec 2023 20:36:35 +0100 Subject: [PATCH 1/5] Updated git ignore file --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d76d4bb..8f4b486 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +.vscode/ node_modules/* .env dist/ \ No newline at end of file From 9ef8ab593cd58b1fa9773f5f64081c88c19afd71 Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 1 Jan 2024 14:32:20 +0100 Subject: [PATCH 2/5] Updated command interface --- src/interfaces/Command.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/interfaces/Command.ts b/src/interfaces/Command.ts index 4057322..e0757c4 100644 --- a/src/interfaces/Command.ts +++ b/src/interfaces/Command.ts @@ -8,10 +8,7 @@ export default interface Command { type: "slash" dev?: boolean public: boolean - data: Omit< - SlashCommandBuilder, - "addSubcommand" | "addSubcommandGroup" | "addIntegerOption" - > + data: SlashCommandBuilder subcommands?: boolean execute: ( interaction: ChatInputCommandInteraction, From 6bb7b6deb3a8cce0ad32a5c858c37c38ccc4119e Mon Sep 17 00:00:00 2001 From: Taken Date: Mon, 1 Jan 2024 14:46:33 +0100 Subject: [PATCH 3/5] Added config loader file --- src/utils/Config.ts | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/utils/Config.ts diff --git a/src/utils/Config.ts b/src/utils/Config.ts new file mode 100644 index 0000000..e8b0e9c --- /dev/null +++ b/src/utils/Config.ts @@ -0,0 +1,17 @@ +import limitmessages from "../../config/limitmessages.json" +import options from "../../config/options.json" +import questions from "../../config/questions.json" +import reqs from "../../config/reqs.json" +import roles from "../../config/roles.json" +import statuses from "../../config/statuses.json" + +const config = { + limitmessages, + options, + questions, + reqs, + roles, + statuses +} + +export default config \ No newline at end of file From 7e00569fbe8ecc77e66931fd7ad18cb8f7589eee Mon Sep 17 00:00:00 2001 From: Taken Date: Tue, 2 Jan 2024 16:30:28 +0100 Subject: [PATCH 4/5] Removed unused config file --- src/utils/Config.ts | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 src/utils/Config.ts diff --git a/src/utils/Config.ts b/src/utils/Config.ts deleted file mode 100644 index e8b0e9c..0000000 --- a/src/utils/Config.ts +++ /dev/null @@ -1,17 +0,0 @@ -import limitmessages from "../../config/limitmessages.json" -import options from "../../config/options.json" -import questions from "../../config/questions.json" -import reqs from "../../config/reqs.json" -import roles from "../../config/roles.json" -import statuses from "../../config/statuses.json" - -const config = { - limitmessages, - options, - questions, - reqs, - roles, - statuses -} - -export default config \ No newline at end of file From 7076e5ebd98673f19939be13ce79c1266838d3e6 Mon Sep 17 00:00:00 2001 From: Taken Date: Wed, 3 Jan 2024 00:25:49 +0100 Subject: [PATCH 5/5] Updated guild accept message --- src/events/buttons/guildapplicationaccept.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/events/buttons/guildapplicationaccept.ts b/src/events/buttons/guildapplicationaccept.ts index 608efe9..3ffbb84 100644 --- a/src/events/buttons/guildapplicationaccept.ts +++ b/src/events/buttons/guildapplicationaccept.ts @@ -53,7 +53,8 @@ export = { embeds: [ { description: - "Your application for the Illegitimate guild has been accepted.", + "Your application for the Illegitimate guild has been accepted.\n\n" + + "Make sure to leave your current guild so that we can invite you.", color: embedColor, }, ],