chore(release): 1.0.0-dev.28 [skip ci]

# @revanced/discord-bot [1.0.0-dev.28](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.27...@revanced/discord-bot@1.0.0-dev.28) (2024-09-20) ### Bug Fixes * **bots/discord:** don't refresh timer if force timer is active for sticky messages ([4abac0c](4abac0c890)) * **bots/discord:** filter out text triggers correctly from image-only scans ([8c0dd67](8c0dd67d03))
fix(bots/discord): don't refresh timer if force timer is active for sticky messages
2026-01-11 21:56:17 +00:00 · 2024-09-20 06:53:32 +00:00 · 2024-09-20 13:51:56 +07:00 · 2024-09-20 13:49:38 +07:00 · 2024-09-05 10:34:11 +00:00 · 2024-09-05 17:33:06 +07:00
39 changed files with 899 additions and 334 deletions
--- a/apis/websocket/CHANGELOG.md
+++ b/apis/websocket/CHANGELOG.md
@@ -1,3 +1,10 @@
+# @revanced/bot-websocket-api [1.0.0-dev.9](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.8...@revanced/bot-websocket-api@1.0.0-dev.9) (2024-08-03)
+
+
+### Features
+
+* **apis/websocket:** return `true` for data on a `TrainedMessage` packet ([65add4d](https://github.com/revanced/revanced-helper/commit/65add4dfeed2fa067c2c8e2377f7d01d505ade54))
+
 # @revanced/bot-websocket-api [1.0.0-dev.8](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.7...@revanced/bot-websocket-api@1.0.0-dev.8) (2024-07-31)


--- a/apis/websocket/package.json
+++ b/apis/websocket/package.json
@@ -2,7 +2,7 @@
  "name": "@revanced/bot-websocket-api",
  "type": "module",
  "private": true,
-  "version": "1.0.0-dev.8",
+  "version": "1.0.0-dev.9",
  "description": "🧦 WebSocket API server for bots assisting ReVanced",
  "main": "dist/index.js",
  "scripts": {
--- a/apis/websocket/src/events/trainMessage.ts
+++ b/apis/websocket/src/events/trainMessage.ts
@@ -18,7 +18,7 @@ const trainMessageEventHandler: EventHandler<ClientOperation.TrainMessage> = asy
        client.send(
            {
                op: ServerOperation.TrainedMessage,
-                d: null,
+                d: true,
            },
            nextSeq,
        )
--- a/bots/discord/CHANGELOG.md
+++ b/bots/discord/CHANGELOG.md
@@ -1,3 +1,86 @@
+# @revanced/discord-bot [1.0.0-dev.28](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.27...@revanced/discord-bot@1.0.0-dev.28) (2024-09-20)
+
+
+### Bug Fixes
+
+* **bots/discord:** don't refresh timer if force timer is active for sticky messages ([4abac0c](https://github.com/revanced/revanced-helper/commit/4abac0c890c0548e14cb56723cae919353a8e726))
+* **bots/discord:** filter out text triggers correctly from image-only scans ([8c0dd67](https://github.com/revanced/revanced-helper/commit/8c0dd67d03d5a1747993da08a5bf82a39de43789))
+
+# @revanced/discord-bot [1.0.0-dev.27](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.26...@revanced/discord-bot@1.0.0-dev.27) (2024-09-05)
+
+
+### Bug Fixes
+
+* **bots/discord:** correct permission check logic ([dd8872c](https://github.com/revanced/revanced-helper/commit/dd8872c027c7e7e1a00f38d659b4d6e79274238c))
+* **bots/discord:** give only removed roles for role presets ([522ad28](https://github.com/revanced/revanced-helper/commit/522ad28fd83565e9ca411dbce86c8447574288fd))
+* **bots/discord:** replace duration parser with a library ([94c4fed](https://github.com/revanced/revanced-helper/commit/94c4fedc06e20051e4123508e3134b97eb84782a))
+
+# @revanced/discord-bot [1.0.0-dev.27](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.26...@revanced/discord-bot@1.0.0-dev.27) (2024-08-23)
+
+
+### Bug Fixes
+
+* **bots/discord:** give only removed roles for role presets ([522ad28](https://github.com/revanced/revanced-helper/commit/522ad28fd83565e9ca411dbce86c8447574288fd))
+* **bots/discord:** replace duration parser with a library ([94c4fed](https://github.com/revanced/revanced-helper/commit/94c4fedc06e20051e4123508e3134b97eb84782a))
+
+# @revanced/discord-bot [1.0.0-dev.26](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.25...@revanced/discord-bot@1.0.0-dev.26) (2024-08-15)
+
+
+### Bug Fixes
+
+* **bots/discord:** correct timer active condition for sticky messages ([96065ff](https://github.com/revanced/revanced-helper/commit/96065ff17584ff99a56ca5008327863ca5a7852b))
+
+# @revanced/discord-bot [1.0.0-dev.25](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.24...@revanced/discord-bot@1.0.0-dev.25) (2024-08-15)
+
+
+### Bug Fixes
+
+* **bots/discord:** allow access to `context` in `/eval` and await result ([99f65f0](https://github.com/revanced/revanced-helper/commit/99f65f07f5f8830c6e8ea4ae171e986af4d3f1f6))
+
+# @revanced/discord-bot [1.0.0-dev.24](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.23...@revanced/discord-bot@1.0.0-dev.24) (2024-08-14)
+
+
+### Bug Fixes
+
+* **bots/discord:** do not remove unrelated reactions ([031fd26](https://github.com/revanced/revanced-helper/commit/031fd26b2619ecafeff3964e50accacb87de6108))
+
+# @revanced/discord-bot [1.0.0-dev.23](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.22...@revanced/discord-bot@1.0.0-dev.23) (2024-08-13)
+
+
+### Features
+
+* **bots/discord:** add `train` commands ([ee90ef2](https://github.com/revanced/revanced-helper/commit/ee90ef247b4bf2b3c0698606b947116f2dc1b868))
+* **bots/discord:** update to newer command definition framework ([97f2795](https://github.com/revanced/revanced-helper/commit/97f2795df4ede4d12a08193dba453c1bc765a4c2))
+
+# @revanced/discord-bot [1.0.0-dev.22](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.21...@revanced/discord-bot@1.0.0-dev.22) (2024-08-10)
+
+
+### Bug Fixes
+
+* **bots/discord:** parse larger units of durations, fix wrong timestamp in mod embed ([6c8dce0](https://github.com/revanced/revanced-helper/commit/6c8dce059366a6ef85f5b8b1794c056515b9f5b6))
+* **bots/discord:** provide discord token for `reload` command ([dd21a5a](https://github.com/revanced/revanced-helper/commit/dd21a5abad560f3d00b8c58912786d4b6bd520e9))
+
+
+### Features
+
+* **bots/discord:** add code to actually scan text files correctly ([80aeb19](https://github.com/revanced/revanced-helper/commit/80aeb1902063140a2e78cfaed9424e5101ab03f1))
+
+# @revanced/discord-bot [1.0.0-dev.21](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.20...@revanced/discord-bot@1.0.0-dev.21) (2024-08-04)
+
+
+### Bug Fixes
+
+* **bots/discord:** correct sticky messages logic ([de8bef6](https://github.com/revanced/revanced-helper/commit/de8bef6520d53a1299f0478458320a7eb75c5e1d))
+* **bots/discord:** make `/eval` work ([eaa25f2](https://github.com/revanced/revanced-helper/commit/eaa25f2eb58a9e2d25bb98633ad668485e099714))
+* **bots/discord:** some configuration values not applying after running `/reload` ([a976dd2](https://github.com/revanced/revanced-helper/commit/a976dd2accc4b74914651245acde0979c30c92f5))
+
+# @revanced/discord-bot [1.0.0-dev.20](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.19...@revanced/discord-bot@1.0.0-dev.20) (2024-08-03)
+
+
+### Bug Fixes
+
+* **bots/discord:** await when putting entries into db ([4da6175](https://github.com/revanced/revanced-helper/commit/4da6175cf58b1fa6144bdc71ec806766d32c1025))
+
 # @revanced/discord-bot [1.0.0-dev.19](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.18...@revanced/discord-bot@1.0.0-dev.19) (2024-08-03)


--- a/bots/discord/package.json
+++ b/bots/discord/package.json
@@ -2,16 +2,15 @@
  "name": "@revanced/discord-bot",
  "type": "module",
  "private": true,
-  "version": "1.0.0-dev.19",
+  "version": "1.0.0-dev.28",
  "description": "🤖 Discord bot assisting ReVanced",
  "main": "src/index.ts",
  "scripts": {
-    "register": "bun run scripts/reload-slash-commands.ts",
    "start": "bun prepare && bun run src/index.ts",
    "dev": "bun prepare && bun --watch src/index.ts",
    "build": "bun prepare && bun run scripts/build.ts",
    "watch": "bun dev",
-    "prepare": "bun run scripts/generate-indexes.ts && bunx drizzle-kit generate --name=schema"
+    "prepare": "bun run scripts/generate-indexes.ts && bunx --bun drizzle-kit generate --name=schema"
  },
  "repository": {
    "type": "git",
@@ -34,13 +33,14 @@
    "@revanced/bot-api": "workspace:*",
    "@revanced/bot-shared": "workspace:*",
    "chalk": "^5.3.0",
-    "decancer": "^3.2.3",
+    "decancer": "^3.2.4",
    "discord.js": "^14.15.3",
-    "drizzle-orm": "^0.31.4"
+    "drizzle-orm": "^0.31.4",
+    "parse-duration": "^1.1.0"
  },
  "devDependencies": {
    "@libsql/client": "^0.7.0",
-    "discord-api-types": "^0.37.92",
+    "discord-api-types": "^0.37.97",
    "drizzle-kit": "^0.22.8"
  }
 }
--- a/bots/discord/src/classes/Command.ts
+++ b/bots/discord/src/classes/Command.ts
@@ -1,76 +1,145 @@
-import { ApplicationCommandOptionType } from 'discord.js'
+import { ApplicationCommandOptionType, ApplicationCommandType } from 'discord.js'
+import { isAdmin } from '../utils/discord/permissions'

-import { createErrorEmbed } from '$/utils/discord/embeds'
-import { isAdmin } from '$/utils/discord/permissions'
-
-import { config } from '../context'
 import CommandError, { CommandErrorType } from './CommandError'

-import type { Filter } from 'config.schema'
 import type {
    APIApplicationCommandChannelOption,
    CacheType,
    Channel,
    ChatInputCommandInteraction,
+    CommandInteraction,
    CommandInteractionOption,
    GuildMember,
    Message,
+    MessageContextMenuCommandInteraction,
+    RESTPostAPIApplicationCommandsJSONBody,
    RESTPostAPIChatInputApplicationCommandsJSONBody,
    Role,
    User,
+    UserContextMenuCommandInteraction,
+    UserResolvable,
 } from 'discord.js'
+import { config } from '../context'
+
+export enum CommandType {
+    ChatGlobal = 1,
+    ChatGuild,
+    ContextMenuUser,
+    ContextMenuMessage,
+    ContextMenuGuildMessage,
+    ContextMenuGuildMember,
+}

 export default class Command<
-    Global extends boolean = false,
-    Options extends CommandOptionsOptions | undefined = undefined,
-    AllowMessageCommand extends boolean = false,
+    const Type extends CommandType = CommandType.ChatGuild,
+    const Options extends If<IsContextMenu<Type>, undefined, CommandOptionsOptions | undefined> = undefined,
+    const AllowMessageCommand extends If<IsContextMenu<Type>, false, boolean> = false,
 > {
    name: string
    description: string
    requirements?: CommandRequirements
    options?: Options
-    global?: Global
-    #execute: CommandExecuteFunction<Global, Options, AllowMessageCommand>
+    type: Type
+    allowMessageCommand: AllowMessageCommand
+    #execute: CommandExecuteFunction<Type, Options, AllowMessageCommand>

    static OptionType = ApplicationCommandOptionType
+    static Type = CommandType

    constructor({
        name,
        description,
        requirements,
        options,
-        global,
+        type,
+        allowMessageCommand,
        execute,
-    }: CommandOptions<Global, Options, AllowMessageCommand>) {
+    }: CommandOptions<Type, Options, AllowMessageCommand>) {
        this.name = name
-        this.description = description
+        this.description = description!
        this.requirements = requirements
        this.options = options
-        this.global = global
+        // @ts-expect-error: Default is `CommandType.GuildOnly`, it makes sense
+        this.type = type ?? CommandType.ChatGuild
+        // @ts-expect-error: Default is `false`, it makes sense
+        this.allowMessageCommand = allowMessageCommand ?? false
        this.#execute = execute
    }

+    isGuildSpecific(): this is Command<
+        CommandType.ChatGuild | CommandType.ContextMenuGuildMember | CommandType.ContextMenuGuildMessage,
+        Options,
+        AllowMessageCommand
+    > {
+        return [
+            CommandType.ChatGuild,
+            CommandType.ContextMenuGuildMessage,
+            CommandType.ContextMenuGuildMember,
+        ].includes(this.type)
+    }
+
+    isContextMenuSpecific(): this is Command<
+        | CommandType.ContextMenuGuildMessage
+        | CommandType.ContextMenuGuildMember
+        | CommandType.ContextMenuUser
+        | CommandType.ContextMenuMessage,
+        undefined,
+        false
+    > {
+        return [
+            CommandType.ContextMenuMessage,
+            CommandType.ContextMenuUser,
+            CommandType.ContextMenuGuildMessage,
+            CommandType.ContextMenuGuildMember,
+        ].includes(this.type)
+    }
+
+    isGuildContextMenuSpecific(): this is Command<
+        CommandType.ContextMenuGuildMessage | CommandType.ContextMenuGuildMember,
+        undefined,
+        false
+    > {
+        return [CommandType.ContextMenuGuildMessage, CommandType.ContextMenuGuildMember].includes(this.type)
+    }
+
+    async onContextMenuInteraction(
+        context: typeof import('../context'),
+        interaction: If<
+            Extends<Type, CommandType.ContextMenuGuildMessage>,
+            MessageContextMenuCommandInteraction<ToCacheType<Type>>,
+            UserContextMenuCommandInteraction<ToCacheType<Type>>
+        >,
+    ): Promise<unknown> {
+        if (!this.isGuildSpecific() && !interaction.inGuild())
+            throw new CommandError(CommandErrorType.InteractionNotInGuild)
+
+        const executor = await this.#fetchInteractionExecutor(interaction)
+        const target =
+            this.type === CommandType.ContextMenuGuildMember
+                ? this.isGuildSpecific()
+                    ? fetchMember(interaction as CommandInteraction<'raw' | 'cached'>, interaction.targetId)
+                    : interaction.client.users.fetch(interaction.targetId)
+                : interaction.channel?.messages.fetch(interaction.targetId)
+
+        if (!target) throw new CommandError(CommandErrorType.FetchManagerNotFound)
+
+        // @ts-expect-error: Type mismatch (again!) because TypeScript is not smart enough
+        return await this.#execute({ ...context, executor, target }, interaction, undefined)
+    }
+
    async onMessage(
        context: typeof import('../context'),
-        msg: Message<If<Global, false, true>>,
+        msg: Message<IsGuildSpecific<Type>>,
        args: CommandArguments,
    ): Promise<unknown> {
-        if (!this.global && !msg.inGuild())
-            return await msg.reply({
-                embeds: [createErrorEmbed('Cannot run this command', 'This command can only be used in a server.')],
-            })
+        if (!this.allowMessageCommand) return
+        if (!this.isGuildSpecific() && !msg.guildId) throw new CommandError(CommandErrorType.InteractionNotInGuild)

-        const executor = this.global ? msg.author : await msg.guild?.members.fetch(msg.author.id)!
-
-        if (!(await this.canExecute(executor, msg.channelId)))
-            return await msg.reply({
-                embeds: [
-                    createErrorEmbed(
-                        'Cannot run this command',
-                        'You do not meet the requirements to run this command.',
-                    ),
-                ],
-            })
+        const executor = this.isGuildSpecific()
+            ? await msg.guild?.members.fetch(msg.author)!
+            : await msg.client.users.fetch(msg.author)
+        if (!(await this.canExecute(executor))) throw new CommandError(CommandErrorType.RequirementsNotMet)

        const options = this.options
            ? ((await this.#resolveMessageOptions(msg, this.options, args)) as CommandExecuteFunctionOptionsParameter<
@@ -120,14 +189,18 @@ export default class Command<
                    `Invalid type for argument **${name}**.${argExplainationString}\n\nExpected type: **${expectedType}**\nGot type: **${ApplicationCommandOptionType[arg.type]}**${choicesString}`,
                )

-            if ('choices' in option && option.choices && !option.choices.some(({ value }) => value === arg))
+            const argValue = typeof arg === 'string' ? arg : arg?.id
+
+            if (
+                'choices' in option &&
+                option.choices &&
+                !option.choices.some(({ value }) => value === (typeof value === 'number' ? Number(argValue) : argValue))
+            )
                throw new CommandError(
                    CommandErrorType.InvalidArgument,
-                    `Invalid choice for argument **${name}**.\n${argExplainationString}\n\n${choicesString}\n`,
+                    `Invalid choice for argument **${name}**.\n${argExplainationString}${choicesString}\n`,
                )

-            const argValue = typeof arg === 'string' ? arg : arg?.id
-
            if (argValue && arg) {
                if (isSubcommandLikeOption) {
                    const [subcommandName, subcommandOption] = iterableOptions.find(([name]) => name === argValue)!
@@ -142,6 +215,16 @@ export default class Command<
                    break
                }

+                if (
+                    type === ApplicationCommandOptionType.String &&
+                    ((typeof option.minLength === 'number' && argValue.length < option.minLength) ||
+                        (typeof option.maxLength === 'number' && argValue.length > option.maxLength))
+                )
+                    throw new CommandError(
+                        CommandErrorType.InvalidArgument,
+                        `Invalid string length for argument **${name}**.\nLengths allowed: ${option.minLength ?? '(any)'} - ${option.maxLength ?? '(any)'}.${argExplainationString}`,
+                    )
+
                if (
                    (type === ApplicationCommandOptionType.Channel ||
                        type === ApplicationCommandOptionType.User ||
@@ -153,14 +236,21 @@ export default class Command<
                        `Malformed ID for argument **${name}**.${argExplainationString}`,
                    )

-                if (
-                    (type === ApplicationCommandOptionType.Number || type === ApplicationCommandOptionType.Integer) &&
-                    Number.isNaN(Number(argValue))
-                ) {
-                    throw new CommandError(
-                        CommandErrorType.InvalidArgument,
-                        `Invalid number for argument **${name}**.${argExplainationString}`,
+                if (type === ApplicationCommandOptionType.Number || type === ApplicationCommandOptionType.Integer) {
+                    if (Number.isNaN(Number(argValue)))
+                        throw new CommandError(
+                            CommandErrorType.InvalidArgument,
+                            `Invalid number for argument **${name}**.${argExplainationString}`,
+                        )
+
+                    if (
+                        (typeof option.min === 'number' && Number(argValue) < option.min) ||
+                        (typeof option.max === 'number' && Number(argValue) > option.max)
                    )
+                        throw new CommandError(
+                            CommandErrorType.InvalidArgument,
+                            `Number out of range for argument **${name}**.\nRange allowed: ${option.min ?? '(any)'} - ${option.max ?? '(any)'}.${argExplainationString}`,
+                        )
                }

                if (
@@ -177,7 +267,7 @@ export default class Command<
                    type === ApplicationCommandOptionType.Number || type === ApplicationCommandOptionType.Integer
                        ? Number(argValue)
                        : type === ApplicationCommandOptionType.Boolean
-                          ? argValue[0] === 't' || argValue[0] === 'y'
+                          ? ['t', 'y', 'yes', 'true'].some(value => value === argValue.toLowerCase())
                          : type === ApplicationCommandOptionType.Channel
                            ? await msg.client.channels.fetch(argValue)
                            : type === ApplicationCommandOptionType.User
@@ -191,44 +281,27 @@ export default class Command<
        return _options
    }

+    #fetchInteractionExecutor(interaction: CommandInteraction) {
+        return this.isGuildSpecific()
+            ? fetchMember(interaction as CommandInteraction<'raw' | 'cached'>)
+            : fetchUser(interaction)
+    }
+
    async onInteraction(
        context: typeof import('../context'),
        interaction: ChatInputCommandInteraction,
    ): Promise<unknown> {
-        const { logger } = context
+        if (interaction.commandName !== this.name)
+            throw new CommandError(
+                CommandErrorType.InteractionDataMismatch,
+                'The interaction command name does not match the expected command name.',
+            )

-        if (interaction.commandName !== this.name) {
-            logger.warn(`Command name mismatch, expected ${this.name}, but got ${interaction.commandName}!`)
-            return await interaction.reply({
-                embeds: [
-                    createErrorEmbed(
-                        'Internal command name mismatch',
-                        'The interaction command name does not match the expected command name.',
-                    ),
-                ],
-            })
-        }
+        if (!this.isGuildSpecific() && !interaction.inGuild())
+            throw new CommandError(CommandErrorType.InteractionNotInGuild)

-        if (!this.global && !interaction.inGuild()) {
-            logger.error(`Command ${this.name} cannot be run in DMs, but was registered as global`)
-            return await interaction.reply({
-                embeds: [createErrorEmbed('Cannot run this command', 'This command can only be used in a server.')],
-                ephemeral: true,
-            })
-        }
-
-        const executor = this.global ? interaction.user : await interaction.guild?.members.fetch(interaction.user.id)!
-
-        if (!(await this.canExecute(executor, interaction.channelId)))
-            return await interaction.reply({
-                embeds: [
-                    createErrorEmbed(
-                        'Cannot run this command',
-                        'You do not meet the requirements to run this command.',
-                    ),
-                ],
-                ephemeral: true,
-            })
+        const executor = await this.#fetchInteractionExecutor(interaction)
+        if (!(await this.canExecute(executor))) throw new CommandError(CommandErrorType.RequirementsNotMet)

        const options = this.options
            ? ((await this.#resolveInteractionOptions(interaction)) as CommandExecuteFunctionOptionsParameter<
@@ -237,14 +310,10 @@ export default class Command<
            : undefined

        if (options === null)
-            return await interaction.reply({
-                embeds: [
-                    createErrorEmbed(
-                        'Internal command option type mismatch',
-                        'The interaction command option type does not match the expected command option type.',
-                    ),
-                ],
-            })
+            throw new CommandError(
+                CommandErrorType.InteractionDataMismatch,
+                'The registered interaction command option type does not match the expected command option type.',
+            )

        // @ts-expect-error: Type mismatch (again!) because TypeScript is not smart enough
        return await this.#execute({ ...context, executor }, interaction, options)
@@ -288,7 +357,7 @@ export default class Command<
        return _options
    }

-    async canExecute(executor: User | GuildMember, channelId: string): Promise<boolean> {
+    async canExecute(executor: User | GuildMember): Promise<boolean> {
        if (!this.requirements) return false

        const isExecutorAdmin = isAdmin(executor)
@@ -296,7 +365,6 @@ export default class Command<

        const {
            adminOnly,
-            channels,
            roles,
            permissions,
            users,
@@ -305,16 +373,23 @@ export default class Command<
            memberRequirementsForUsers = 'pass',
        } = this.requirements

-        const member = this.global ? null : (executor as GuildMember)
-        const bDefCond = defaultCondition !== 'fail'
-        const bMemReqForUsers = memberRequirementsForUsers !== 'fail'
+        const member = this.isGuildSpecific() ? (executor as GuildMember) : null
+        const boolDefaultCondition = defaultCondition !== 'fail'
+        const boolMemberRequirementsForUsers = memberRequirementsForUsers !== 'fail'

        const conditions = [
-            adminOnly ? isExecutorAdmin : bDefCond,
-            channels ? channels.includes(channelId) : bDefCond,
-            member ? (roles ? roles.some(role => member.roles.cache.has(role)) : bDefCond) : bMemReqForUsers,
-            member ? (permissions ? member.permissions.has(permissions) : bDefCond) : bMemReqForUsers,
-            users ? users.includes(executor.id) : bDefCond,
+            adminOnly ? isExecutorAdmin : boolDefaultCondition,
+            users ? users.includes(executor.id) : boolDefaultCondition,
+            member
+                ? roles
+                    ? roles.some(role => member.roles.cache.has(role))
+                    : boolDefaultCondition
+                : boolMemberRequirementsForUsers,
+            member
+                ? permissions
+                    ? member.permissions.has(permissions)
+                    : boolDefaultCondition
+                : boolMemberRequirementsForUsers,
        ]

        if (mode === 'all' && conditions.some(condition => !condition)) return false
@@ -323,14 +398,27 @@ export default class Command<
        return true
    }

-    get json(): RESTPostAPIChatInputApplicationCommandsJSONBody & { contexts: Array<0 | 1 | 2> } {
-        return {
+    get json(): RESTPostAPIApplicationCommandsJSONBody {
+        // @ts-expect-error: I hate union types in TypeScript
+        const base: RESTPostAPIApplicationCommandsJSONBody = {
            name: this.name,
+            type:
+                this.type === CommandType.ContextMenuGuildMessage || this.type === CommandType.ContextMenuMessage
+                    ? ApplicationCommandType.Message
+                    : this.type === CommandType.ContextMenuGuildMember || this.type === CommandType.ContextMenuUser
+                      ? ApplicationCommandType.User
+                      : ApplicationCommandType.ChatInput,
+        }
+
+        if (this.isContextMenuSpecific()) return base
+
+        return {
+            ...base,
            description: this.description,
            options: this.options ? this.#transformOptions(this.options) : undefined,
            // https://discord.com/developers/docs/interactions/receiving-and-responding#interaction-object-interaction-context-types
-            contexts: this.global ? [0] : [0, 1],
-        }
+            contexts: this.isGuildSpecific() ? [0] : [0, 1, 2],
+        } as RESTPostAPIChatInputApplicationCommandsJSONBody & { contexts: Array<0 | 1 | 2> }
    }

    #transformOptions(optionsObject: Record<string, CommandOption>) {
@@ -377,8 +465,8 @@ export default class Command<
 export class ModerationCommand<
    Options extends CommandOptionsOptions,
    AllowMessageCommand extends boolean = true,
-> extends Command<false, Options, AllowMessageCommand> {
-    constructor(options: ExtendedCommandOptions<false, Options, AllowMessageCommand>) {
+> extends Command<CommandType.ChatGuild, Options, AllowMessageCommand> {
+    constructor(options: ExtendedCommandOptions<CommandType.ChatGuild, Options, AllowMessageCommand>) {
        super({
            ...options,
            requirements: {
@@ -388,17 +476,16 @@ export class ModerationCommand<
            },
            // @ts-expect-error: No thanks
            allowMessageCommand: options.allowMessageCommand ?? true,
-            global: false,
+            type: CommandType.ChatGuild,
        })
    }
 }

-export class AdminCommand<Options extends CommandOptionsOptions, AllowMessageCommand extends boolean> extends Command<
-    true,
-    Options,
-    AllowMessageCommand
-> {
-    constructor(options: ExtendedCommandOptions<true, Options, AllowMessageCommand>) {
+export class AdminCommand<
+    Options extends CommandOptionsOptions,
+    AllowMessageCommand extends boolean = true,
+> extends Command<CommandType.ChatGlobal, Options, AllowMessageCommand> {
+    constructor(options: ExtendedCommandOptions<CommandType.ChatGlobal, Options, AllowMessageCommand>) {
        super({
            ...options,
            requirements: {
@@ -406,38 +493,52 @@ export class AdminCommand<Options extends CommandOptionsOptions, AllowMessageCom
                adminOnly: true,
                defaultCondition: 'pass',
            },
-            global: true,
+            allowMessageCommand: options.allowMessageCommand ?? (true as AllowMessageCommand),
+            type: CommandType.ChatGlobal,
        })
    }
 }

+const fetchMember = async (
+    interaction: CommandInteraction<'raw' | 'cached'>,
+    source: UserResolvable = interaction.user,
+    manager = interaction.guild?.members,
+) => {
+    const _manager = manager ?? (await interaction.client.guilds.fetch(interaction.guildId).then(it => it.members))
+    if (!_manager) throw new CommandError(CommandErrorType.FetchManagerNotFound, 'Cannot fetch member.')
+    return await _manager.fetch(source)
+}
+
+const fetchUser = (interaction: CommandInteraction, source: UserResolvable = interaction.user) => {
+    return interaction.client.users.fetch(source)
+}
+
 /* TODO: 
    APIApplicationCommandAttachmentOption
    APIApplicationCommandMentionableOption
    APIApplicationCommandRoleOption
 */

-export interface CommandOptions<
-    Global extends boolean,
+export type CommandOptions<
+    Type extends CommandType,
    Options extends CommandOptionsOptions | undefined,
    AllowMessageCommand extends boolean,
-> {
+> = {
    name: string
-    description: string
    requirements?: CommandRequirements
    options?: Options
-    execute: CommandExecuteFunction<Global, Options, AllowMessageCommand>
-    global?: Global
+    execute: CommandExecuteFunction<Type, Options, AllowMessageCommand>
+    type?: Type
    allowMessageCommand?: AllowMessageCommand
-}
+} & If<IsContextMenu<Type>, { description?: never }, { description: string }>

 export type CommandArguments = Array<string | CommandSpecialArgument>
-
 export type CommandSpecialArgument = {
    type: (typeof CommandSpecialArgumentType)[keyof typeof CommandSpecialArgumentType]
    id: string
 }

+//! If things ever get minified, this will most likely break property access via string names
 export const CommandSpecialArgumentType = {
    Channel: ApplicationCommandOptionType.Channel,
    Role: ApplicationCommandOptionType.Role,
@@ -445,31 +546,56 @@ export const CommandSpecialArgumentType = {
 }

 type ExtendedCommandOptions<
-    Global extends boolean,
+    Type extends CommandType,
    Options extends CommandOptionsOptions,
    AllowMessageCommand extends boolean,
-> = Omit<CommandOptions<Global, Options, AllowMessageCommand>, 'global'> & {
-    requirements?: Omit<CommandOptions<false, Options, AllowMessageCommand>['requirements'], 'defaultCondition'>
+> = Omit<CommandOptions<Type, Options, AllowMessageCommand>, 'type'> & {
+    requirements?: Omit<CommandOptions<Type, Options, AllowMessageCommand>['requirements'], 'defaultCondition'>
 }

 export type CommandOptionsOptions = Record<string, CommandOption>

+type ToCacheType<Type extends CommandType> = If<IsGuildSpecific<Type>, 'raw' | 'cached', CacheType>
+
 type CommandExecuteFunction<
-    Global extends boolean,
+    Type extends CommandType,
    Options extends CommandOptionsOptions | undefined,
    AllowMessageCommand extends boolean,
 > = (
-    context: CommandContext<Global>,
+    context: CommandContext<Type>,
    trigger: If<
        AllowMessageCommand,
-        Message<InvertBoolean<Global>> | ChatInputCommandInteraction<If<Global, CacheType, 'raw' | 'cached'>>,
-        ChatInputCommandInteraction<If<Global, CacheType, 'raw' | 'cached'>>
+        Message<IsGuildSpecific<Type>> | CommandTypeToInteractionMap<ToCacheType<Type>>[Type],
+        CommandTypeToInteractionMap<ToCacheType<Type>>[Type]
    >,
    options: Options extends CommandOptionsOptions ? CommandExecuteFunctionOptionsParameter<Options> : never,
 ) => Promise<unknown> | unknown

+type CommandTypeToInteractionMap<CT extends CacheType> = {
+    [CommandType.ChatGlobal]: ChatInputCommandInteraction<CT>
+    [CommandType.ChatGuild]: ChatInputCommandInteraction<CT>
+    [CommandType.ContextMenuUser]: UserContextMenuCommandInteraction<CT>
+    [CommandType.ContextMenuMessage]: MessageContextMenuCommandInteraction<CT>
+    [CommandType.ContextMenuGuildMessage]: MessageContextMenuCommandInteraction<CT>
+    [CommandType.ContextMenuGuildMember]: MessageContextMenuCommandInteraction<CT>
+}
+
+type IsContextMenu<Type extends CommandType> = Extends<
+    Type,
+    | CommandType.ContextMenuGuildMessage
+    | CommandType.ContextMenuGuildMember
+    | CommandType.ContextMenuMessage
+    | CommandType.ContextMenuUser
+>
+
+type IsGuildSpecific<Type extends CommandType> = Extends<
+    Type,
+    CommandType.ChatGuild | CommandType.ContextMenuGuildMember | CommandType.ContextMenuGuildMessage
+>
+
+type Extends<T, U> = T extends U ? true : false
 type If<T extends boolean | undefined, U, V> = T extends true ? U : V
-type InvertBoolean<T extends boolean> = If<T, false, true>
+// type InvertBoolean<T extends boolean> = If<T, false, true>

 type CommandExecuteFunctionOptionsParameter<Options extends CommandOptionsOptions> = {
    [K in keyof Options]: Options[K]['type'] extends
@@ -484,8 +610,13 @@ type CommandExecuteFunctionOptionsParameter<Options extends CommandOptionsOption
          >
 }

-type CommandContext<Global extends boolean> = typeof import('../context') & {
-    executor: CommandExecutor<Global>
+type CommandContext<Type extends CommandType> = typeof import('../context') & {
+    executor: CommandExecutor<Type>
+    target: If<
+        Extends<Type, CommandType.ContextMenuGuildMember>,
+        GuildMember,
+        If<Extends<Type, CommandType.ContextMenuGuildMessage>, Message<true>, never>
+    >
 }

 type CommandOptionValueMap = {
@@ -511,7 +642,7 @@ type CommandOption =
    | CommandSubcommandOption
    | CommandSubcommandGroupOption

-type CommandExecutor<Global extends boolean> = If<Global, User, GuildMember>
+type CommandExecutor<Type extends CommandType> = If<IsGuildSpecific<Type>, GuildMember, User>

 type CommandOptionBase<Type extends ApplicationCommandOptionType> = {
    type: Type
@@ -585,10 +716,12 @@ interface CommandSubcommandLikeOption<
 type CommandSubcommandOption = CommandSubcommandLikeOption<ApplicationCommandOptionType.Subcommand>
 type CommandSubcommandGroupOption = CommandSubcommandLikeOption<ApplicationCommandOptionType.SubcommandGroup>

-export type CommandRequirements = Filter & {
-    mode?: 'all' | 'any'
-    adminOnly?: boolean
+export type CommandRequirements = {
+    users?: string[]
+    roles?: string[]
    permissions?: bigint
+    adminOnly?: boolean
    defaultCondition?: 'fail' | 'pass'
-    memberRequirementsForUsers?: 'pass' | 'fail'
+    memberRequirementsForUsers?: 'fail' | 'pass'
+    mode?: 'all' | 'any'
 }
--- a/bots/discord/src/classes/CommandError.ts
+++ b/bots/discord/src/classes/CommandError.ts
@@ -1,9 +1,9 @@
-import { createErrorEmbed } from '$/utils/discord/embeds'
+import { createErrorEmbed } from '../utils/discord/embeds'

 export default class CommandError extends Error {
    type: CommandErrorType

-    constructor(type: CommandErrorType, message?: string) {
+    constructor(type: CommandErrorType, message: string = ErrorMessageMap[type]) {
        super(message)
        this.name = 'CommandError'
        this.type = type
@@ -15,19 +15,34 @@ export default class CommandError extends Error {
 }

 export enum CommandErrorType {
-    Generic,
+    Generic = 1,
+    InteractionNotInGuild,
+    InteractionDataMismatch,
+    FetchManagerNotFound,
+    FetchNotFound,
+    RequirementsNotMet = 100,
    MissingArgument,
    InvalidArgument,
-    InvalidUser,
-    InvalidChannel,
-    InvalidDuration,
 }

 const ErrorTitleMap: Record<CommandErrorType, string> = {
    [CommandErrorType.Generic]: 'An exception was thrown',
+    [CommandErrorType.InteractionNotInGuild]: 'This command can only be used in servers',
+    [CommandErrorType.InteractionDataMismatch]: 'Command data mismatch',
+    [CommandErrorType.FetchManagerNotFound]: 'Cannot fetch data (manager not found)',
+    [CommandErrorType.FetchNotFound]: 'Cannot fetch data (source not found)',
+    [CommandErrorType.RequirementsNotMet]: 'Command requirements not met',
    [CommandErrorType.MissingArgument]: 'Missing argument',
    [CommandErrorType.InvalidArgument]: 'Invalid argument',
-    [CommandErrorType.InvalidUser]: 'Invalid user',
-    [CommandErrorType.InvalidChannel]: 'Invalid channel',
-    [CommandErrorType.InvalidDuration]: 'Invalid duration',
+}
+
+const ErrorMessageMap: Record<CommandErrorType, string> = {
+    [CommandErrorType.Generic]: 'An generic exception was thrown.',
+    [CommandErrorType.InteractionNotInGuild]: 'This command can only be used in servers.',
+    [CommandErrorType.InteractionDataMismatch]: 'Interaction command data does not match the expected command data.',
+    [CommandErrorType.FetchManagerNotFound]: 'Cannot fetch required data.',
+    [CommandErrorType.FetchNotFound]: 'Cannot fetch target.',
+    [CommandErrorType.RequirementsNotMet]: 'You do not meet the requirements to use this command.',
+    [CommandErrorType.MissingArgument]: 'You are missing a required argument.',
+    [CommandErrorType.InvalidArgument]: 'You provided an invalid argument.',
 }
--- a/bots/discord/src/commands/admin/eval.ts
+++ b/bots/discord/src/commands/admin/eval.ts
@@ -1,5 +1,4 @@
 import { inspect } from 'util'
-import { runInThisContext } from 'vm'
 import { ApplicationCommandOptionType } from 'discord.js'

 import { AdminCommand } from '$/classes/Command'
@@ -20,13 +19,23 @@ export default new AdminCommand({
            required: false,
        },
    },
-    async execute(_, trigger, { code, 'show-hidden': showHidden }) {
+    async execute(context, trigger, { code, 'show-hidden': showHidden }) {
+        // So it doesn't show up as unused, and we can use it in `code`
+        context
+
        await trigger.reply({
            ephemeral: true,
            embeds: [
                createSuccessEmbed('Evaluate', `\`\`\`js\n${code}\`\`\``).addFields({
                    name: 'Result',
-                    value: `\`\`\`js\n${inspect(runInThisContext(code), { depth: 1, showHidden, getters: true, numericSeparator: true, showProxy: true })}\`\`\``,
+                    // biome-ignore lint/security/noGlobalEval: This is fine as it's an admin command
+                    value: `\`\`\`js\n${inspect(await eval(code), {
+                        depth: 1,
+                        showHidden,
+                        getters: true,
+                        numericSeparator: true,
+                        showProxy: true,
+                    })}\`\`\``,
                }),
            ],
        })
--- a/bots/discord/src/commands/admin/reload.ts
+++ b/bots/discord/src/commands/admin/reload.ts
@@ -7,11 +7,31 @@ export default new AdminCommand({
    name: 'reload',
    description: 'Reload configuration',
    async execute(context, trigger) {
+        const { api, logger, discord } = context
        context.config = ((await import(join(dirname(Bun.main), '..', 'config.js'))) as { default: Config }).default

-        await trigger.reply({
-            content: 'Reloaded configuration',
-            ephemeral: true,
-        })
+        if ('deferReply' in trigger) await trigger.deferReply({ ephemeral: true })
+
+        logger.info('Reinitializing API client to reload configuration...')
+        await api.client.ws.setOptions(
+            {
+                url: context.config.api.url,
+            },
+            false,
+        )
+        api.intentionallyDisconnecting = true
+        api.client.disconnect(true)
+        api.disconnectCount = 0
+        api.intentionallyDisconnecting = false
+        await api.client.connect()
+
+        logger.info('Reinitializing Discord client to reload configuration...')
+        await discord.client.destroy()
+        // discord.client.token only gets set whenever a new Client is intialized
+        // so that's why we need to provide the token here :/
+        await discord.client.login(process.env['DISCORD_TOKEN'])
+
+        // @ts-expect-error: TypeScript dum
+        await trigger[('deferReply' in trigger ? 'editReply' : 'reply')]({ content: 'Reloaded configuration' })
    },
 })
--- a/bots/discord/src/commands/admin/slash-commands.ts
+++ b/bots/discord/src/commands/admin/slash-commands.ts
@@ -42,7 +42,7 @@ export default new AdminCommand({

        const { global: globalCommands, guild: guildCommands } = Object.groupBy(
            Object.values(context.discord.commands),
-            cmd => (cmd.global ? 'global' : 'guild'),
+            cmd => (cmd.isGuildSpecific() ? 'guild' : 'global'),
        )

        const {
--- a/bots/discord/src/commands/fun/coinflip.ts
+++ b/bots/discord/src/commands/fun/coinflip.ts
@@ -6,7 +6,7 @@ import { applyCommonEmbedStyles } from '$/utils/discord/embeds'
 export default new Command({
    name: 'coinflip',
    description: 'Do a coinflip!',
-    global: true,
+    type: Command.Type.ChatGlobal,
    requirements: {
        defaultCondition: 'pass',
    },
--- a/bots/discord/src/commands/moderation/ban.ts
+++ b/bots/discord/src/commands/moderation/ban.ts
@@ -35,7 +35,7 @@ export default new ModerationCommand({

            if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0)
                throw new CommandError(
-                    CommandErrorType.InvalidUser,
+                    CommandErrorType.InvalidArgument,
                    'You cannot ban a user with a role equal to or higher than yours.',
                )
        }
--- a/bots/discord/src/commands/moderation/mute.ts
+++ b/bots/discord/src/commands/moderation/mute.ts
@@ -37,14 +37,14 @@ export default new ModerationCommand({

        if (Number.isInteger(duration) && duration! < 1)
            throw new CommandError(
-                CommandErrorType.InvalidDuration,
+                CommandErrorType.InvalidArgument,
                'The duration must be at least 1 millisecond long.',
            )

        const expires = Math.max(duration, Date.now() + duration)
        if (!member)
            throw new CommandError(
-                CommandErrorType.InvalidUser,
+                CommandErrorType.InvalidArgument,
                'The provided member is not in the server or does not exist.',
            )

@@ -53,14 +53,14 @@ export default new ModerationCommand({

        if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0)
            throw new CommandError(
-                CommandErrorType.InvalidUser,
+                CommandErrorType.InvalidArgument,
                'You cannot mute a user with a role equal to or higher than yours.',
            )

        await applyRolePreset(member, 'mute', expires)
        await sendModerationReplyAndLogs(
            interaction,
-            createModerationActionEmbed('Muted', user, executor.user, reason, duration),
+            createModerationActionEmbed('Muted', user, executor.user, reason, Math.ceil(expires / 1000)),
        )

        if (duration)
--- a/bots/discord/src/commands/moderation/purge.ts
+++ b/bots/discord/src/commands/moderation/purge.ts
@@ -32,7 +32,7 @@ export default new ModerationCommand({

        const channel = interaction.channel!
        if (!channel.isTextBased())
-            throw new CommandError(CommandErrorType.InvalidChannel, 'The supplied channel is not a text channel.')
+            throw new CommandError(CommandErrorType.InvalidArgument, 'The supplied channel is not a text channel.')

        const embed = applyCommonEmbedStyles(
            new EmbedBuilder({
--- a/bots/discord/src/commands/moderation/role-preset.ts
+++ b/bots/discord/src/commands/moderation/role-preset.ts
@@ -45,7 +45,7 @@ export default new ModerationCommand({

        if (!member)
            throw new CommandError(
-                CommandErrorType.InvalidUser,
+                CommandErrorType.InvalidArgument,
                'The provided member is not in the server or does not exist.',
            )

@@ -56,13 +56,13 @@ export default new ModerationCommand({
            const duration = durationInput ? parseDuration(durationInput) : Infinity
            if (Number.isInteger(duration) && duration! < 1)
                throw new CommandError(
-                    CommandErrorType.InvalidDuration,
+                    CommandErrorType.InvalidArgument,
                    'The duration must be at least 1 millisecond long.',
                )

            if (moderator.roles.highest.comparePositionTo(member.roles.highest) <= 0)
                throw new CommandError(
-                    CommandErrorType.InvalidUser,
+                    CommandErrorType.InvalidArgument,
                    'You cannot apply a role preset to a user with a role equal to or higher than yours.',
                )

@@ -83,6 +83,6 @@ export default new ModerationCommand({
                removeRolePreset(member, preset)
            }, expires)

-        await sendPresetReplyAndLogs(apply ? 'apply' : 'remove', trigger, executor, user, preset, expires)
+        await sendPresetReplyAndLogs(apply ? 'apply' : 'remove', trigger, executor, user, preset, expires ? Math.ceil(expires / 1000) : undefined)
    },
 })
--- a/bots/discord/src/commands/moderation/slowmode.ts
+++ b/bots/discord/src/commands/moderation/slowmode.ts
@@ -27,14 +27,14 @@ export default new ModerationCommand({

        if (!channel?.isTextBased() || channel.isDMBased())
            throw new CommandError(
-                CommandErrorType.InvalidChannel,
+                CommandErrorType.InvalidArgument,
                'The supplied channel is not a text channel.',
            )

-        if (Number.isNaN(duration)) throw new CommandError(CommandErrorType.InvalidDuration, 'Invalid duration.')
+        if (Number.isNaN(duration)) throw new CommandError(CommandErrorType.InvalidArgument, 'Invalid duration.')
        if (duration < 0 || duration > 36e4)
            throw new CommandError(
-                CommandErrorType.InvalidDuration,
+                CommandErrorType.InvalidArgument,
                'Duration out of range, must be between 0s and 6h.',
            )

--- a/bots/discord/src/commands/moderation/unmute.ts
+++ b/bots/discord/src/commands/moderation/unmute.ts
@@ -20,7 +20,7 @@ export default new ModerationCommand({
        const member = await interaction.guild!.members.fetch(user.id)
        if (!member)
            throw new CommandError(
-                CommandErrorType.InvalidUser,
+                CommandErrorType.InvalidArgument,
                'The provided member is not in the server or does not exist.',
            )

--- a/bots/discord/src/commands/support/train/chat.ts
+++ b/bots/discord/src/commands/support/train/chat.ts
@@ -0,0 +1,76 @@
+import Command from '$/classes/Command'
+import CommandError, { CommandErrorType } from '$/classes/CommandError'
+import { config } from '../../../context'
+import type { FetchMessageOptions, MessageResolvable } from 'discord.js'
+import type { ConfigMessageScanResponseLabelConfig } from 'config.schema'
+import { createSuccessEmbed } from '$/utils/discord/embeds'
+
+const msRcConfig = config.messageScan?.humanCorrections?.allow
+
+export default new Command({
+    name: 'train',
+    description: 'Train a specific message or text to a specific label',
+    type: Command.Type.ChatGuild,
+    requirements: {
+        users: msRcConfig?.users,
+        roles: msRcConfig?.members?.roles,
+        permissions: msRcConfig?.members?.permissions,
+        mode: 'any',
+        memberRequirementsForUsers: 'fail',
+        defaultCondition: 'fail',
+    },
+    options: {
+        message: {
+            description: 'The message to train (use `latest` to train the latest message)',
+            type: Command.OptionType.String,
+            required: true,
+        },
+        label: {
+            description: 'The label to train the message as',
+            type: Command.OptionType.String,
+            required: true,
+        },
+    },
+    allowMessageCommand: true,
+    async execute(context, trigger, { label, message: ref }) {
+        const { logger, config } = context
+        const { messageScan: msConfig } = config
+
+        // If there's no config, we can't do anything
+        if (!msConfig?.humanCorrections) throw new CommandError(CommandErrorType.Generic, 'Response correction is off.')
+        const labels = msConfig.responses?.flatMap(r =>
+            r.triggers.text!.filter((t): t is ConfigMessageScanResponseLabelConfig => 'label' in t).map(t => t.label),
+        )
+
+        const channel = await trigger.guild!.channels.fetch(trigger.channelId)
+        if (!channel?.isTextBased())
+            throw new CommandError(
+                CommandErrorType.InvalidArgument,
+                'This command can only be used in or on text channels',
+            )
+
+        if (!labels.includes(label))
+            throw new CommandError(
+                CommandErrorType.InvalidArgument,
+                `The provided label is invalid.\nValid labels are:${labels.map(l => `\n- \`${l}\``).join('')}`,
+            )
+
+        const refMsg = await channel.messages.fetch(
+            (ref.startsWith('latest') ? { limit: 1 } : ref) as MessageResolvable | FetchMessageOptions,
+        )
+        if (!refMsg) throw new CommandError(CommandErrorType.InvalidArgument, 'The provided message does not exist.')
+
+        logger.debug(`User ${context.executor.id} is training message ${refMsg?.id} as ${label}`)
+
+        await context.api.client.trainMessage(refMsg.content, label)
+        await trigger.reply({
+            embeds: [
+                createSuccessEmbed(
+                    'Message trained',
+                    `The provided message has been trained as \`${label}\`. Thank you for your contribution!`,
+                ),
+            ],
+            ephemeral: true,
+        })
+    },
+})
--- a/bots/discord/src/commands/support/train/context-menu.ts
+++ b/bots/discord/src/commands/support/train/context-menu.ts
@@ -0,0 +1,50 @@
+import Command from '$/classes/Command'
+import CommandError, { CommandErrorType } from '$/classes/CommandError'
+import { config } from '../../../context'
+import { type APIStringSelectComponent, ComponentType } from 'discord.js'
+import type { ConfigMessageScanResponseLabelConfig } from 'config.schema'
+
+const msRcConfig = config.messageScan?.humanCorrections?.allow
+
+export default new Command({
+    name: 'Train Message',
+    type: Command.Type.ContextMenuGuildMessage,
+    requirements: {
+        users: msRcConfig?.users,
+        roles: msRcConfig?.members?.roles,
+        permissions: msRcConfig?.members?.permissions,
+        mode: 'any',
+        memberRequirementsForUsers: 'fail',
+        defaultCondition: 'fail',
+    },
+    async execute(context, trigger) {
+        const { logger, config } = context
+        const { messageScan: msConfig } = config
+
+        // If there's no config, we can't do anything
+        if (!msConfig?.humanCorrections) throw new CommandError(CommandErrorType.Generic, 'Response correction is off.')
+
+        logger.debug(`User ${context.executor.id} is training message ${trigger.targetId}`)
+
+        const labels = msConfig.responses.flatMap(r =>
+            r.triggers.text!.filter((t): t is ConfigMessageScanResponseLabelConfig => 'label' in t).map(t => t.label),
+        )
+
+        await trigger.reply({
+            content: 'Select a label to train this message as:',
+            components: [
+                {
+                    components: [
+                        {
+                            custom_id: `tr_${trigger.targetMessage.channelId}_${trigger.targetId}`,
+                            options: labels.map(label => ({ label, value: label })),
+                            type: ComponentType.StringSelect,
+                        } satisfies APIStringSelectComponent,
+                    ],
+                    type: ComponentType.ActionRow,
+                },
+            ],
+            ephemeral: true,
+        })
+    },
+})
--- a/bots/discord/src/context.ts
+++ b/bots/discord/src/context.ts
@@ -17,7 +17,7 @@ export const logger = createLogger({
 import * as commands from './commands'
 import * as schemas from './database/schemas'

-import type { default as Command, CommandOptionsOptions } from './classes/Command'
+import type { default as Command, CommandOptionsOptions, CommandType } from './classes/Command'

 export const api = {
    client: new APIClient({
@@ -83,20 +83,27 @@ export const discord = {
    }),
    commands: Object.fromEntries(Object.values(commands).map(cmd => [cmd.name, cmd])) as Record<
        string,
-        Command<boolean, CommandOptionsOptions | undefined, boolean>
+        Command<CommandType, CommandOptionsOptions | undefined, boolean>
    >,
    stickyMessages: {} as Record<
        string,
        Record<
            string,
            {
-                forceSendTimerActive?: boolean
-                timeoutMs: number
-                forceSendMs?: number
+                /**
+                 * Chat is active, so force send timer is also active
+                 */
+                forceTimerActive: boolean
+                /**
+                 * There was a message sent, so the timer is active
+                 */
+                timerActive: boolean
+                timerMs: number
+                forceTimerMs?: number
                send: (forced?: boolean) => Promise<void>
                currentMessage?: Message<true>
-                interval?: NodeJS.Timeout
-                forceSendInterval?: NodeJS.Timeout
+                timer?: NodeJS.Timeout
+                forceTimer?: NodeJS.Timeout
            }
        >
    >,
--- a/bots/discord/src/database/schemas.ts
+++ b/bots/discord/src/database/schemas.ts
@@ -16,6 +16,7 @@ export const appliedPresets = sqliteTable(
    {
        memberId: text('member').notNull(),
        guildId: text('guild').notNull(),
+        removedRoles: text('roles', { mode: 'json' }).notNull().$type<string[]>().default([]),
        preset: text('preset').notNull(),
        until: integer('until'),
    },
--- a/bots/discord/src/events/discord/guildMemberAdd/applyRolePresets.ts
+++ b/bots/discord/src/events/discord/guildMemberAdd/applyRolePresets.ts
@@ -12,5 +12,5 @@ withContext(on, 'guildMemberAdd', async ({ database }, member) => {
        ),
    })

-    for (const { preset } of applieds) await applyRolesUsingPreset(preset, member, true)
+    for (const { preset } of applieds) await applyRolesUsingPreset(preset, member)
 })
--- a/bots/discord/src/events/discord/interactionCreate/chatCommand.ts
+++ b/bots/discord/src/events/discord/interactionCreate/chatCommand.ts
@@ -8,19 +8,24 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
    const { logger, discord } = context
    const command = discord.commands[interaction.commandName]

-    logger.debug(`Command ${interaction.commandName} being invoked by ${interaction.user.tag}`)
+    logger.debug(`Command ${interaction.commandName} being invoked by ${interaction.user.tag} via chat`)
    if (!command)
-        return void logger.error(`Interaction command ${interaction.commandName} not implemented but registered!!!`)
+        return void logger.error(`Chat command ${interaction.commandName} not implemented but registered!!!`)

    try {
-        logger.debug(`Command ${interaction.commandName} being executed`)
+        logger.debug(`Command ${interaction.commandName} being executed via chat`)
        await command.onInteraction(context, interaction)
    } catch (err) {
        if (!(err instanceof CommandError))
            logger.error(`Error while executing command ${interaction.commandName}:`, err)
+
        await interaction[interaction.replied ? 'followUp' : 'reply']({
            embeds: [err instanceof CommandError ? err.toEmbed() : createStackTraceEmbed(err)],
            ephemeral: true,
        })
+
+        // 100 and up are user errors
+        if (err instanceof CommandError && err.type < 100)
+            logger.error(`Command ${interaction.commandName} internally failed with error:`, err)
    }
 })
--- a/bots/discord/src/events/discord/interactionCreate/contextMenuCommand.ts
+++ b/bots/discord/src/events/discord/interactionCreate/contextMenuCommand.ts
@@ -0,0 +1,26 @@
+import CommandError from '$/classes/CommandError'
+import { createStackTraceEmbed } from '$utils/discord/embeds'
+import { on, withContext } from '$utils/discord/events'
+
+withContext(on, 'interactionCreate', async (context, interaction) => {
+    if (!interaction.isContextMenuCommand()) return
+
+    const { logger, discord } = context
+    const command = discord.commands[interaction.commandName]
+
+    logger.debug(`Command ${interaction.commandName} being invoked by ${interaction.user.tag} via context menu`)
+    if (!command)
+        return void logger.error(`Context menu command ${interaction.commandName} not implemented but registered!!!`)
+
+    try {
+        logger.debug(`Command ${interaction.commandName} being executed via context menu`)
+        await command.onContextMenuInteraction(context, interaction)
+    } catch (err) {
+        if (!(err instanceof CommandError))
+            logger.error(`Error while executing command ${interaction.commandName}:`, err)
+        await interaction[interaction.replied ? 'followUp' : 'reply']({
+            embeds: [err instanceof CommandError ? err.toEmbed() : createStackTraceEmbed(err)],
+            ephemeral: true,
+        })
+    }
+})
--- a/bots/discord/src/events/discord/interactionCreate/correctResponse.ts
+++ b/bots/discord/src/events/discord/interactionCreate/correctResponse.ts
@@ -18,10 +18,10 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
    if (!interaction.isStringSelectMenu() && !interaction.isButton()) return
    if (!interaction.customId.startsWith('cr_')) return

-    const [, key, action] = interaction.customId.split('_') as ['cr', string, 'select' | 'cancel' | 'delete']
-    if (!key || !action) return
+    const [, msgId, action] = interaction.customId.split('_') as ['cr', string, 'select' | 'cancel' | 'delete']
+    if (!msgId || !action) return

-    const response = await db.query.responses.findFirst({ where: eq(responses.replyId, key) })
+    const response = await db.query.responses.findFirst({ where: eq(responses.replyId, msgId) })
    // If the message isn't saved in my DB (unrelated message)
    if (!response)
        return void (await interaction.reply({
@@ -32,11 +32,11 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
    try {
        // We're gonna pretend reactionChannel is a text-based channel, but it can be many more
        // But `messages` should always exist as a property
-        const reactionGuild = await interaction.client.guilds.fetch(response.guildId)
-        const reactionChannel = (await reactionGuild.channels.fetch(response.channelId)) as TextBasedChannel | null
-        const reactionMessage = await reactionChannel?.messages.fetch(key)
+        const guild = await interaction.client.guilds.fetch(response.guildId)
+        const channel = (await guild.channels.fetch(response.channelId)) as TextBasedChannel | null
+        const msg = await channel?.messages.fetch(msgId)

-        if (!reactionMessage) {
+        if (!msg) {
            await interaction.deferUpdate()
            await interaction.message.edit({
                content: null,
@@ -53,9 +53,9 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
        }

        const editMessage = (content: string, description?: string) =>
-            editInteractionMessage(interaction, reactionMessage.url, content, description)
+            editInteractionMessage(interaction, msg.url, content, description)
        const handleCorrection = (label: string) =>
-            handleUserResponseCorrection(context, response, reactionMessage, label, interaction.user)
+            handleUserResponseCorrection(context, response, msg, label, interaction.user)

        if (response.correctedById)
            return await editMessage(
--- a/bots/discord/src/events/discord/interactionCreate/trainMessage.ts
+++ b/bots/discord/src/events/discord/interactionCreate/trainMessage.ts
@@ -0,0 +1,52 @@
+import { createErrorEmbed, createStackTraceEmbed, createSuccessEmbed } from '$utils/discord/embeds'
+import { on, withContext } from '$utils/discord/events'
+
+import type { TextBasedChannel } from 'discord.js'
+
+withContext(on, 'interactionCreate', async (context, interaction) => {
+    const {
+        logger,
+        config: { messageScan: msConfig },
+    } = context
+
+    if (!msConfig?.humanCorrections) return
+    if (!interaction.isStringSelectMenu()) return
+    if (!interaction.customId.startsWith('tr_')) return
+
+    const [, channelId, msgId] = interaction.customId.split('_') as ['tr', string, string]
+    if (!channelId || !msgId) return
+
+    try {
+        const channel = (await interaction.client.channels.fetch(channelId)) as TextBasedChannel | null
+        const msg = await channel?.messages.fetch(msgId)
+
+        if (!msg)
+            return void (await interaction.reply({
+                embeds: [
+                    createErrorEmbed(
+                        'Message not found',
+                        'Thank you for your contribution! Unfortunately, the message could not be found.',
+                    ),
+                ],
+                ephemeral: true,
+            }))
+
+        const selectedLabel = interaction.values[0]!
+        await context.api.client.trainMessage(msg.content, selectedLabel)
+        await interaction.reply({
+            embeds: [
+                createSuccessEmbed(
+                    'Message being trained',
+                    `Thank you for your contribution! The selected message is being trained as \`${selectedLabel}\`. 🎉`,
+                ),
+            ],
+            ephemeral: true,
+        })
+    } catch (e) {
+        logger.error('Failed to handle train message interaction:', e)
+        await interaction.reply({
+            embeds: [createStackTraceEmbed(e)],
+            ephemeral: true,
+        })
+    }
+})
--- a/bots/discord/src/events/discord/messageCreate/messageCommand.ts
+++ b/bots/discord/src/events/discord/messageCreate/messageCommand.ts
@@ -18,7 +18,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
    if (!commandName) return

    const command = discord.commands[commandName]
-    logger.debug(`Command ${commandName} being invoked by ${msg.author.id}`)
+    logger.debug(`Command ${commandName} being invoked by ${msg.author.id} via message`)
    if (!command) return void logger.debug(`Message command ${commandName} not implemented`)

    const argsRegex: RegExp = /[^\s"]+|"([^"]*)"/g
@@ -46,7 +46,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
    }

    try {
-        logger.debug(`Command ${commandName} being executed`)
+        logger.debug(`Command ${commandName} being executed via message`)
        await command.onMessage(context, msg, args)
    } catch (err) {
        if (!(err instanceof CommandError)) logger.error(`Error while executing command ${commandName}:`, err)
--- a/bots/discord/src/events/discord/messageCreate/messageScan.ts
+++ b/bots/discord/src/events/discord/messageCreate/messageScan.ts
@@ -40,7 +40,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
                })

                if (label) {
-                    db.insert(responses).values({
+                    await db.insert(responses).values({
                        replyId: reply.id,
                        channelId: reply.channel.id,
                        guildId: reply.guild!.id,
@@ -59,26 +59,39 @@ withContext(on, 'messageCreate', async (context, msg) => {
        }
    }

-    if (msg.attachments.size > 0 && config.attachments?.scanAttachments) {
+    if (msg.attachments.size && config.attachments?.scanAttachments) {
        logger.debug(`Classifying message attachments for ${msg.id}`)

        for (const attachment of msg.attachments.values()) {
-            if (
-                config.attachments.allowedMimeTypes &&
-                !config.attachments.allowedMimeTypes.includes(attachment.contentType!)
-            ) {
-                logger.debug(`Disallowed MIME type for attachment: ${attachment.url}, ${attachment.contentType}`)
+            const mimeType = attachment.contentType?.split(';')?.[0]
+            if (!mimeType) return void logger.warn(`No MIME type for attachment: ${attachment.url}`)
+
+            if (config.attachments.allowedMimeTypes && !config.attachments.allowedMimeTypes.includes(mimeType)) {
+                logger.debug(`Disallowed MIME type for attachment: ${attachment.url}, ${mimeType}`)
                continue
            }

-            if (attachment.contentType?.startsWith('text/') && attachment.size > (config.attachments.maxTextFileSize ?? 512 * 1000)) {
-                logger.debug(`Attachment ${attachment.url} is too large be to scanned, size is ${attachment.size}`)   
+            const isTextFile = mimeType.startsWith('text/')
+
+            if (isTextFile && attachment.size > (config.attachments.maxTextFileSize ?? 512 * 1000)) {
+                logger.debug(`Attachment ${attachment.url} is too large be to scanned, size is ${attachment.size}`)
                continue
            }

            try {
-                const { text: content } = await api.client.parseImage(attachment.url)
-                const { response } = await getResponseFromText(content, filteredResponses, context, true)
+                let response: Awaited<ReturnType<typeof getResponseFromText>>['response'] | undefined
+
+                if (isTextFile) {
+                    const content = await (await fetch(attachment.url)).text()
+                    response = await getResponseFromText(content, filteredResponses, context, {
+                        textRegexesOnly: true,
+                    }).then(it => it.response)
+                } else {
+                    const { text: content } = await api.client.parseImage(attachment.url)
+                    response = await getResponseFromText(content, filteredResponses, context, {
+                        imageTriggersOnly: true,
+                    }).then(it => it.response)
+                }

                if (response) {
                    logger.debug(`Response found for attachment: ${attachment.url}`)
@@ -89,8 +102,8 @@ withContext(on, 'messageCreate', async (context, msg) => {

                    break
                }
-            } catch {
-                logger.error(`Failed to parse image: ${attachment.url}`)
+            } catch (e) {
+                logger.error(`Failed to parse attachment: ${attachment.url}`, e)
            }
        }
    }
--- a/bots/discord/src/events/discord/messageCreate/stickyMessageReset.ts
+++ b/bots/discord/src/events/discord/messageCreate/stickyMessageReset.ts
@@ -7,24 +7,48 @@ withContext(on, 'messageCreate', async ({ discord, logger }, msg) => {
    const store = discord.stickyMessages[msg.guildId]?.[msg.channelId]
    if (!store) return

-    if (!store.interval) store.interval = setTimeout(store.send, store.timeoutMs) as NodeJS.Timeout
+    const timerPreviouslyActive = store.timerActive
+    // If there isn't a timer, start it up
+    store.timerActive = true
+    if (!store.timer) store.timer = setTimeout(store.send, store.timerMs) as NodeJS.Timeout
    else {
-        store.interval.refresh()
+        /* 
+            If:
+                - (negate carried) There's a timer
+                - The timer is not active
+                - The force timer is not active
+            Then:
+                - Restart the timer
+        */
+        if (!timerPreviouslyActive && !store.forceTimerActive) store.timer.refresh()
+        /*
+            If:
+                - Any of:
+                    - (negate carried) The timer is active
+                    - (negate carried) The force timer is active
+                - The force timer is not active
+            Then:
+                - Start the force timer and clear the existing timer
+        */ else if (!store.forceTimerActive && store.forceTimerMs) {
+            logger.debug(
+                `Channel ${msg.channelId} in guild ${msg.guildId} is active, starting force send timer and clearing existing timer`,
+            )

-        if (!store.forceSendTimerActive && store.forceSendMs) {
-            logger.debug(`Channel ${msg.channelId} in guild ${msg.guildId} is active, starting force send timer`)
+            // Clear the timer
+            clearTimeout(store.timer)
+            store.timerActive = false

-            store.forceSendTimerActive = true
-
-            if (!store.forceSendInterval)
-                store.forceSendInterval = setTimeout(
+            // (Re)start the force timer
+            store.forceTimerActive = true
+            if (!store.forceTimer)
+                store.forceTimer = setTimeout(
                    () =>
                        store.send(true).then(() => {
-                            store.forceSendTimerActive = false
+                            store.forceTimerActive = false
                        }),
-                    store.forceSendMs,
+                    store.forceTimerMs,
                ) as NodeJS.Timeout
-            else store.forceSendInterval.refresh()
+            else store.forceTimer.refresh()
        }
    }
 })
--- a/bots/discord/src/events/discord/messageReactionAdd/correctResponse.ts
+++ b/bots/discord/src/events/discord/messageReactionAdd/correctResponse.ts
@@ -20,10 +20,10 @@ const PossibleReactions = Object.values(Reactions) as string[]

 withContext(on, 'messageReactionAdd', async (context, rct, user) => {
    if (user.bot) return
-
+    
    const { database: db, logger, config } = context
    const { messageScan: msConfig } = config
-
+    
    // If there's no config, we can't do anything
    if (!msConfig?.humanCorrections) return

@@ -32,13 +32,11 @@ withContext(on, 'messageReactionAdd', async (context, rct, user) => {

    if (reactionMessage.author.id !== reaction.client.user!.id) return
    if (!PossibleReactions.includes(reaction.emoji.name!)) return
+    await rct.users.remove(user.id)

    if (!isAdmin(reactionMessage.member || reactionMessage.author)) {
        // User is in guild, and config has member requirements
-        if (
-            reactionMessage.inGuild() &&
-            (msConfig.humanCorrections.allow?.members || msConfig.humanCorrections.allow?.users)
-        ) {
+        if (reactionMessage.inGuild() && msConfig.humanCorrections.allow) {
            const {
                allow: { users: allowedUsers, members: allowedMembers },
            } = msConfig.humanCorrections
@@ -54,20 +52,19 @@ withContext(on, 'messageReactionAdd', async (context, rct, user) => {
                    )
                )
                    return
-            } else if (allowedUsers) {
-                if (!allowedUsers.includes(user.id)) return
-            } else {
-                return void logger.warn(
-                    'No member or user requirements set for human corrections, all requests will be ignored',
-                )
-            }
-        }
+            } else if (!allowedUsers?.includes(user.id)) return
+        } else
+            return void logger.warn(
+                'No member or user requirements set for human corrections, all requests will be ignored',
+            )
    }

    // Sanity check
    const response = await db.query.responses.findFirst({ where: eq(responses.replyId, rct.message.id) })
    if (!response || response.correctedById) return

+    logger.debug(`User ${user.id} is trying to correct the response ${rct.message.id}`)
+
    const handleCorrection = (label: string) =>
        handleUserResponseCorrection(context, response, reactionMessage, label, user)

--- a/bots/discord/src/events/discord/ready.ts
+++ b/bots/discord/src/events/discord/ready.ts
@@ -14,11 +14,16 @@ export default withContext(on, 'ready', async ({ config, discord, logger }, clie
    if (config.stickyMessages)
        for (const [guildId, channels] of Object.entries(config.stickyMessages)) {
            const guild = await client.guilds.fetch(guildId)
+            // In case of configuration refresh, this will not be nullable
+            const oldStore = discord.stickyMessages[guildId]
            discord.stickyMessages[guildId] = {}

            for (const [channelId, { message, timeout, forceSendTimeout }] of Object.entries(channels)) {
                const channel = await guild.channels.fetch(channelId)
-                if (!channel?.isTextBased()) return
+                if (!channel?.isTextBased())
+                    return void logger.warn(
+                        `Channel ${channelId} in guild ${guildId} is not a text channel, sticky messages will not be sent`,
+                    )

                const send = async (forced = false) => {
                    try {
@@ -33,17 +38,19 @@ export default withContext(on, 'ready', async ({ config, discord, logger }, clie
                        await store.currentMessage?.delete().catch()
                        store.currentMessage = msg

-                        if (!forced) {
-                            clearTimeout(store.forceSendInterval)
+                        // Clear any remaining timers
+                        clearTimeout(store.timer)
+                        clearTimeout(store.forceTimer)
+                        store.forceTimerActive = store.timerActive = false
+
+                        if (!forced)
                            logger.debug(
                                `Timeout ended for sticky message in channel ${channelId} in guild ${guildId}, channel is inactive`,
                            )
-                        } else {
-                            clearTimeout(store.interval)
+                        else
                            logger.debug(
                                `Forced send timeout for sticky message in channel ${channelId} in guild ${guildId} ended, channel is too active`,
                            )
-                        }

                        logger.debug(`Sent sticky message to channel ${channelId} in guild ${guildId}`)
                    } catch (e) {
@@ -53,13 +60,20 @@ export default withContext(on, 'ready', async ({ config, discord, logger }, clie
                        )
                    }
                }
-
+                
+                // Set up the store
                discord.stickyMessages[guildId]![channelId] = {
-                    forceSendMs: forceSendTimeout,
-                    timeoutMs: timeout,
+                    forceTimerActive: false,
+                    timerActive: false,
+                    forceTimerMs: forceSendTimeout,
+                    timerMs: timeout,
                    send,
-                    forceSendTimerActive: false,
+                    // If the store exists before the configuration refresh, take its current message
+                    currentMessage: oldStore?.[channelId]?.currentMessage
                }
+
+                // Send a new sticky message immediately, as well as deleting the old/outdated message, if it exists
+                await send()
            }
        }

--- a/bots/discord/src/utils/discord/messageScan.ts
+++ b/bots/discord/src/utils/discord/messageScan.ts
@@ -9,7 +9,7 @@ export const getResponseFromText = async (
    responses: ConfigMessageScanResponse[],
    // Just to be safe that we will never use data from the context parameter
    { api, logger }: Omit<typeof import('src/context'), 'config'>,
-    ocrMode = false,
+    flags: { imageTriggersOnly?: boolean; textRegexesOnly?: boolean } = {},
 ): Promise<
    Omit<ConfigMessageScanResponse, 'triggers'> & { label?: string; triggers?: ConfigMessageScanResponse['triggers'] }
 > => {
@@ -31,7 +31,7 @@ export const getResponseFromText = async (
            triggers: { text: textTriggers, image: imageTriggers },
        } = trigger

-        if (ocrMode) {
+        if (flags.imageTriggersOnly) {
            if (imageTriggers)
                for (const regex of imageTriggers)
                    if (regex.test(content)) {
@@ -39,7 +39,7 @@ export const getResponseFromText = async (
                        responseConfig = trigger
                        break
                    }
-        } else
+        } else {
            for (let j = 0; j < textTriggers!.length; j++) {
                const regex = textTriggers![j]!

@@ -54,55 +54,59 @@ export const getResponseFromText = async (
                    break
                }
            }
-    }

-    // If none of the regexes match, we can search for labels immediately
-    if (!responseConfig.triggers && !ocrMode) {
-        logger.debug('No match from before regexes, doing NLP')
-        const scan = await api.client.parseText(content)
-        if (scan.labels.length) {
-            const matchedLabel = scan.labels[0]!
-            logger.debug(`Message matched label with confidence: ${matchedLabel.name}, ${matchedLabel.confidence}`)
+            // If none of the regexes match, we can search for labels immediately
+            if (!responseConfig.triggers && !flags.textRegexesOnly) {
+                logger.debug('No match from before regexes, doing NLP')
+                const scan = await api.client.parseText(content)
+                if (scan.labels.length) {
+                    const matchedLabel = scan.labels[0]!
+                    logger.debug(
+                        `Message matched label with confidence: ${matchedLabel.name}, ${matchedLabel.confidence}`,
+                    )

-            let trigger: ConfigMessageScanResponseLabelConfig | undefined
-            const response = responses.find(x => {
-                const config = x.triggers.text!.find(
-                    (x): x is ConfigMessageScanResponseLabelConfig => 'label' in x && x.label === matchedLabel.name,
-                )
-                if (config) trigger = config
-                return config
-            })
+                    let trigger: ConfigMessageScanResponseLabelConfig | undefined
+                    const response = responses.find(x => {
+                        const config = x.triggers.text!.find(
+                            (x): x is ConfigMessageScanResponseLabelConfig =>
+                                'label' in x && x.label === matchedLabel.name,
+                        )
+                        if (config) trigger = config
+                        return config
+                    })

-            if (!response) {
-                logger.warn(`No response config found for label ${matchedLabel.name}`)
-                // This returns the default value set in line 17, which means no response matched
-                return responseConfig
+                    if (!response) {
+                        logger.warn(`No response config found for label ${matchedLabel.name}`)
+                        // This returns the default value set in line 17, which means no response matched
+                        return responseConfig
+                    }
+
+                    if (matchedLabel.confidence >= trigger!.threshold) {
+                        logger.debug('Label confidence is enough')
+                        responseConfig = { ...responseConfig, ...response, label: trigger!.label }
+                    }
+                }
            }

-            if (matchedLabel.confidence >= trigger!.threshold) {
-                logger.debug('Label confidence is enough')
-                responseConfig = { ...responseConfig, ...response, label: trigger!.label }
-            }
-        }
-    }
+            // If we still don't have a response config, we can match all regexes after the initial label trigger
+            if (!responseConfig.triggers && !flags.imageTriggersOnly) {
+                logger.debug('No match from NLP, doing after regexes')
+                for (let i = 0; i < responses.length; i++) {
+                    const {
+                        triggers: { text: textTriggers },
+                    } = responses[i]!
+                    const firstLabelIndex = firstLabelIndexes[i] ?? -1

-    // If we still don't have a response config, we can match all regexes after the initial label trigger
-    if (!responseConfig.triggers && ocrMode) {
-        logger.debug('No match from NLP, doing after regexes')
-        for (let i = 0; i < responses.length; i++) {
-            const {
-                triggers: { text: textTriggers },
-            } = responses[i]!
-            const firstLabelIndex = firstLabelIndexes[i] ?? -1
+                    for (let j = firstLabelIndex + 1; j < textTriggers!.length; j++) {
+                        const trigger = textTriggers![j]!

-            for (let j = firstLabelIndex + 1; j < textTriggers!.length; j++) {
-                const trigger = textTriggers![j]!
-
-                if (trigger instanceof RegExp) {
-                    if (trigger.test(content)) {
-                        logger.debug(`Message matched regex (after mode): ${trigger.source}`)
-                        responseConfig = responses[i]!
-                        break
+                        if (trigger instanceof RegExp) {
+                            if (trigger.test(content)) {
+                                logger.debug(`Message matched regex (after mode): ${trigger.source}`)
+                                responseConfig = responses[i]!
+                                break
+                            }
+                        }
                    }
                }
            }
--- a/bots/discord/src/utils/discord/moderation.ts
+++ b/bots/discord/src/utils/discord/moderation.ts
@@ -1,6 +1,6 @@
 import { config, logger } from '$/context'
 import decancer from 'decancer'
-import type { ChatInputCommandInteraction, EmbedBuilder, Guild, GuildMember, Message, User } from 'discord.js'
+import type { CommandInteraction, EmbedBuilder, Guild, GuildMember, Message, User } from 'discord.js'
 import { applyReferenceToModerationActionEmbed, createModerationActionEmbed } from './embeds'

 const PresetLogAction = {
@@ -10,7 +10,7 @@ const PresetLogAction = {

 export const sendPresetReplyAndLogs = (
    action: keyof typeof PresetLogAction,
-    interaction: ChatInputCommandInteraction | Message,
+    interaction: CommandInteraction | Message,
    executor: GuildMember,
    user: User,
    preset: string,
@@ -23,10 +23,7 @@ export const sendPresetReplyAndLogs = (
        ]),
    )

-export const sendModerationReplyAndLogs = async (
-    interaction: ChatInputCommandInteraction | Message,
-    embed: EmbedBuilder,
-) => {
+export const sendModerationReplyAndLogs = async (interaction: CommandInteraction | Message, embed: EmbedBuilder) => {
    const reply = await interaction.reply({ embeds: [embed] }).then(it => it.fetch())
    const logChannel = await getLogChannel(interaction.guild!)
    await logChannel?.send({ embeds: [applyReferenceToModerationActionEmbed(embed, reply.url)] })
--- a/bots/discord/src/utils/discord/rolePresets.ts
+++ b/bots/discord/src/utils/discord/rolePresets.ts
@@ -6,9 +6,9 @@ import { and, eq } from 'drizzle-orm'
 // TODO: Fix this type
 type PresetKey = string

-export const applyRolePreset = async (member: GuildMember, presetName: PresetKey, untilMs: number) => {
-    const afterInsert = await applyRolesUsingPreset(presetName, member, true)
-    const until = untilMs === Infinity ? null : Math.ceil(untilMs / 1000)
+export const applyRolePreset = async (member: GuildMember, presetName: PresetKey, expires: number) => {
+    const { removed, callback } = await applyRolesUsingPreset(presetName, member)
+    const until = expires === Infinity ? null : Math.ceil(expires / 1000)

    await database
        .insert(appliedPresets)
@@ -16,39 +16,60 @@ export const applyRolePreset = async (member: GuildMember, presetName: PresetKey
            memberId: member.id,
            guildId: member.guild.id,
            preset: presetName,
+            removedRoles: removed,
            until,
        })
        .onConflictDoUpdate({
            target: [appliedPresets.memberId, appliedPresets.preset, appliedPresets.guildId],
            set: { until },
        })
-        .then(afterInsert)
+        .then(callback)
 }

 export const removeRolePreset = async (member: GuildMember, presetName: PresetKey) => {
-    const afterDelete = await applyRolesUsingPreset(presetName, member, false)
+    const where = and(
+        eq(appliedPresets.memberId, member.id),
+        eq(appliedPresets.preset, presetName),
+        eq(appliedPresets.guildId, member.guild.id),
+    )

-    await database
-        .delete(appliedPresets)
-        .where(
-            and(
-                eq(appliedPresets.memberId, member.id),
-                eq(appliedPresets.preset, presetName),
-                eq(appliedPresets.guildId, member.guild.id),
-            ),
-        )
-        .execute()
-        .then(afterDelete)
+    const data = await database.query.appliedPresets.findFirst({ where })
+    if (!data) return false
+
+    const { callback } = await applyRolesUsingPreset(presetName, member, data.removedRoles)
+    await database.delete(appliedPresets).where(where).execute().then(callback)
+
+    return true
 }

-export const applyRolesUsingPreset = async (presetName: string, member: GuildMember, applying: boolean) => {
+export const applyRolesUsingPreset = async (
+    presetName: string,
+    member: GuildMember,
+    removePresetGiveRoles?: string[],
+) => {
    const preset = config.rolePresets?.guilds[member.guild.id]?.[presetName]
    if (!preset) throw new Error(`The preset "${presetName}" does not exist for this server`)

    const roles = new Set(member.roles.cache.keys())
+    const removed: string[] = []

-    for (const role of preset.give) roles[applying ? 'add' : 'delete'](role)
-    for (const role of preset.take) roles[applying ? 'delete' : 'add'](role)
+    // If removePresetGiveRoles is not provided, we're applying a preset
+    if (!removePresetGiveRoles) {
+        for (const role of preset.give) roles.add(role)
+        for (const role of preset.take) {
+            if (roles.has(role)) {
+                roles.delete(role)
+                removed.push(role)
+            }
+        }
+    } else {
+        const guildRoles = await member.guild.roles.fetch()
+        for (const role of preset.give) roles.delete(role)
+        for (const role of removePresetGiveRoles) if (guildRoles.has(role)) roles.add(role)
+    }

-    return () => member.roles.set(Array.from(roles))
+    return {
+        removed,
+        callback: () => member.roles.set(Array.from(roles)),
+    }
 }
--- a/bots/discord/src/utils/duration.ts
+++ b/bots/discord/src/utils/duration.ts
@@ -1,15 +1,6 @@
-export const parseDuration = (duration: string) => {
-    if (!duration.length) return Number.NaN
-    const matches = duration.match(/(?:(\d+)d)?(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s?)?/)!
+import parse from 'parse-duration'

-    const [, days, hours, minutes, seconds] = matches.map(Number)
-    return (
-        (days || 0) * 24 * 60 * 60 * 1000 +
-        (hours || 0) * 60 * 60 * 1000 +
-        (minutes || 0) * 60 * 1000 +
-        (seconds || 0) * 1000
-    )
-}
+export const parseDuration = (duration: string) => parse(duration, 'ms') ?? Number.NaN

 export const durationToString = (duration: number) => {
    if (duration === 0) return '0s'
--- a/bun.lockb
+++ b/bun.lockb
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
    "@anolilab/multi-semantic-release": "^1.1.3",
    "@biomejs/biome": "^1.8.3",
    "@codedependant/semantic-release-docker": "^5.0.3",
-    "@commitlint/cli": "^19.3.0",
+    "@commitlint/cli": "^19.4.0",
    "@commitlint/config-conventional": "^19.2.2",
    "@saithodev/semantic-release-backmerge": "^4.0.1",
    "@semantic-release/changelog": "^6.0.3",
@@ -41,10 +41,10 @@
    "@tsconfig/strictest": "^2.0.5",
    "@types/bun": "^1.1.6",
    "conventional-changelog-conventionalcommits": "^7.0.2",
-    "lefthook": "^1.7.5",
+    "lefthook": "^1.7.14",
    "portainer-service-webhook": "https://github.com/newarifrh/portainer-service-webhook#v1",
-    "semantic-release": "^24.0.0",
-    "turbo": "^2.0.9",
+    "semantic-release": "^24.1.0",
+    "turbo": "^2.0.14",
    "typescript": "^5.5.4"
  },
  "trustedDependencies": [
--- a/packages/api/src/classes/ClientWebSocket.ts
+++ b/packages/api/src/classes/ClientWebSocket.ts
@@ -17,7 +17,7 @@ import { type RawData, WebSocket } from 'ws'
 * This is the only relevant class for the time being. But in the future, there may be more classes to handle different protocols of the API.
 */
 export class ClientWebSocketManager {
-    readonly url: string
+    url: string
    timeout: number

    connecting = false
@@ -33,6 +33,21 @@ export class ClientWebSocketManager {
        this.timeout = options.timeout ?? 10000
    }

+    /**
+     * Sets the URL to connect to
+     * 
+     * **Requires a reconnect to take effect**
+     */
+    async setOptions({ url, timeout }: Partial<ClientWebSocketManagerOptions>, autoReconnect = true) {
+        if (url) this.url = url
+        this.timeout = timeout ?? this.timeout
+
+        if (autoReconnect) {
+            this.disconnect(true)
+            await this.connect()
+        }
+    }
+
    /**
     * Connects to the WebSocket API
     * @returns A promise that resolves when the client is ready
@@ -77,9 +92,13 @@ export class ClientWebSocketManager {
            } catch (e) {
                rj(e)
            }
-        }).finally(() => {
-            this.connecting = false
        })
+            .then(() => {
+                this.#socket.on('close', (code, reason) => this._handleDisconnect(code, reason.toString()))
+            })
+            .finally(() => {
+                this.connecting = false
+            })
    }

    /**
--- a/packages/shared/src/schemas/Packet.ts
+++ b/packages/shared/src/schemas/Packet.ts
@@ -1,9 +1,9 @@
 import {
-    url,
    type AnySchema,
    type NullSchema,
    type ObjectSchema,
    type Output,
+    type BooleanSchema,
    array,
    enum_,
    null_,
@@ -11,6 +11,8 @@ import {
    parse,
    special,
    string,
+    boolean,
+    url,
    // merge
 } from 'valibot'
 import DisconnectReason from '../constants/DisconnectReason'
@@ -26,8 +28,7 @@ export const PacketSchema = special<Packet>(input => {
        'op' in input &&
        typeof input.op === 'number' &&
        input.op in Operation &&
-        'd' in input &&
-        typeof input.d === 'object'
+        'd' in input
    ) {
        if (input.op in ServerOperation && !('s' in input && typeof input.s === 'number')) return false

@@ -62,7 +63,7 @@ export const PacketDataSchemas = {
    [ServerOperation.Disconnect]: object({
        reason: enum_(DisconnectReason),
    }),
-    [ServerOperation.TrainedMessage]: null_(),
+    [ServerOperation.TrainedMessage]: boolean(),
    [ServerOperation.TrainMessageFailed]: null_(),

    [ClientOperation.ParseText]: object({
@@ -78,7 +79,7 @@ export const PacketDataSchemas = {
 } as const satisfies Record<
    Operation,
    // biome-ignore lint/suspicious/noExplicitAny: This is a schema, it's not possible to type it
-    ObjectSchema<any> | AnySchema | NullSchema
+    ObjectSchema<any> | AnySchema | NullSchema | BooleanSchema
 >

 export type Packet<TOp extends Operation = Operation> = TOp extends ServerOperation
Author	SHA1	Message	Date
semantic-release-bot	f035994f9e	chore(release): 1.0.0-dev.28 [skip ci] # @revanced/discord-bot [1.0.0-dev.28](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.27...@revanced/discord-bot@1.0.0-dev.28) (2024-09-20) ### Bug Fixes * bots/discord: don't refresh timer if force timer is active for sticky messages ([`4abac0c`](`4abac0c890`)) * bots/discord: filter out text triggers correctly from image-only scans ([`8c0dd67`](`8c0dd67d03`))	2024-09-20 06:53:32 +00:00
PalmDevs	4abac0c890	fix(bots/discord): don't refresh timer if force timer is active for sticky messages	2024-09-20 13:51:56 +07:00
PalmDevs	8c0dd67d03	fix(bots/discord): filter out text triggers correctly from image-only scans	2024-09-20 13:49:38 +07:00
semantic-release-bot	7a379a2cae	chore(release): 1.0.0-dev.27 [skip ci] # @revanced/discord-bot [1.0.0-dev.27](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.26...@revanced/discord-bot@1.0.0-dev.27) (2024-09-05) ### Bug Fixes * bots/discord: correct permission check logic ([`dd8872c`](`dd8872c027`)) * bots/discord: give only removed roles for role presets ([`522ad28`](`522ad28fd8`)) * bots/discord: replace duration parser with a library ([`94c4fed`](`94c4fedc06`))	2024-09-05 10:34:11 +00:00
Palm	dd8872c027	fix(bots/discord): correct permission check logic Members were being previously treated as users and some requirements are passing by default when they must not.	2024-09-05 17:33:06 +07:00
semantic-release-bot	33a0e18e7b	chore(release): 1.0.0-dev.27 [skip ci] # @revanced/discord-bot [1.0.0-dev.27](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.26...@revanced/discord-bot@1.0.0-dev.27) (2024-08-23) ### Bug Fixes * bots/discord: give only removed roles for role presets ([`522ad28`](`522ad28fd8`)) * bots/discord: replace duration parser with a library ([`94c4fed`](`94c4fedc06`))	2024-08-23 11:07:18 +00:00
PalmDevs	522ad28fd8	fix(bots/discord): give only removed roles for role presets	2024-08-23 18:05:48 +07:00
PalmDevs	94c4fedc06	fix(bots/discord): replace duration parser with a library	2024-08-23 17:59:02 +07:00
semantic-release-bot	e3dcbab508	chore(release): 1.0.0-dev.26 [skip ci] # @revanced/discord-bot [1.0.0-dev.26](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.25...@revanced/discord-bot@1.0.0-dev.26) (2024-08-15) ### Bug Fixes * bots/discord: correct timer active condition for sticky messages ([`96065ff`](`96065ff175`))	2024-08-15 15:34:29 +00:00
Palm	96065ff175	fix(bots/discord): correct timer active condition for sticky messages	2024-08-15 22:33:12 +07:00
semantic-release-bot	845dd5d914	chore(release): 1.0.0-dev.25 [skip ci] # @revanced/discord-bot [1.0.0-dev.25](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.24...@revanced/discord-bot@1.0.0-dev.25) (2024-08-15) ### Bug Fixes * bots/discord: allow access to `context` in `/eval` and await result ([`99f65f0`](`99f65f07f5`))	2024-08-15 05:11:31 +00:00
Palm	99f65f07f5	fix(bots/discord): allow access to `context` in `/eval` and await result	2024-08-15 12:10:04 +07:00
semantic-release-bot	51f877f321	chore(release): 1.0.0-dev.24 [skip ci] # @revanced/discord-bot [1.0.0-dev.24](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.23...@revanced/discord-bot@1.0.0-dev.24) (2024-08-14) ### Bug Fixes * bots/discord: do not remove unrelated reactions ([`031fd26`](`031fd26b26`))	2024-08-14 04:54:54 +00:00
PalmDevs	031fd26b26	fix(bots/discord): do not remove unrelated reactions	2024-08-14 11:53:29 +07:00
semantic-release-bot	ef07039083	chore(release): 1.0.0-dev.23 [skip ci] # @revanced/discord-bot [1.0.0-dev.23](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.22...@revanced/discord-bot@1.0.0-dev.23) (2024-08-13) ### Features * bots/discord: add `train` commands ([`ee90ef2`](`ee90ef247b`)) * bots/discord: update to newer command definition framework ([`97f2795`](`97f2795df4`))	2024-08-13 14:20:22 +00:00
PalmDevs	6dc7f0211e	chore: update lockfile	2024-08-13 21:19:18 +07:00
PalmDevs	ee90ef247b	feat(bots/discord): add `train` commands	2024-08-13 21:16:28 +07:00
PalmDevs	97f2795df4	feat(bots/discord): update to newer command definition framework	2024-08-13 21:16:26 +07:00
semantic-release-bot	82fac783ea	chore(release): 1.0.0-dev.22 [skip ci] # @revanced/discord-bot [1.0.0-dev.22](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.21...@revanced/discord-bot@1.0.0-dev.22) (2024-08-10) ### Bug Fixes * bots/discord: parse larger units of durations, fix wrong timestamp in mod embed ([`6c8dce0`](`6c8dce0593`)) * bots/discord: provide discord token for `reload` command ([`dd21a5a`](`dd21a5abad`)) ### Features * bots/discord: add code to actually scan text files correctly ([`80aeb19`](`80aeb19020`))	2024-08-10 15:31:57 +00:00
PalmDevs	dd21a5abad	fix(bots/discord): provide discord token for `reload` command	2024-08-10 22:30:45 +07:00
PalmDevs	80aeb19020	feat(bots/discord): add code to actually scan text files correctly	2024-08-10 22:30:45 +07:00
PalmDevs	6c8dce0593	fix(bots/discord): parse larger units of durations, fix wrong timestamp in mod embed	2024-08-10 22:30:44 +07:00
semantic-release-bot	9897f244e0	chore(release): 1.0.0-dev.21 [skip ci] # @revanced/discord-bot [1.0.0-dev.21](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.20...@revanced/discord-bot@1.0.0-dev.21) (2024-08-04) ### Bug Fixes * bots/discord: correct sticky messages logic ([`de8bef6`](`de8bef6520`)) * bots/discord: make `/eval` work ([`eaa25f2`](`eaa25f2eb5`)) * bots/discord: some configuration values not applying after running `/reload` ([`a976dd2`](`a976dd2acc`))	2024-08-04 17:45:52 +00:00
PalmDevs	eaa25f2eb5	fix(bots/discord): make `/eval` work	2024-08-05 00:44:35 +07:00
PalmDevs	a976dd2acc	fix(bots/discord): some configuration values not applying after running `/reload`	2024-08-05 00:44:34 +07:00
PalmDevs	c567ef25c6	feat(packages/api): allow setting new options for `ClientWebsocketManager`	2024-08-05 00:44:33 +07:00
PalmDevs	de8bef6520	fix(bots/discord): correct sticky messages logic	2024-08-05 00:44:32 +07:00
semantic-release-bot	98dea81eeb	chore(release): 1.0.0-dev.20 [skip ci] # @revanced/discord-bot [1.0.0-dev.20](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.19...@revanced/discord-bot@1.0.0-dev.20) (2024-08-03) ### Bug Fixes * bots/discord: await when putting entries into db ([`4da6175`](`4da6175cf5`))	2024-08-03 19:53:58 +00:00
semantic-release-bot	9f3295cc0f	chore(release): 1.0.0-dev.9 [skip ci] # @revanced/bot-websocket-api [1.0.0-dev.9](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.8...@revanced/bot-websocket-api@1.0.0-dev.9) (2024-08-03) ### Features * apis/websocket: return `true` for data on a `TrainedMessage` packet ([`65add4d`](`65add4dfee`))	2024-08-03 19:53:18 +00:00
PalmDevs	4da6175cf5	fix(bots/discord): await when putting entries into db	2024-08-04 02:52:07 +07:00
PalmDevs	d90ad5c955	fix(packages/api): handle close event as a disconnect	2024-08-04 02:52:06 +07:00
PalmDevs	65add4dfee	feat(apis/websocket): return `true` for data on a `TrainedMessage` packet	2024-08-04 02:52:04 +07:00