remove type filter

AyakoBot · Sep 15, 2024 · ce9146b · ce9146b
1 parent 6341304
commit ce9146b
Show file tree

Hide file tree

Showing 9 changed files with 2 additions and 24 deletions.
diff --git a/src/BaseClient/UtilModules/settingsHelpers/changeHelpers/changeSelectGlobal.ts b/src/BaseClient/UtilModules/settingsHelpers/changeHelpers/changeSelectGlobal.ts
@@ -15,7 +15,6 @@ export default <T extends keyof typeof CT.SettingsName2TableName>(
   id: string;
   type: Discord.SelectMenuDefaultValueType;
  }[],
- guild: Discord.Guild,
  channelType?: 'text' | 'voice' | 'category',
 ) => {
  const menu:
@@ -26,20 +25,7 @@ export default <T extends keyof typeof CT.SettingsName2TableName>(
   min_values: 0,
   max_values: type.endsWith('s') ? 25 : 1,
   custom_id: getWithUTS(`settings/${type}_${fieldName}_${String(settingName)}`, uniquetimestamp),
-  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,
+  default_values: values 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
@@ -58,7 +58,6 @@ 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
@@ -48,7 +48,6 @@ 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
@@ -48,7 +48,6 @@ 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
@@ -63,7 +63,6 @@ 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
@@ -53,7 +53,6 @@ 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
@@ -53,7 +53,6 @@ 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
@@ -53,7 +53,6 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
        id: o,
        type: Discord.SelectMenuDefaultValueType.Role,
       })),
-      cmd.guild,
      ),
     ],
    },

diff --git a/src/Commands/ButtonCommands/settings/editors/roles.ts b/src/Commands/ButtonCommands/settings/editors/roles.ts
@@ -51,9 +51,8 @@ export default async (cmd: Discord.ButtonInteraction, args: string[]) => {
       uniquetimestamp,
       (Array.isArray(currentSetting) ? currentSetting : [currentSetting]).map((o) => ({
        id: o,
-       type: Discord.SelectMenuDefaultValueType.Channel,
+       type: Discord.SelectMenuDefaultValueType.Role,
       })),
-      cmd.guild,
      ),
     ],
    },
-Original file line number
+Diff line change
@@ Expand Up @@
               },
              ]
            : [],
-          cmd.guild,
          ),
         ],
        },
@@ Expand Down @@