diff --git a/backend/src/plugins/Utility/commands/BanSearchCmd.ts b/backend/src/plugins/Utility/commands/BanSearchCmd.ts index 71bba571..df599b67 100644 --- a/backend/src/plugins/Utility/commands/BanSearchCmd.ts +++ b/backend/src/plugins/Utility/commands/BanSearchCmd.ts @@ -1,17 +1,17 @@ import { utilityCmd } from "../types"; -import { baseTypeHelpers as t } from "knub"; +import { commandTypeHelpers as ct } from "../../../commandTypes"; import { archiveSearch, displaySearch, SearchType } from "../search"; // Separate from BanSearchCmd to avoid a circular reference from ./search.ts export const banSearchSignature = { - query: t.string({ catchAll: true }), + query: ct.string({ catchAll: true }), - page: t.number({ option: true, shortcut: "p" }), - sort: t.string({ option: true }), - "case-sensitive": t.switchOption({ shortcut: "cs" }), - export: t.switchOption({ shortcut: "e" }), - ids: t.switchOption(), - regex: t.switchOption({ shortcut: "re" }), + page: ct.number({ option: true, shortcut: "p" }), + sort: ct.string({ option: true }), + "case-sensitive": ct.switchOption({ shortcut: "cs" }), + export: ct.switchOption({ shortcut: "e" }), + ids: ct.switchOption(), + regex: ct.switchOption({ shortcut: "re" }), }; export const BanSearchCmd = utilityCmd({ diff --git a/backend/src/plugins/Utility/commands/InfoCmd.ts b/backend/src/plugins/Utility/commands/InfoCmd.ts index 054dcc5a..81597bdb 100644 --- a/backend/src/plugins/Utility/commands/InfoCmd.ts +++ b/backend/src/plugins/Utility/commands/InfoCmd.ts @@ -1,5 +1,4 @@ import { utilityCmd } from "../types"; -import { baseTypeHelpers as t } from "knub"; import { commandTypeHelpers as ct } from "../../../commandTypes"; import { embedPadding, resolveMember, trimLines, UnknownUser } from "../../../utils"; import { EmbedOptions, GuildTextableChannel } from "eris"; @@ -16,7 +15,7 @@ export const InfoCmd = utilityCmd({ signature: { user: ct.resolvedUserLoose({ required: false }), - compact: t.switchOption({ shortcut: "c" }), + compact: ct.switchOption({ shortcut: "c" }), }, async run({ message: msg, args, pluginData }) { diff --git a/backend/src/plugins/Utility/commands/NicknameCmd.ts b/backend/src/plugins/Utility/commands/NicknameCmd.ts index 797dc9de..089e3c7e 100644 --- a/backend/src/plugins/Utility/commands/NicknameCmd.ts +++ b/backend/src/plugins/Utility/commands/NicknameCmd.ts @@ -1,6 +1,5 @@ import { utilityCmd } from "../types"; import { commandTypeHelpers as ct } from "../../../commandTypes"; -import { baseTypeHelpers as t } from "knub"; import { errorMessage } from "../../../utils"; import { canActOn, sendSuccessMessage } from "../../../pluginUtils"; @@ -12,7 +11,7 @@ export const NicknameCmd = utilityCmd({ signature: { member: ct.resolvedMember(), - nickname: t.string({ catchAll: true }), + nickname: ct.string({ catchAll: true }), }, async run({ message: msg, args, pluginData }) { diff --git a/backend/src/plugins/Utility/commands/RolesCmd.ts b/backend/src/plugins/Utility/commands/RolesCmd.ts index e6f515d4..93b047c3 100644 --- a/backend/src/plugins/Utility/commands/RolesCmd.ts +++ b/backend/src/plugins/Utility/commands/RolesCmd.ts @@ -1,5 +1,5 @@ import { utilityCmd } from "../types"; -import { baseTypeHelpers as t } from "knub"; +import { commandTypeHelpers as ct } from "../../../commandTypes"; import { Role, TextChannel } from "eris"; import { chunkArray, sorter, trimLines } from "../../../utils"; import { refreshMembersIfNeeded } from "../refreshMembers"; @@ -12,10 +12,10 @@ export const RolesCmd = utilityCmd({ permission: "can_roles", signature: { - search: t.string({ catchAll: true }), + search: ct.string({ catchAll: true }), - counts: t.switchOption(), - sort: t.string({ option: true }), + counts: ct.switchOption(), + sort: ct.string({ option: true }), }, async run({ message: msg, args, pluginData }) { diff --git a/backend/src/plugins/Utility/commands/SearchCmd.ts b/backend/src/plugins/Utility/commands/SearchCmd.ts index 784910d3..83881a58 100644 --- a/backend/src/plugins/Utility/commands/SearchCmd.ts +++ b/backend/src/plugins/Utility/commands/SearchCmd.ts @@ -1,21 +1,21 @@ import { utilityCmd } from "../types"; -import { baseTypeHelpers as t } from "knub"; +import { commandTypeHelpers as ct } from "../../../commandTypes"; import { archiveSearch, displaySearch, SearchType } from "../search"; // Separate from SearchCmd to avoid a circular reference from ./search.ts export const searchCmdSignature = { - query: t.string({ catchAll: true }), + query: ct.string({ catchAll: true }), - page: t.number({ option: true, shortcut: "p" }), - role: t.string({ option: true, shortcut: "r" }), - voice: t.switchOption({ shortcut: "v" }), - bot: t.switchOption({ shortcut: "b" }), - sort: t.string({ option: true }), - "case-sensitive": t.switchOption({ shortcut: "cs" }), - export: t.switchOption({ shortcut: "e" }), - ids: t.switchOption(), - regex: t.switchOption({ shortcut: "re" }), - "status-search": t.switchOption({ shortcut: "ss" }), + page: ct.number({ option: true, shortcut: "p" }), + role: ct.string({ option: true, shortcut: "r" }), + voice: ct.switchOption({ shortcut: "v" }), + bot: ct.switchOption({ shortcut: "b" }), + sort: ct.string({ option: true }), + "case-sensitive": ct.switchOption({ shortcut: "cs" }), + export: ct.switchOption({ shortcut: "e" }), + ids: ct.switchOption(), + regex: ct.switchOption({ shortcut: "re" }), + "status-search": ct.switchOption({ shortcut: "ss" }), }; export const SearchCmd = utilityCmd({