[PATCH] filter user/channel/role if deleted

AyakoBot · Dec 28, 2023 · 4ba71ff · 4ba71ff
1 parent e0cc273
commit 4ba71ff
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "type": "module",
- "version": "2.0.13",
+ "version": "2.0.14",
  "scripts": {
   "start": "node --max-old-space-size=8192 ./dist/index.js",
   "build": "npx tsc",

diff --git a/src/BaseClient/ClientHelperModules/settingsHelpers/changeHelpers/changeSelectGlobal.ts b/src/BaseClient/ClientHelperModules/settingsHelpers/changeHelpers/changeSelectGlobal.ts
@@ -14,6 +14,7 @@ export default <T extends keyof typeof CT.SettingsName2TableName>(
   id: string;
   type: Discord.SelectMenuDefaultValueType;
  }[],
+ guild: Discord.Guild,
  channelType?: 'text' | 'voice' | 'category',
 ) => {
  const menu:
@@ -26,7 +27,20 @@ export default <T extends keyof typeof CT.SettingsName2TableName>(
   custom_id: `settings/${type}_${fieldName}_${String(settingName)}${
    uniquetimestamp ? `_${uniquetimestamp}` : ''
   }`,
-  default_values: values.filter((v) => !!v.id) as never,
+  default_values: values.filter((v) => {
+   if (!v.id) return false;
+
+   switch (v.type) {
+    case Discord.SelectMenuDefaultValueType.Channel:
+     return guild.channels.cache.has(v.id);
+    case Discord.SelectMenuDefaultValueType.Role:
+     return guild.roles.cache.has(v.id);
+    case Discord.SelectMenuDefaultValueType.User:
+     return guild.members.cache.has(v.id);
+    default:
+     return true;
+   }
+  }) as never,
   type: getChangeSelectType(type),
   placeholder: getPlaceholder(type, language),
  };

diff --git a/src/Commands/ButtonCommands/settings/autoModRule/channel.ts b/src/Commands/ButtonCommands/settings/autoModRule/channel.ts
@@ -59,6 +59,7 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
           },
          ]
        : [],
+      cmd.guild,
      ),
     ],
    },

diff --git a/src/Commands/ButtonCommands/settings/autoModRule/channels.ts b/src/Commands/ButtonCommands/settings/autoModRule/channels.ts
@@ -49,6 +49,7 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
       rule.exemptChannels
        .map((c) => c.id)
        .map((o) => ({ id: o, type: Discord.SelectMenuDefaultValueType.Channel })),
+      cmd.guild,
      ),
     ],
    },

diff --git a/src/Commands/ButtonCommands/settings/autoModRule/roles.ts b/src/Commands/ButtonCommands/settings/autoModRule/roles.ts
@@ -49,6 +49,7 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
       rule.exemptRoles
        .map((c) => c.id)
        .map((o) => ({ id: o, type: Discord.SelectMenuDefaultValueType.Role })),
+      cmd.guild,
      ),
     ],
    },

diff --git a/src/Commands/ButtonCommands/settings/editors/channel.ts b/src/Commands/ButtonCommands/settings/editors/channel.ts
@@ -64,6 +64,7 @@ export default async (
        id: o,
        type: Discord.SelectMenuDefaultValueType.Channel,
       })),
+      cmd.guild,
       channelTypes,
      ),
     ],

diff --git a/src/Commands/ButtonCommands/settings/editors/channels.ts b/src/Commands/ButtonCommands/settings/editors/channels.ts
@@ -54,6 +54,7 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
        id: o,
        type: Discord.SelectMenuDefaultValueType.Channel,
       })),
+      cmd.guild,
      ),
     ],
    },

diff --git a/src/Commands/ButtonCommands/settings/editors/position.ts b/src/Commands/ButtonCommands/settings/editors/position.ts
@@ -54,6 +54,7 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
        id: o,
        type: Discord.SelectMenuDefaultValueType.Channel,
       })),
+      cmd.guild,
      ),
     ],
    },

diff --git a/src/Commands/ButtonCommands/settings/editors/role.ts b/src/Commands/ButtonCommands/settings/editors/role.ts
@@ -54,6 +54,7 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
        id: o,
        type: Discord.SelectMenuDefaultValueType.Channel,
       })),
+      cmd.guild,
      ),
     ],
    },

diff --git a/src/Commands/ButtonCommands/settings/editors/roles.ts b/src/Commands/ButtonCommands/settings/editors/roles.ts
@@ -54,6 +54,7 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
        id: o,
        type: Discord.SelectMenuDefaultValueType.Channel,
       })),
+      cmd.guild,
      ),
     ],
    },

diff --git a/src/Commands/ButtonCommands/settings/editors/user.ts b/src/Commands/ButtonCommands/settings/editors/user.ts
@@ -54,6 +54,7 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
        id: o,
        type: Discord.SelectMenuDefaultValueType.Channel,
       })),
+      cmd.guild,
      ),
     ],
    },

diff --git a/src/Commands/ButtonCommands/settings/editors/users.ts b/src/Commands/ButtonCommands/settings/editors/users.ts
@@ -54,6 +54,7 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
        id: o,
        type: Discord.SelectMenuDefaultValueType.Channel,
       })),
+      cmd.guild,
      ),
     ],
    },
-Original file line number
+Diff line change
@@ Expand Up @@
               },
              ]
            : [],
+          cmd.guild,
          ),
         ],
        },
@@ Expand Down @@