fix some commands + allow while banned feat

wdhdev · Jul 24, 2023 · 74c08dd · 74c08dd
1 parent 00af74c
commit 74c08dd
Show file tree

Hide file tree

Showing 46 changed files with 126 additions and 81 deletions.
diff --git a/src/classes/Command.ts b/src/classes/Command.ts
@@ -10,6 +10,7 @@ export default class {
     public requiredRoles: Roles;
     public cooldown: number;
     public enabled: boolean;
+    public allowWhileBanned: boolean;
     public staffOnly: boolean;
     public deferReply: boolean;
     public ephemeral: boolean;

diff --git a/src/classes/ContextCommand.ts b/src/classes/ContextCommand.ts
@@ -9,6 +9,7 @@ export default class {
     public requiredRoles: Roles;
     public cooldown: number;
     public enabled: boolean;
+    public allowWhileBanned: boolean;
     public staffOnly: boolean;
     public deferReply: boolean;
     public ephemeral: boolean;

diff --git a/src/commands/dev/admin.ts b/src/commands/dev/admin.ts
@@ -138,6 +138,7 @@ const command: Command = {
     requiredRoles: new Roles(["dev"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/dev/announce.ts b/src/commands/dev/announce.ts
@@ -15,6 +15,7 @@ const command: Command = {
     requiredRoles: new Roles(["dev"]),
     cooldown: 60,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: false,
     ephemeral: true,

diff --git a/src/commands/dev/delete-webhook.ts b/src/commands/dev/delete-webhook.ts
@@ -24,6 +24,7 @@ const command: Command = {
     requiredRoles: new Roles(["dev"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/dev/manual-register.ts b/src/commands/dev/manual-register.ts
@@ -26,6 +26,7 @@ const command: Command = {
     requiredRoles: new Roles(["dev"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/dev/sentry.ts b/src/commands/dev/sentry.ts
@@ -69,6 +69,7 @@ const command: Command = {
     requiredRoles: new Roles(["dev"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/dev/unwhitelist-domain.ts b/src/commands/dev/unwhitelist-domain.ts
@@ -24,6 +24,7 @@ const command: Command = {
     requiredRoles: new Roles(["dev"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/dev/whitelist-domain.ts b/src/commands/dev/whitelist-domain.ts
@@ -24,6 +24,7 @@ const command: Command = {
     requiredRoles: new Roles(["dev"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/guild/block.ts b/src/commands/guild/block.ts
@@ -24,6 +24,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 10,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/guild/blocked.ts b/src/commands/guild/blocked.ts
@@ -16,6 +16,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 10,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/guild/delete-guild-data.ts b/src/commands/guild/delete-guild-data.ts
@@ -18,6 +18,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 120,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,
@@ -35,9 +36,13 @@ const command: Command = {
             }
 
             const confirmation = new Discord.EmbedBuilder()
-                .setColor(client.config_embeds.default)
-                .setTitle("Confirmation")
-                .setDescription("Are you sure you want to delete all data associated with this guild?\n\nThe global chat channel will be **deregistered** and any webhooks will be **deleted**.\n**This cannot be undone.**")
+                .setColor(client.config_embeds.error)
+                .setAuthor({ name: interaction.guild.name, iconURL: interaction.guild.iconURL({ extension: "png", forceStatic: false }) })
+                .setTitle("Delete Guild Data")
+                .setDescription("Are you sure you want to delete all data associated with this guild?\n**This cannot be undone.**")
+                .addFields (
+                    { name: "What will be deleted?", value: "📝 Register Data\n🪝 Webhooks" }
+                )
                 .setTimestamp()
 
             const actions = new Discord.ActionRowBuilder()

diff --git a/src/commands/guild/deregister.ts b/src/commands/guild/deregister.ts
@@ -16,6 +16,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 60,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: false,

diff --git a/src/commands/guild/permissions.ts b/src/commands/guild/permissions.ts
@@ -14,6 +14,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 20,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/guild/register.ts b/src/commands/guild/register.ts
@@ -24,6 +24,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 120,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: false,

diff --git a/src/commands/guild/unblock.ts b/src/commands/guild/unblock.ts
@@ -23,6 +23,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 10,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/info/bot.ts b/src/commands/info/bot.ts
@@ -20,6 +20,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 5,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/info/developers.ts b/src/commands/info/developers.ts
@@ -16,6 +16,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 5,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/info/help.ts b/src/commands/info/help.ts
@@ -22,6 +22,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 5,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/info/moderators.ts b/src/commands/info/moderators.ts
@@ -16,6 +16,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 5,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/info/ping.ts b/src/commands/info/ping.ts
@@ -14,6 +14,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 10,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/mod/appeal.ts b/src/commands/mod/appeal.ts
@@ -49,6 +49,7 @@ const command: Command = {
     requiredRoles: new Roles(["mod"]),
     cooldown: 5,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/mod/appeals.ts b/src/commands/mod/appeals.ts
@@ -23,6 +23,7 @@ const command: Command = {
     requiredRoles: new Roles(["mod"]),
     cooldown: 10,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/mod/ban.ts b/src/commands/mod/ban.ts
@@ -40,6 +40,7 @@ const command: Command = {
     requiredRoles: new Roles(["mod"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/mod/filter.ts b/src/commands/mod/filter.ts
@@ -109,6 +109,7 @@ const command: Command = {
     requiredRoles: new Roles(["mod"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/mod/unban.ts b/src/commands/mod/unban.ts
@@ -31,6 +31,7 @@ const command: Command = {
     requiredRoles: new Roles(["mod"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/mod/user.ts b/src/commands/mod/user.ts
@@ -27,6 +27,7 @@ const command: Command = {
     requiredRoles: new Roles(["mod"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/owner/dev.ts b/src/commands/owner/dev.ts
@@ -44,6 +44,7 @@ const command: Command = {
     requiredRoles: new Roles(["owner"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/owner/donator.ts b/src/commands/owner/donator.ts
@@ -44,6 +44,7 @@ const command: Command = {
     requiredRoles: new Roles(["owner"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/owner/eval.ts b/src/commands/owner/eval.ts
@@ -22,6 +22,7 @@ const command: Command = {
     requiredRoles: new Roles(["owner"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/owner/immunity.ts b/src/commands/owner/immunity.ts
@@ -44,6 +44,7 @@ const command: Command = {
     requiredRoles: new Roles(["owner"]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/user/delete-my-data.ts b/src/commands/user/delete-my-data.ts
@@ -4,7 +4,9 @@ import Roles from "../../classes/Roles";
 import { CommandInteraction } from "discord.js";
 
 import { emojis as emoji } from "../../config";
+import { Octokit } from "@octokit/core";
 
+import GitHubUser from "../../models/GitHubUser";
 import User from "../../models/User";
 
 const command: Command = {
@@ -16,12 +18,13 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 120,
     enabled: true,
+    allowWhileBanned: true,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,
     async execute(interaction: CommandInteraction, client: ExtendedClient, Discord: any) {
         try {
-            if(!await User.exists({ _id: interaction.user.id })) {
+            if(!await User.exists({ _id: interaction.user.id }) && !await GitHubUser.exists({ _id: interaction.user.id })) {
                 const error = new Discord.EmbedBuilder()
                     .setColor(client.config_embeds.error)
                     .setDescription(`${emoji.cross} There is no data associated with your account!`)
@@ -31,9 +34,13 @@ const command: Command = {
             }
 
             const embed = new Discord.EmbedBuilder()
-                .setColor(client.config_embeds.default)
-                .setTitle("Confirmation")
-                .setDescription("Are you sure you want to delete all data associated with your account?\n\nEverything including your **roles** will be removed.\n**This cannot be undone.**")
+                .setColor(client.config_embeds.error)
+                .setTitle("Delete My Data")
+                .setDescription("Are you sure you want to delete all data associated with your account?\n**This cannot be undone.**")
+                .addFields (
+                    { name: "What will be deleted?", value: "🎭 Roles\n🔗 Linked Accounts", inline: true },
+                    { name: "What will not be deleted?", value: "🔨 Ban Data\n💬 Messages\n⛔ Blocked Messages", inline: true }
+                )
                 .setTimestamp()
 
             const actions = new Discord.ActionRowBuilder()
@@ -65,6 +72,21 @@ const command: Command = {
                 if(c.customId === `delete-${interaction.id}`) {
                     collector.stop();
 
+                    const githubData = await GitHubUser.findOne({ _id: interaction.user.id });
+
+                    if(githubData) {
+                        try {
+                            const octokit = new Octokit({ auth: githubData.token });
+
+                            await octokit.request("DELETE /applications/{client_id}/grant", {
+                                client_id: process.env.github_client_id,
+                                access_token: githubData.token
+                            })
+                        } catch {}
+
+                        await githubData.delete();
+                    }
+
                     await User.findOneAndDelete({ _id: interaction.user.id });
 
                     const deleted = new Discord.EmbedBuilder()

diff --git a/src/commands/user/github.ts b/src/commands/user/github.ts
@@ -39,6 +39,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 10,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,
@@ -161,7 +162,7 @@ const command: Command = {
                 try {
                     const octokit = new Octokit({ auth: data.token });
 
-                    await octokit.request('DELETE /applications/{client_id}/grant', {
+                    await octokit.request("DELETE /applications/{client_id}/grant", {
                         client_id: process.env.github_client_id,
                         access_token: data.token
                     })

diff --git a/src/commands/user/me.ts b/src/commands/user/me.ts
@@ -19,6 +19,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 0,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: true,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/user/my-roles.ts b/src/commands/user/my-roles.ts
@@ -14,6 +14,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 10,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/user/my-stats.ts b/src/commands/user/my-stats.ts
@@ -15,6 +15,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 10,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/commands/user/suggest.ts b/src/commands/user/suggest.ts
@@ -60,6 +60,7 @@ const command: Command = {
     requiredRoles: new Roles([]),
     cooldown: 10,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,

diff --git a/src/context-menu/message/Delete Message.ts b/src/context-menu/message/Delete Message.ts
@@ -17,6 +17,7 @@ const command: ContextCommand = {
     requiredRoles: new Roles([]),
     cooldown: 5,
     enabled: true,
+    allowWhileBanned: false,
     staffOnly: false,
     deferReply: true,
     ephemeral: true,