From cd68a6083c3151a3fad94f77fa25bcda4366dce9 Mon Sep 17 00:00:00 2001 From: metal Date: Sat, 11 Mar 2023 23:58:12 +0000 Subject: [PATCH] knub commands => messageCommands Signed-off-by: GitHub --- .../src/plugins/AutoReactions/AutoReactionsPlugin.ts | 2 +- backend/src/plugins/Automod/AutomodPlugin.ts | 2 +- backend/src/plugins/BotControl/BotControlPlugin.ts | 2 +- .../plugins/ChannelArchiver/ChannelArchiverPlugin.ts | 2 +- backend/src/plugins/Counters/CountersPlugin.ts | 2 +- backend/src/plugins/LocateUser/LocateUserPlugin.ts | 2 +- .../src/plugins/MessageSaver/MessageSaverPlugin.ts | 2 +- backend/src/plugins/ModActions/ModActionsPlugin.ts | 2 +- backend/src/plugins/Mutes/MutesPlugin.ts | 2 +- backend/src/plugins/NameHistory/NameHistoryPlugin.ts | 2 +- .../src/plugins/PingableRoles/PingableRolesPlugin.ts | 2 +- backend/src/plugins/Post/PostPlugin.ts | 2 +- .../src/plugins/ReactionRoles/ReactionRolesPlugin.ts | 2 +- backend/src/plugins/Reminders/RemindersPlugin.ts | 2 +- backend/src/plugins/RoleButtons/RoleButtonsPlugin.ts | 2 +- backend/src/plugins/Roles/RolesPlugin.ts | 2 +- .../SelfGrantableRoles/SelfGrantableRolesPlugin.ts | 8 ++++---- backend/src/plugins/Slowmode/SlowmodePlugin.ts | 2 +- backend/src/plugins/Starboard/StarboardPlugin.ts | 2 +- backend/src/plugins/Tags/TagsPlugin.ts | 4 ++-- backend/src/plugins/TimeAndDate/TimeAndDatePlugin.ts | 2 +- backend/src/plugins/Utility/UtilityPlugin.ts | 2 +- backend/src/plugins/Utility/commands/HelpCmd.ts | 2 +- dashboard/src/components/docs/Plugin.vue | 11 ++++++----- dashboard/src/store/docs.ts | 4 ++-- dashboard/src/store/types.ts | 3 ++- 26 files changed, 37 insertions(+), 35 deletions(-) diff --git a/backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts b/backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts index b8575cc4..579f2f1c 100644 --- a/backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts +++ b/backend/src/plugins/AutoReactions/AutoReactionsPlugin.ts @@ -42,7 +42,7 @@ export const AutoReactionsPlugin = zeppelinGuildPlugin( defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ NewAutoReactionsCmd, DisableAutoReactionsCmd, ], diff --git a/backend/src/plugins/Automod/AutomodPlugin.ts b/backend/src/plugins/Automod/AutomodPlugin.ts index b485b4b9..a99f3288 100644 --- a/backend/src/plugins/Automod/AutomodPlugin.ts +++ b/backend/src/plugins/Automod/AutomodPlugin.ts @@ -218,7 +218,7 @@ export const AutomodPlugin = zeppelinGuildPlugin()({ // Messages use message events from SavedMessages, see onLoad below ], - commands: [AntiraidClearCmd, SetAntiraidCmd, ViewAntiraidCmd], + messageCommands: [AntiraidClearCmd, SetAntiraidCmd, ViewAntiraidCmd], async beforeLoad(pluginData) { pluginData.state.queue = new Queue(); diff --git a/backend/src/plugins/BotControl/BotControlPlugin.ts b/backend/src/plugins/BotControl/BotControlPlugin.ts index 7897d837..6f2d8056 100644 --- a/backend/src/plugins/BotControl/BotControlPlugin.ts +++ b/backend/src/plugins/BotControl/BotControlPlugin.ts @@ -41,7 +41,7 @@ export const BotControlPlugin = zeppelinGlobalPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ ReloadGlobalPluginsCmd, ServersCmd, LeaveServerCmd, diff --git a/backend/src/plugins/ChannelArchiver/ChannelArchiverPlugin.ts b/backend/src/plugins/ChannelArchiver/ChannelArchiverPlugin.ts index 9ff38a84..a0809e87 100644 --- a/backend/src/plugins/ChannelArchiver/ChannelArchiverPlugin.ts +++ b/backend/src/plugins/ChannelArchiver/ChannelArchiverPlugin.ts @@ -12,7 +12,7 @@ export const ChannelArchiverPlugin = zeppelinGuildPlugin()({ }, // prettier-ignore - commands: [ + messageCommands: [ CountersListCmd, ViewCounterCmd, AddCounterCmd, diff --git a/backend/src/plugins/LocateUser/LocateUserPlugin.ts b/backend/src/plugins/LocateUser/LocateUserPlugin.ts index 52a9b6fe..262c2c50 100644 --- a/backend/src/plugins/LocateUser/LocateUserPlugin.ts +++ b/backend/src/plugins/LocateUser/LocateUserPlugin.ts @@ -44,7 +44,7 @@ export const LocateUserPlugin = zeppelinGuildPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ WhereCmd, FollowCmd, ListFollowCmd, diff --git a/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts b/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts index eb529ffa..21bbe6e9 100644 --- a/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts +++ b/backend/src/plugins/MessageSaver/MessageSaverPlugin.ts @@ -28,7 +28,7 @@ export const MessageSaverPlugin = zeppelinGuildPlugin()( defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ SaveMessagesToDBCmd, SavePinsToDBCmd, ], diff --git a/backend/src/plugins/ModActions/ModActionsPlugin.ts b/backend/src/plugins/ModActions/ModActionsPlugin.ts index ba19a0b0..200e4d59 100644 --- a/backend/src/plugins/ModActions/ModActionsPlugin.ts +++ b/backend/src/plugins/ModActions/ModActionsPlugin.ts @@ -128,7 +128,7 @@ export const ModActionsPlugin = zeppelinGuildPlugin()({ events: [CreateBanCaseOnManualBanEvt, CreateUnbanCaseOnManualUnbanEvt, PostAlertOnMemberJoinEvt], - commands: [ + messageCommands: [ UpdateCmd, NoteCmd, WarnCmd, diff --git a/backend/src/plugins/Mutes/MutesPlugin.ts b/backend/src/plugins/Mutes/MutesPlugin.ts index 3df08168..8f95060e 100644 --- a/backend/src/plugins/Mutes/MutesPlugin.ts +++ b/backend/src/plugins/Mutes/MutesPlugin.ts @@ -72,7 +72,7 @@ export const MutesPlugin = zeppelinGuildPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ MutesCmd, ClearBannedMutesCmd, ClearMutesWithoutRoleCmd, diff --git a/backend/src/plugins/NameHistory/NameHistoryPlugin.ts b/backend/src/plugins/NameHistory/NameHistoryPlugin.ts index e59bea50..2eef5175 100644 --- a/backend/src/plugins/NameHistory/NameHistoryPlugin.ts +++ b/backend/src/plugins/NameHistory/NameHistoryPlugin.ts @@ -28,7 +28,7 @@ export const NameHistoryPlugin = zeppelinGuildPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ NamesCmd, ], diff --git a/backend/src/plugins/PingableRoles/PingableRolesPlugin.ts b/backend/src/plugins/PingableRoles/PingableRolesPlugin.ts index 56794474..dc2c959e 100644 --- a/backend/src/plugins/PingableRoles/PingableRolesPlugin.ts +++ b/backend/src/plugins/PingableRoles/PingableRolesPlugin.ts @@ -30,7 +30,7 @@ export const PingableRolesPlugin = zeppelinGuildPlugin( defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ PingableRoleEnableCmd, PingableRoleDisableCmd, ], diff --git a/backend/src/plugins/Post/PostPlugin.ts b/backend/src/plugins/Post/PostPlugin.ts index cc32bbbf..2eed1dd9 100644 --- a/backend/src/plugins/Post/PostPlugin.ts +++ b/backend/src/plugins/Post/PostPlugin.ts @@ -42,7 +42,7 @@ export const PostPlugin = zeppelinGuildPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ PostCmd, PostEmbedCmd, EditCmd, diff --git a/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts b/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts index 53068bdc..78554c15 100644 --- a/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts +++ b/backend/src/plugins/ReactionRoles/ReactionRolesPlugin.ts @@ -46,7 +46,7 @@ export const ReactionRolesPlugin = zeppelinGuildPlugin( defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ RefreshReactionRolesCmd, ClearReactionRolesCmd, InitReactionRolesCmd, diff --git a/backend/src/plugins/Reminders/RemindersPlugin.ts b/backend/src/plugins/Reminders/RemindersPlugin.ts index 62f6b29a..87a488dd 100644 --- a/backend/src/plugins/Reminders/RemindersPlugin.ts +++ b/backend/src/plugins/Reminders/RemindersPlugin.ts @@ -35,7 +35,7 @@ export const RemindersPlugin = zeppelinGuildPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ RemindCmd, RemindersCmd, RemindersDeleteCmd, diff --git a/backend/src/plugins/RoleButtons/RoleButtonsPlugin.ts b/backend/src/plugins/RoleButtons/RoleButtonsPlugin.ts index 3eaa4cd1..dd28c9fc 100644 --- a/backend/src/plugins/RoleButtons/RoleButtonsPlugin.ts +++ b/backend/src/plugins/RoleButtons/RoleButtonsPlugin.ts @@ -73,7 +73,7 @@ export const RoleButtonsPlugin = zeppelinGuildPlugin()({ events: [onButtonInteraction], - commands: [resetButtonsCmd], + messageCommands: [resetButtonsCmd], beforeLoad(pluginData) { pluginData.state.roleButtons = GuildRoleButtons.getGuildInstance(pluginData.guild.id); diff --git a/backend/src/plugins/Roles/RolesPlugin.ts b/backend/src/plugins/Roles/RolesPlugin.ts index c643b6d1..fa28bfec 100644 --- a/backend/src/plugins/Roles/RolesPlugin.ts +++ b/backend/src/plugins/Roles/RolesPlugin.ts @@ -46,7 +46,7 @@ export const RolesPlugin = zeppelinGuildPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ AddRoleCmd, RemoveRoleCmd, MassAddRoleCmd, diff --git a/backend/src/plugins/SelfGrantableRoles/SelfGrantableRolesPlugin.ts b/backend/src/plugins/SelfGrantableRoles/SelfGrantableRolesPlugin.ts index 82396cb9..b70a6c79 100644 --- a/backend/src/plugins/SelfGrantableRoles/SelfGrantableRolesPlugin.ts +++ b/backend/src/plugins/SelfGrantableRoles/SelfGrantableRolesPlugin.ts @@ -29,7 +29,7 @@ export const SelfGrantableRolesPlugin = zeppelinGuildPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ SlowmodeDisableCmd, SlowmodeClearCmd, SlowmodeListCmd, diff --git a/backend/src/plugins/Starboard/StarboardPlugin.ts b/backend/src/plugins/Starboard/StarboardPlugin.ts index c0070791..f8ef1489 100644 --- a/backend/src/plugins/Starboard/StarboardPlugin.ts +++ b/backend/src/plugins/Starboard/StarboardPlugin.ts @@ -135,7 +135,7 @@ export const StarboardPlugin = zeppelinGuildPlugin()({ }, // prettier-ignore - commands: [ + messageCommands: [ MigratePinsCmd, ], diff --git a/backend/src/plugins/Tags/TagsPlugin.ts b/backend/src/plugins/Tags/TagsPlugin.ts index c2cc6a1d..416cc972 100644 --- a/backend/src/plugins/Tags/TagsPlugin.ts +++ b/backend/src/plugins/Tags/TagsPlugin.ts @@ -68,7 +68,7 @@ export const TagsPlugin = zeppelinGuildPlugin()({ You use them by adding a \`{}\` on your tag. Here are the functions you can use in your tags: - + ${generateTemplateMarkdown(TemplateFunctions)} `), }, @@ -78,7 +78,7 @@ export const TagsPlugin = zeppelinGuildPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ TagEvalCmd, TagDeleteCmd, TagListCmd, diff --git a/backend/src/plugins/TimeAndDate/TimeAndDatePlugin.ts b/backend/src/plugins/TimeAndDate/TimeAndDatePlugin.ts index 2f0d6cdf..c4f9d877 100644 --- a/backend/src/plugins/TimeAndDate/TimeAndDatePlugin.ts +++ b/backend/src/plugins/TimeAndDate/TimeAndDatePlugin.ts @@ -45,7 +45,7 @@ export const TimeAndDatePlugin = zeppelinGuildPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ ResetTimezoneCmd, SetTimezoneCmd, ViewTimezoneCmd, diff --git a/backend/src/plugins/Utility/UtilityPlugin.ts b/backend/src/plugins/Utility/UtilityPlugin.ts index 26528c82..e3998a11 100644 --- a/backend/src/plugins/Utility/UtilityPlugin.ts +++ b/backend/src/plugins/Utility/UtilityPlugin.ts @@ -124,7 +124,7 @@ export const UtilityPlugin = zeppelinGuildPlugin()({ defaultOptions, // prettier-ignore - commands: [ + messageCommands: [ SearchCmd, BanSearchCmd, UserInfoCmd, diff --git a/backend/src/plugins/Utility/commands/HelpCmd.ts b/backend/src/plugins/Utility/commands/HelpCmd.ts index b03d3aa4..5094dcc8 100644 --- a/backend/src/plugins/Utility/commands/HelpCmd.ts +++ b/backend/src/plugins/Utility/commands/HelpCmd.ts @@ -24,7 +24,7 @@ export const HelpCmd = utilityCmd({ const guildData = pluginData.getKnubInstance().getLoadedGuild(pluginData.guild.id)!; for (const plugin of guildData.loadedPlugins.values()) { - const registeredCommands = plugin.pluginData.commands.getAll(); + const registeredCommands = plugin.pluginData.messageCommands.getAll(); for (const registeredCommand of registeredCommands) { for (const trigger of registeredCommand.originalTriggers) { const strTrigger = typeof trigger === "string" ? trigger : trigger.source; diff --git a/dashboard/src/components/docs/Plugin.vue b/dashboard/src/components/docs/Plugin.vue index 68c15f26..b384ea3d 100644 --- a/dashboard/src/components/docs/Plugin.vue +++ b/dashboard/src/components/docs/Plugin.vue @@ -45,10 +45,10 @@ - -
-

Commands

-
+
+

Message Commands

+

@@ -309,7 +309,8 @@ }, hasUsageInfo() { if (!this.data) return true; - if (this.data.commands.length) return true; + if (this.data.messageCommands.length) return true; + if (this.data.slashCommands.length) return true; if (this.data.info.usageGuide) return true; return false; }, diff --git a/dashboard/src/store/docs.ts b/dashboard/src/store/docs.ts index 8aaa4cfe..5ef5e0d2 100644 --- a/dashboard/src/store/docs.ts +++ b/dashboard/src/store/docs.ts @@ -34,8 +34,8 @@ export const DocsStore: Module = { if (state.plugins[name]) return; const data = await get(`docs/plugins/${name}`); - if (data && data.commands) { - data.commands.sort((a, b) => { + if (data && data.messageCommands) { + data.messageCommands.sort((a, b) => { const aName = (Array.isArray(a.trigger) ? a.trigger[0] : a.trigger).toLowerCase(); const bName = (Array.isArray(b.trigger) ? b.trigger[0] : b.trigger).toLowerCase(); if (aName > bName) return 1; diff --git a/dashboard/src/store/types.ts b/dashboard/src/store/types.ts index c7e2987b..ddecc560 100644 --- a/dashboard/src/store/types.ts +++ b/dashboard/src/store/types.ts @@ -54,7 +54,8 @@ export interface ThinDocsPlugin { } export interface DocsPlugin extends ThinDocsPlugin { - commands: any[]; + messageCommands: any[]; + slashCommands: any[]; defaultOptions: any; configSchema?: string; info: {