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))

apis/websocket/CHANGELOG.md

@@ -1,3 +1,19 @@
+# @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)
+
+
+### Bug Fixes
+
+* other small issues ([bc437a5](https://github.com/revanced/revanced-helper/commit/bc437a5ec7ce1d339094d608e2a61ac5f460c163))
+
+# @revanced/bot-websocket-api [1.0.0-dev.7](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.6...@revanced/bot-websocket-api@1.0.0-dev.7) (2024-07-30)
+
 # @revanced/bot-websocket-api [1.0.0-dev.6](https://github.com/revanced/revanced-helper/compare/@revanced/bot-websocket-api@1.0.0-dev.5...@revanced/bot-websocket-api@1.0.0-dev.6) (2024-07-30)
 
 

apis/websocket/package.json

@@ -2,7 +2,7 @@
   "name": "@revanced/bot-websocket-api",
   "type": "module",
   "private": true,
-  "version": "1.0.0-dev.6",
+  "version": "1.0.0-dev.9",
   "description": "🧦 WebSocket API server for bots assisting ReVanced",
   "main": "dist/index.js",
   "scripts": {

apis/websocket/scripts/build.ts

@@ -11,7 +11,6 @@ await Bun.build({
     entrypoints: ['./src/index.ts'],
     outdir: './dist',
     target: 'bun',
-    minify: true,
     sourcemap: 'external',
 })
 
@@ -21,7 +20,6 @@ await Bun.build({
     external: ['tesseract.js-core/*'],
     target: 'bun',
     outdir: './dist/worker',
-    minify: true,
     sourcemap: 'external',
 })
 

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,
         )

bots/discord/.gitignore

@@ -174,9 +174,6 @@ dist
 # Finder (MacOS) folder config
 .DS_Store
 
-# Config
-config.ts
-
 # DB
 *.db
 *.sqlite

bots/discord/CHANGELOG.md

@@ -1,3 +1,91 @@
+# @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)
+
+
+### Bug Fixes
+
+* **bots/discord:** correct whitelist logic ([49c29be](https://github.com/revanced/revanced-helper/commit/49c29bebfbe348ae4e2cc1b3a83bfa41eb26ccd1))
+
+# @revanced/discord-bot [1.0.0-dev.18](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.17...@revanced/discord-bot@1.0.0-dev.18) (2024-08-03)
+
+
+### Bug Fixes
+
+* **bots/discord:** set the `label` property correctly for message scans ([6d463df](https://github.com/revanced/revanced-helper/commit/6d463df586dee5dd8fe8d6cff1c5316f7809b32a))
+
+# @revanced/discord-bot [1.0.0-dev.17](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.16...@revanced/discord-bot@1.0.0-dev.17) (2024-08-02)
+
+
+### Bug Fixes
+
+* **bots/discord/commands/eval:** evaluate in current context ([5925d90](https://github.com/revanced/revanced-helper/commit/5925d902095acef5f6396ca03583a9cbb0862498))
+* **bots/discord:** send right response for after regexes ([a7688fa](https://github.com/revanced/revanced-helper/commit/a7688fa9b91919a87f74071b502cd0a87cd1c1fa))
+
+
+### Features
+
+* **bots/discord:** update example config file ([bc9951c](https://github.com/revanced/revanced-helper/commit/bc9951c9b5e007c3e1b3076aa0966ccf29bb18bc))
+
+# @revanced/discord-bot [1.0.0-dev.16](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.15...@revanced/discord-bot@1.0.0-dev.16) (2024-08-02)
+
+
+### Bug Fixes
+
+* **bots/discord:** open database as read-write ([c366840](https://github.com/revanced/revanced-helper/commit/c36684091dddf67880505dc459e4334a8a5492f4))
+* **bots/discord:** remove bad text channel checks ([f5939e2](https://github.com/revanced/revanced-helper/commit/f5939e25288fea2022fdeec9085ecb9ffada6111))
+* **bots/discord:** remove redundant footer for response embeds ([412e003](https://github.com/revanced/revanced-helper/commit/412e00317d1eaca23e9c1375e16f94a5f2fa8d86))
+
+
+### Features
+
+* **bots/discord/commands:** add `reload` command ([6875b32](https://github.com/revanced/revanced-helper/commit/6875b32fd0c6ce3034da9dc6c704d425afb26f2e))
+
+# @revanced/discord-bot [1.0.0-dev.15](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.14...@revanced/discord-bot@1.0.0-dev.15) (2024-07-31)
+
+
+### Bug Fixes
+
+* **bots/discord:** import `config` from context ([763ef25](https://github.com/revanced/revanced-helper/commit/763ef253f9d4ff70a8b79969a7f4f41cba7f3c59))
+
+
+### Features
+
+* **bots/discord:** add sticky messages ([bf66155](https://github.com/revanced/revanced-helper/commit/bf661556e131bf0ef24e47f658fbcd701960e312))
+
+# @revanced/discord-bot [1.0.0-dev.14](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.13...@revanced/discord-bot@1.0.0-dev.14) (2024-07-31)
+
+
+### Bug Fixes
+
+* **bots/discord:** always true check causing no messages to be scanned ([98ec37b](https://github.com/revanced/revanced-helper/commit/98ec37b5d18cade85270ab83b0ed0abe41244dd9))
+* other small issues ([bc437a5](https://github.com/revanced/revanced-helper/commit/bc437a5ec7ce1d339094d608e2a61ac5f460c163))
+
+
+### Features
+
+* **bots/discord:** add more options for curing, fix default regex ([1a4ec1e](https://github.com/revanced/revanced-helper/commit/1a4ec1ece80becd9156582cc490f6681cb2a1f39))
+* **bots/discord:** allow admins to bypass permission checks ([620f933](https://github.com/revanced/revanced-helper/commit/620f9339f0737b79d72c66d90ffa42ea3f987710))
+
+# @revanced/discord-bot [1.0.0-dev.13](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.12...@revanced/discord-bot@1.0.0-dev.13) (2024-07-30)
+
+
+### Bug Fixes
+
+* **bots/discord:** broken regex when prefix set to special characters ([ab62e55](https://github.com/revanced/revanced-helper/commit/ab62e55e76005f5999d7413d1158e54053f28d1f))
+
+# @revanced/discord-bot [1.0.0-dev.12](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.11...@revanced/discord-bot@1.0.0-dev.12) (2024-07-30)
+
+
+### Bug Fixes
+
+* **bots/discord:** deployment runtime errors due to minification ([a60c60c](https://github.com/revanced/revanced-helper/commit/a60c60c0f994a4c256b7d0582e99a1731209cf49))
+
+# @revanced/discord-bot [1.0.0-dev.11](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.10...@revanced/discord-bot@1.0.0-dev.11) (2024-07-30)
+
+
+### Bug Fixes
+
+* **bots/discord:** reset counter when reconnected to api, redo message scan filter logic ([d234d79](https://github.com/revanced/revanced-helper/commit/d234d79310caed9c43e14a905f9ef46a110e071d))
+
 # @revanced/discord-bot [1.0.0-dev.10](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.9...@revanced/discord-bot@1.0.0-dev.10) (2024-07-30)
 
 

bots/discord/config.js

@@ -11,8 +11,21 @@ export default {
             GUILD_ID_HERE: ['ROLE_ID_HERE'],
         },
     },
+    stickyMessages: {
+        GUILD_ID_HERE: {
+            CHANNEL_ID_HERE: {
+                message: {
+                    content: 'This is a sticky message!',
+                },
+                timeout: 60000,
+                forceSendTimeout: 300000,
+            }
+        }
+    },
     moderation: {
         cure: {
+            minimumNameLength: 3,
+            removeCharactersRegex: /[^a-zA-Z0-9 \-_]/g,
             defaultName: 'Server member',
         },
         roles: ['ROLE_ID_HERE'],
@@ -61,7 +74,11 @@ export default {
                 },
             },
         },
-        allowedAttachmentMimeTypes: ['image/jpeg', 'image/png', 'image/webp'],
+        attachments: {
+            scanAttachments: true,
+            allowedMimeTypes: ['image/jpeg', 'image/png', 'image/webp', 'text/plain'],
+            maxTextFileSize: 512000
+        },
         responses: [
             {
                 filterOverride: {

bots/discord/config.schema.ts

@@ -6,9 +6,12 @@ export type Config = {
         users?: string[]
         roles?: Record<string, string[]>
     }
+    stickyMessages?: Record<string, Record<string, StickyMessageConfig>>
     moderation?: {
         roles: string[]
         cure?: {
+            minimumNameLength?: number
+            removeCharactersRegex?: RegExp
             defaultName: string
         }
         log?: {
@@ -23,7 +26,11 @@ export type Config = {
     messageScan?: {
         scanBots?: boolean
         scanOutsideGuilds?: boolean
-        allowedAttachmentMimeTypes: string[]
+        attachments?: {
+            scanAttachments?: boolean
+            allowedMimeTypes?: string[]
+            maxTextFileSize?: number
+        }
         filter?: {
             whitelist?: Filter
             blacklist?: Filter
@@ -48,6 +55,12 @@ export type Config = {
     }
 }
 
+export type StickyMessageConfig = {
+    timeout: number
+    forceSendTimeout?: number
+    message: BaseMessageOptions
+}
+
 export type RolePresetConfig = {
     give: string[]
     take: string[]
@@ -60,7 +73,7 @@ export type ConfigMessageScanResponse = {
     }
     filterOverride?: NonNullable<Config['messageScan']>['filter']
     response: ConfigMessageScanResponseMessage | null
-    replyToReplied?: boolean
+    respondToReply?: boolean
 }
 
 export type ConfigMessageScanResponseLabelConfig = {

bots/discord/package.json

@@ -2,7 +2,7 @@
   "name": "@revanced/discord-bot",
   "type": "module",
   "private": true,
-  "version": "1.0.0-dev.10",
+  "version": "1.0.0-dev.19",
   "description": "🤖 Discord bot assisting ReVanced",
   "main": "src/index.ts",
   "scripts": {

bots/discord/scripts/build.ts

@@ -12,7 +12,6 @@ await Bun.build({
     outdir: './dist/src',
     target: 'bun',
     external: ['./config.js'],
-    minify: true,
     sourcemap: 'external',
 })
 

bots/discord/src/classes/Command.ts

@@ -291,6 +291,9 @@ export default class Command<
     async canExecute(executor: User | GuildMember, channelId: string): Promise<boolean> {
         if (!this.requirements) return false
 
+        const isExecutorAdmin = isAdmin(executor)
+        if (isExecutorAdmin) return true
+
         const {
             adminOnly,
             channels,
@@ -307,7 +310,7 @@ export default class Command<
         const bMemReqForUsers = memberRequirementsForUsers !== 'fail'
 
         const conditions = [
-            adminOnly ? isAdmin(executor) : bDefCond,
+            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,

bots/discord/src/commands/admin/eval.ts

@@ -1,5 +1,5 @@
 import { inspect } from 'util'
-import { runInNewContext } from 'vm'
+import { runInThisContext } from 'vm'
 import { ApplicationCommandOptionType } from 'discord.js'
 
 import { AdminCommand } from '$/classes/Command'
@@ -20,13 +20,13 @@ export default new AdminCommand({
             required: false,
         },
     },
-    async execute(context, trigger, { code, 'show-hidden': showHidden }) {
+    async execute(_, trigger, { code, 'show-hidden': showHidden }) {
         await trigger.reply({
             ephemeral: true,
             embeds: [
                 createSuccessEmbed('Evaluate', `\`\`\`js\n${code}\`\`\``).addFields({
                     name: 'Result',
-                    value: `\`\`\`js\n${inspect(runInNewContext(code, { client: trigger.client, context, trigger }), { depth: 1, showHidden, getters: true, numericSeparator: true, showProxy: true })}\`\`\``,
+                    value: `\`\`\`js\n${inspect(runInThisContext(code), { depth: 1, showHidden, getters: true, numericSeparator: true, showProxy: true })}\`\`\``,
                 }),
             ],
         })

bots/discord/src/commands/admin/reload.ts

@@ -0,0 +1,17 @@
+import { AdminCommand } from '$/classes/Command'
+import { join, dirname } from 'path'
+
+import type { Config } from 'config.schema'
+
+export default new AdminCommand({
+    name: 'reload',
+    description: 'Reload configuration',
+    async execute(context, trigger) {
+        context.config = ((await import(join(dirname(Bun.main), '..', 'config.js'))) as { default: Config }).default
+
+        await trigger.reply({
+            content: 'Reloaded configuration',
+            ephemeral: true,
+        })
+    },
+})

bots/discord/src/commands/moderation/purge.ts

@@ -1,4 +1,4 @@
-import { EmbedBuilder, GuildChannel } from 'discord.js'
+import { EmbedBuilder } from 'discord.js'
 
 import { ModerationCommand } from '$/classes/Command'
 import CommandError, { CommandErrorType } from '$/classes/CommandError'
@@ -31,7 +31,7 @@ export default new ModerationCommand({
             throw new CommandError(CommandErrorType.MissingArgument, 'Either `amount` or `until` must be provided.')
 
         const channel = interaction.channel!
-        if (!(channel.isTextBased() && channel instanceof GuildChannel))
+        if (!channel.isTextBased())
             throw new CommandError(CommandErrorType.InvalidChannel, 'The supplied channel is not a text channel.')
 
         const embed = applyCommonEmbedStyles(

bots/discord/src/commands/moderation/slowmode.ts

@@ -28,7 +28,7 @@ export default new ModerationCommand({
         if (!channel?.isTextBased() || channel.isDMBased())
             throw new CommandError(
                 CommandErrorType.InvalidChannel,
-                'The supplied channel is not a text channel or does not exist.',
+                'The supplied channel is not a text channel.',
             )
 
         if (Number.isNaN(duration)) throw new CommandError(CommandErrorType.InvalidDuration, 'Invalid duration.')

bots/discord/src/constants.ts

@@ -4,12 +4,6 @@ export const MessageScanLabeledResponseReactions = {
     delete: '❌',
 } as const
 
-export const MessageScanHumanizedMode = {
-    ocr: 'image recognition',
-    nlp: 'text analysis',
-    match: 'pattern matching',
-} as const
-
 export const DefaultEmbedColor = '#4E98F0'
 export const ReVancedLogoURL =
     'https://media.discordapp.net/attachments/1095487869923119144/1115436493050224660/revanced-logo.png'

bots/discord/src/context.ts

@@ -3,7 +3,7 @@ import { existsSync, readFileSync, readdirSync } from 'fs'
 import { join } from 'path'
 import { Client as APIClient } from '@revanced/bot-api'
 import { createLogger } from '@revanced/bot-shared'
-import { Client as DiscordClient, Partials } from 'discord.js'
+import { Client as DiscordClient, type Message, Partials } from 'discord.js'
 import { drizzle } from 'drizzle-orm/bun-sqlite'
 
 // Export some things first, as commands require them
@@ -56,7 +56,7 @@ if (DatabasePath && !existsSync(DatabasePath)) {
     }
 }
 
-const db = new Database(DatabasePath)
+const db = new Database(DatabasePath, { readwrite: true, create: true })
 if (dbSchemaFileName) db.run(readFileSync(join(DatabaseSchemaDir, dbSchemaFileName)).toString())
 
 export const database = drizzle(db, {
@@ -85,4 +85,19 @@ export const discord = {
         string,
         Command<boolean, CommandOptionsOptions | undefined, boolean>
     >,
+    stickyMessages: {} as Record<
+        string,
+        Record<
+            string,
+            {
+                forceSendTimerActive?: boolean
+                timeoutMs: number
+                forceSendMs?: number
+                send: (forced?: boolean) => Promise<void>
+                currentMessage?: Message<true>
+                interval?: NodeJS.Timeout
+                forceSendInterval?: NodeJS.Timeout
+            }
+        >
+    >,
 } as const

bots/discord/src/events/api/ready.ts

@@ -1,3 +1,7 @@
 import { on, withContext } from '$utils/api/events'
 
-withContext(on, 'ready', ({ logger }) => void logger.info('Connected to the bot API'))
+withContext(on, 'ready', ({ api, logger }) => {
+    // Reset disconnect count, so it doesn't meet the threshold for an accidental disconnect
+    api.disconnectCount = 0
+    logger.info('Connected to the bot API')
+})

bots/discord/src/events/discord/interactionCreate/chatCommand.ts

@@ -9,7 +9,8 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
     const command = discord.commands[interaction.commandName]
 
     logger.debug(`Command ${interaction.commandName} being invoked by ${interaction.user.tag}`)
-    if (!command) return void logger.error(`Command ${interaction.commandName} not implemented but registered!!!`)
+    if (!command)
+        return void logger.error(`Interaction command ${interaction.commandName} not implemented but registered!!!`)
 
     try {
         logger.debug(`Command ${interaction.commandName} being executed`)

bots/discord/src/events/discord/messageCreate/messageCommand.ts

@@ -8,7 +8,9 @@ withContext(on, 'messageCreate', async (context, msg) => {
 
     if (msg.author.bot) return
 
-    const regex = new RegExp(`^(?:${config.prefix}|${msg.client.user.toString()}\\s*)([a-zA-Z-_]+)(?:\\s+)?(.+)?`)
+    const regex = new RegExp(
+        `^(?:${config.prefix ? `${escapeRegexSpecials(config.prefix)}|` : ''}${msg.client.user.toString()}\\s*)([a-zA-Z-_]+)(?:\\s+)?(.+)?`,
+    )
     const matches = msg.content.match(regex)
 
     if (!matches) return
@@ -17,7 +19,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
 
     const command = discord.commands[commandName]
     logger.debug(`Command ${commandName} being invoked by ${msg.author.id}`)
-    if (!command) return void logger.error(`Command ${commandName} not implemented`)
+    if (!command) return void logger.debug(`Message command ${commandName} not implemented`)
 
     const argsRegex: RegExp = /[^\s"]+|"([^"]*)"/g
     const args: CommandArguments = []
@@ -51,3 +53,12 @@ withContext(on, 'messageCreate', async (context, msg) => {
         await msg.reply({ embeds: [err instanceof CommandError ? err.toEmbed() : createStackTraceEmbed(err)] })
     }
 })
+
+const escapeRegexSpecials = (str: string): string => {
+    let escapedStr = ''
+    for (const char of str) {
+        if (['.', '+', '*', '?', '$', '(', ')', '[', ']', '{', '}', '|', '\\'].includes(char)) escapedStr += `\\${char}`
+        else escapedStr += char
+    }
+    return escapedStr
+}

bots/discord/src/events/discord/messageCreate/messageScan.ts

@@ -24,7 +24,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
         try {
             logger.debug(`Classifying message ${msg.id}`)
 
-            const { response, label, replyToReplied } = await getResponseFromText(
+            const { response, label, respondToReply } = await getResponseFromText(
                 msg.content,
                 filteredResponses,
                 context,
@@ -33,14 +33,14 @@ withContext(on, 'messageCreate', async (context, msg) => {
             if (response) {
                 logger.debug('Response found')
 
-                const toReply = replyToReplied ? await msg.fetchReference() : msg
+                const toReply = respondToReply ? (msg.reference?.messageId ? await msg.fetchReference() : msg) : msg
                 const reply = await toReply.reply({
                     ...response,
-                    embeds: response.embeds?.map(it => createMessageScanResponseEmbed(it, label ? 'nlp' : 'match')),
+                    embeds: response.embeds?.map(createMessageScanResponseEmbed),
                 })
 
-                if (label)
+                if (label) {
-                    db.insert(responses).values({
+                    await db.insert(responses).values({
                         replyId: reply.id,
                         channelId: reply.channel.id,
                         guildId: reply.guild!.id,
@@ -49,7 +49,6 @@ withContext(on, 'messageCreate', async (context, msg) => {
                         content: msg.content,
                     })
 
-                if (label) {
                     for (const reaction of Object.values(MessageScanLabeledResponseReactions)) {
                         await reply.react(reaction)
                     }
@@ -60,11 +59,22 @@ withContext(on, 'messageCreate', async (context, msg) => {
         }
     }
 
-    if (msg.attachments.size > 0) {
+    if (msg.attachments.size > 0 && config.attachments?.scanAttachments) {
         logger.debug(`Classifying message attachments for ${msg.id}`)
 
         for (const attachment of msg.attachments.values()) {
-            if (attachment.contentType && !config.allowedAttachmentMimeTypes.includes(attachment.contentType)) continue
+            if (
+                config.attachments.allowedMimeTypes &&
+                !config.attachments.allowedMimeTypes.includes(attachment.contentType!)
+            ) {
+                logger.debug(`Disallowed MIME type for attachment: ${attachment.url}, ${attachment.contentType}`)
+                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}`)   
+                continue
+            }
 
             try {
                 const { text: content } = await api.client.parseImage(attachment.url)
@@ -74,7 +84,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
                     logger.debug(`Response found for attachment: ${attachment.url}`)
                     await msg.reply({
                         ...response,
-                        embeds: response.embeds?.map(it => createMessageScanResponseEmbed(it, 'ocr')),
+                        embeds: response.embeds?.map(createMessageScanResponseEmbed),
                     })
 
                     break

bots/discord/src/events/discord/messageCreate/stickyMessageReset.ts

@@ -0,0 +1,30 @@
+import { on, withContext } from '$utils/discord/events'
+
+withContext(on, 'messageCreate', async ({ discord, logger }, msg) => {
+    if (!msg.inGuild()) return
+    if (msg.author.id === msg.client.user.id) return
+
+    const store = discord.stickyMessages[msg.guildId]?.[msg.channelId]
+    if (!store) return
+
+    if (!store.interval) store.interval = setTimeout(store.send, store.timeoutMs) as NodeJS.Timeout
+    else {
+        store.interval.refresh()
+
+        if (!store.forceSendTimerActive && store.forceSendMs) {
+            logger.debug(`Channel ${msg.channelId} in guild ${msg.guildId} is active, starting force send timer`)
+
+            store.forceSendTimerActive = true
+
+            if (!store.forceSendInterval)
+                store.forceSendInterval = setTimeout(
+                    () =>
+                        store.send(true).then(() => {
+                            store.forceSendTimerActive = false
+                        }),
+                    store.forceSendMs,
+                ) as NodeJS.Timeout
+            else store.forceSendInterval.refresh()
+        }
+    }
+})

bots/discord/src/events/discord/messageReactionAdd/correctResponse.ts

@@ -20,6 +20,7 @@ const PossibleReactions = Object.values(Reactions) as string[]
 
 withContext(on, 'messageReactionAdd', async (context, rct, user) => {
     if (user.bot) return
+    await rct.users.remove(user.id)
     
     const { database: db, logger, config } = context
     const { messageScan: msConfig } = config
@@ -35,10 +36,7 @@ withContext(on, 'messageReactionAdd', async (context, rct, user) => {
 
     if (!isAdmin(reactionMessage.member || reactionMessage.author)) {
         // User is in guild, and config has member requirements
-        if (
+        if (reactionMessage.inGuild() && msConfig.humanCorrections.allow) {
-            reactionMessage.inGuild() &&
-            (msConfig.humanCorrections.allow?.members || msConfig.humanCorrections.allow?.users)
-        ) {
             const {
                 allow: { users: allowedUsers, members: allowedMembers },
             } = msConfig.humanCorrections
@@ -54,20 +52,19 @@ withContext(on, 'messageReactionAdd', async (context, rct, user) => {
                     )
                 )
                     return
-            } else if (allowedUsers) {
+            } else if (!allowedUsers?.includes(user.id)) return
-                if (!allowedUsers.includes(user.id)) return
+        } else
-            } else {
+            return void logger.warn(
-                return void logger.warn(
+                'No member or user requirements set for human corrections, all requests will be ignored',
-                    '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)
 

bots/discord/src/events/discord/ready.ts

@@ -1,14 +1,68 @@
 import { database, logger } from '$/context'
 import { appliedPresets } from '$/database/schemas'
+import { applyCommonEmbedStyles } from '$/utils/discord/embeds'
+import { on, withContext } from '$/utils/discord/events'
 import { removeRolePreset } from '$/utils/discord/rolePresets'
-import type { Client } from 'discord.js'
 import { lt } from 'drizzle-orm'
-import { on, withContext } from 'src/utils/discord/events'
 
-export default withContext(on, 'ready', ({ config, logger }, client) => {
+import type { Client } from 'discord.js'
+
+export default withContext(on, 'ready', async ({ config, discord, logger }, client) => {
     logger.info(`Connected to Discord API, logged in as ${client.user.displayName} (@${client.user.tag})!`)
     logger.info(`Bot is in ${client.guilds.cache.size} guilds`)
 
+    if (config.stickyMessages)
+        for (const [guildId, channels] of Object.entries(config.stickyMessages)) {
+            const guild = await client.guilds.fetch(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
+
+                const send = async (forced = false) => {
+                    try {
+                        const msg = await channel.send({
+                            ...message,
+                            embeds: message.embeds?.map(it => applyCommonEmbedStyles(it, true, true, true)),
+                        })
+
+                        const store = discord.stickyMessages[guildId]![channelId]
+                        if (!store) return
+
+                        await store.currentMessage?.delete().catch()
+                        store.currentMessage = msg
+
+                        if (!forced) {
+                            clearTimeout(store.forceSendInterval)
+                            logger.debug(
+                                `Timeout ended for sticky message in channel ${channelId} in guild ${guildId}, channel is inactive`,
+                            )
+                        } else {
+                            clearTimeout(store.interval)
+                            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) {
+                        logger.error(
+                            `Error while sending sticky message to channel ${channelId} in guild ${guildId}:`,
+                            e,
+                        )
+                    }
+                }
+
+                discord.stickyMessages[guildId]![channelId] = {
+                    forceSendMs: forceSendTimeout,
+                    timeoutMs: timeout,
+                    send,
+                    forceSendTimerActive: false,
+                }
+            }
+        }
+
     if (config.rolePresets) {
         removeExpiredPresets(client)
         setTimeout(() => removeExpiredPresets(client), config.rolePresets.checkExpiredEvery)

bots/discord/src/index.ts

@@ -10,5 +10,10 @@ if (missingEnvs.length) {
     process.exit(1)
 }
 
+// Handle uncaught exceptions
+
+process.on('uncaughtException', error => console.error('Uncaught exception:', error))
+process.on('unhandledRejection', reason => console.error('Unhandled rejection:', reason))
+
 api.client.connect()
 discord.client.login()

bots/discord/src/utils/discord/embeds.ts

@@ -1,5 +1,5 @@
-import { DefaultEmbedColor, MessageScanHumanizedMode, ReVancedLogoURL } from '$/constants'
+import { DefaultEmbedColor, ReVancedLogoURL } from '$/constants'
-import { EmbedBuilder, type EmbedField, type User } from 'discord.js'
+import { type APIEmbed, EmbedBuilder, type EmbedField, type JSONEncodable, type User } from 'discord.js'
 import type { ConfigMessageScanResponseMessage } from '../../../config.schema'
 
 export const createErrorEmbed = (title: string | null, description?: string) =>
@@ -25,23 +25,7 @@ export const createSuccessEmbed = (title: string | null, description?: string) =
 
 export const createMessageScanResponseEmbed = (
     response: NonNullable<ConfigMessageScanResponseMessage['embeds']>[number],
-    mode: 'ocr' | 'nlp' | 'match',
+) => applyCommonEmbedStyles(response, true, true, true)
-) => {
-    // biome-ignore lint/style/noParameterAssign: While this is confusing, it is fine for this purpose
-    if ('toJSON' in response) response = response.toJSON()
-
-    const embed = new EmbedBuilder().setTitle(response.title ?? null)
-
-    if (response.description) embed.setDescription(response.description)
-    if (response.fields) embed.addFields(response.fields)
-
-    embed.setFooter({
-        text: `ReVanced • Via ${MessageScanHumanizedMode[mode]}`,
-        iconURL: ReVancedLogoURL,
-    })
-
-    return applyCommonEmbedStyles(embed, true, true, true)
-}
 
 export const createModerationActionEmbed = (
     action: string,
@@ -77,19 +61,23 @@ export const applyReferenceToModerationActionEmbed = (embed: EmbedBuilder, refer
 }
 
 export const applyCommonEmbedStyles = (
-    embed: EmbedBuilder,
+    embed: EmbedBuilder | JSONEncodable<APIEmbed> | APIEmbed,
     setThumbnail = false,
     setFooter = false,
     setColor = false,
 ) => {
+    // biome-ignore lint/style/noParameterAssign: While this is confusing, it is fine for this purpose
+    if ('toJSON' in embed) embed = embed.toJSON()
+    const builder = new EmbedBuilder(embed)
+
     if (setFooter)
-        embed.setFooter({
+        builder.setFooter({
             text: 'ReVanced',
             iconURL: ReVancedLogoURL,
         })
 
-    if (setColor) embed.setColor(DefaultEmbedColor)
+    if (setColor) builder.setColor(DefaultEmbedColor)
-    if (setThumbnail) embed.setThumbnail(ReVancedLogoURL)
+    if (setThumbnail) builder.setThumbnail(ReVancedLogoURL)
 
-    return embed
+    return builder
 }

bots/discord/src/utils/discord/messageScan.ts

@@ -10,9 +10,12 @@ export const getResponseFromText = async (
     // Just to be safe that we will never use data from the context parameter
     { api, logger }: Omit<typeof import('src/context'), 'config'>,
     ocrMode = false,
-): Promise<ConfigMessageScanResponse & { label?: string }> => {
+): Promise<
-    let responseConfig: Awaited<ReturnType<typeof getResponseFromText>> = {
+    Omit<ConfigMessageScanResponse, 'triggers'> & { label?: string; triggers?: ConfigMessageScanResponse['triggers'] }
-        triggers: {},
+> => {
+    type ResponseConfig = Awaited<ReturnType<typeof getResponseFromText>>
+    let responseConfig: Omit<ResponseConfig, 'triggers'> & { triggers?: ResponseConfig['triggers'] } = {
+        triggers: undefined,
         response: null,
     }
 
@@ -27,7 +30,6 @@ export const getResponseFromText = async (
         const {
             triggers: { text: textTriggers, image: imageTriggers },
         } = trigger
-        if (responseConfig) break
 
         if (ocrMode) {
             if (imageTriggers)
@@ -55,36 +57,37 @@ export const getResponseFromText = async (
     }
 
     // If none of the regexes match, we can search for labels immediately
-    if (!responseConfig && !ocrMode) {
+    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}`)
 
-            let triggerConfig: ConfigMessageScanResponseLabelConfig | undefined
+            let trigger: ConfigMessageScanResponseLabelConfig | undefined
-            const labelConfig = responses.find(x => {
+            const response = responses.find(x => {
                 const config = x.triggers.text!.find(
                     (x): x is ConfigMessageScanResponseLabelConfig => 'label' in x && x.label === matchedLabel.name,
                 )
-                if (config) triggerConfig = config
+                if (config) trigger = config
                 return config
             })
 
-            if (!labelConfig) {
+            if (!response) {
-                logger.warn(`No label config found for label ${matchedLabel.name}`)
+                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 >= triggerConfig!.threshold) {
+            if (matchedLabel.confidence >= trigger!.threshold) {
                 logger.debug('Label confidence is enough')
-                responseConfig = labelConfig
+                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) {
+    if (!responseConfig.triggers && ocrMode) {
         logger.debug('No match from NLP, doing after regexes')
         for (let i = 0; i < responses.length; i++) {
             const {
@@ -92,8 +95,8 @@ export const getResponseFromText = async (
             } = responses[i]!
             const firstLabelIndex = firstLabelIndexes[i] ?? -1
 
-            for (let i = firstLabelIndex + 1; i < textTriggers!.length; i++) {
+            for (let j = firstLabelIndex + 1; j < textTriggers!.length; j++) {
-                const trigger = textTriggers![i]!
+                const trigger = textTriggers![j]!
 
                 if (trigger instanceof RegExp) {
                     if (trigger.test(content)) {
@@ -113,15 +116,24 @@ export const messageMatchesFilter = (message: Message, filter: NonNullable<Confi
     if (!filter) return true
 
     const memberRoles = new Set(message.member?.roles.cache.keys())
-    const blFilter = filter.blacklist
+    const { blacklist, whitelist } = filter
 
-    // If matches blacklist, will return false
+    // If matches only blacklist, will return false
-    // Any other case, will return true
+    // If matches whitelist but also matches blacklist, will return false
-    return !(
+    // If matches only whitelist, will return true
-        blFilter &&
+    // If matches neither, will return true
-        (blFilter.channels?.includes(message.channelId) ||
+    return (
-            blFilter.roles?.some(role => memberRoles.has(role)) ||
+        (whitelist
-            blFilter.users?.includes(message.author.id))
+            ? whitelist.channels?.includes(message.channelId) ||
+              whitelist.roles?.some(role => memberRoles.has(role)) ||
+              whitelist.users?.includes(message.author.id)
+            : true) &&
+        !(
+            blacklist &&
+            (blacklist.channels?.includes(message.channelId) ||
+                blacklist.roles?.some(role => memberRoles.has(role)) ||
+                blacklist.users?.includes(message.author.id))
+        )
     )
 }
 
@@ -149,7 +161,7 @@ export const handleUserResponseCorrection = async (
 
         await reply.edit({
             ...correctLabelResponse.response,
-            embeds: correctLabelResponse.response.embeds?.map(it => createMessageScanResponseEmbed(it, 'nlp')),
+            embeds: correctLabelResponse.response.embeds?.map(createMessageScanResponseEmbed),
         })
     }
 

bots/discord/src/utils/discord/moderation.ts

@@ -38,7 +38,7 @@ export const getLogChannel = async (guild: Guild) => {
 
     try {
         const channel = await guild.channels.fetch(logConfig.thread ?? logConfig.channel)
-        if (!channel || !channel.isTextBased())
+        if (!channel?.isTextBased())
             return void logger.warn('The moderation log channel does not exist, skipping logging')
 
         return channel
@@ -54,9 +54,9 @@ export const cureNickname = async (member: GuildMember) => {
     const name = member.displayName
     let cured = decancer(name)
         .toString()
-        .replace(/[^a-zA-Z0-9]/g, '')
+        .replace(new RegExp(config.moderation?.cure?.removeCharactersRegex ?? '[^a-zA-Z0-9 \\-_]', 'g'), '')
 
-    if (cured.length < 3 || !/^[a-zA-Z]/.test(cured))
+    if (cured.length < (config?.moderation?.cure?.minimumNameLength ?? 3))
         cured =
             member.user.username.length >= 3
                 ? member.user.username

bots/discord/src/utils/discord/permissions.ts

@@ -1,5 +1,5 @@
 import { GuildMember, type User } from 'discord.js'
-import config from '../../../config'
+import { config } from '../../context'
 
 export const isAdmin = (userOrMember: User | GuildMember) => {
     return (

package.json

@@ -55,6 +55,7 @@
   ],
   "patchedDependencies": {
     "@semantic-release/npm@12.0.1": "patches/@semantic-release%2Fnpm@12.0.1.patch",
-    "drizzle-kit@0.22.8": "patches/drizzle-kit@0.22.8.patch"
+    "drizzle-kit@0.22.8": "patches/drizzle-kit@0.22.8.patch",
+    "decancer@3.2.3": "patches/decancer@3.2.3.patch"
   }
 }

packages/api/src/classes/Client.ts

@@ -52,17 +52,20 @@ export default class Client {
         // But if we add anything similar, this will cause another race condition
         // To fix this, we can try adding a instanced function that would return the currentSequence
         // and it would be updated every time a "heartbeat ack" packet is received
-        return Promise.race([
+        const packet = await Promise.race([
             this.#awaiter.await(ServerOperation.ParsedText, this.ws.currentSequence),
-            this.#awaiter.await(ServerOperation.ParseTextFailed, this.ws.timeout + 5000),
+            this.#awaiter.await(ServerOperation.ParseTextFailed, this.ws.currentSequence, this.ws.timeout + 5000),
         ])
             .then(pkt => {
                 if (pkt.op === ServerOperation.ParsedText) return pkt.d
-                throw new Error('Failed to parse text, the API encountered an error')
+                return null
             })
             .catch(() => {
                 throw new Error('Failed to parse text, the API did not respond in time')
             })
+
+        if (!packet) throw new Error('Failed to parse text, the API encountered an error')
+        return packet
     }
 
     /**
@@ -82,17 +85,20 @@ export default class Client {
 
         // See line 50
 
-        return Promise.race([
+        const packet = await Promise.race([
             this.#awaiter.await(ServerOperation.ParsedImage, this.ws.currentSequence),
-            this.#awaiter.await(ServerOperation.ParseImageFailed, this.ws.timeout + 5000),
+            this.#awaiter.await(ServerOperation.ParseImageFailed, this.ws.currentSequence, this.ws.timeout + 5000),
         ])
             .then(pkt => {
                 if (pkt.op === ServerOperation.ParsedImage) return pkt.d
-                throw new Error('Failed to parse image, the API encountered an error')
+                return null
             })
             .catch(() => {
                 throw new Error('Failed to parse image, the API did not respond in time')
             })
+
+        if (!packet) throw new Error('Failed to parse image, the API encountered an error')
+        return packet
     }
 
     async trainMessage(text: string, label: string) {
@@ -107,17 +113,20 @@ export default class Client {
         })
 
         // See line 50
-        return Promise.race([
+        const packet = await Promise.race([
             this.#awaiter.await(ServerOperation.TrainedMessage, this.ws.currentSequence),
-            this.#awaiter.await(ServerOperation.TrainMessageFailed, this.ws.timeout + 5000),
+            this.#awaiter.await(ServerOperation.TrainMessageFailed, this.ws.currentSequence, this.ws.timeout + 5000),
         ])
             .then(pkt => {
                 if (pkt.op === ServerOperation.TrainedMessage) return pkt.d
-                throw new Error('Failed to train message, the API encountered an error')
+                return null
             })
             .catch(() => {
                 throw new Error('Failed to train message, the API did not respond in time')
             })
+
+        if (!packet) throw new Error('Failed to train message, the API encountered an error')
+        return packet
     }
 
     /**

packages/api/src/classes/ClientWebSocket.ts

@@ -77,9 +77,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
+            })
     }
 
     /**
@@ -123,7 +127,7 @@ export class ClientWebSocketManager {
         this.currentSequence++
 
         this.#socket.send(serializePacket(packet), err => {
-            throw err
+            if (err) throw err
         })
     }
 

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 &&
+        'd' in input
-        typeof input.d === 'object'
     ) {
         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

patches/decancer@3.2.3.patch

@@ -0,0 +1,13 @@
+diff --git a/src/lib.js b/src/lib.js
+index de45d7dbe82975b09eff3742d0718accae2107fc..0575daa03dfabdd5c96928458ff4270cb8f7188a 100644
+--- a/src/lib.js
++++ b/src/lib.js
+@@ -42,7 +42,7 @@ function isMusl() {
+ }
+ 
+ function getBinding(name) {
+-  const path = join(__dirname, '..', `decancer.${name}.node`)
++  const path = join(import.meta.dir, '..', `decancer.${name}.node`)
+ 
+   return require(existsSync(path) ? path : `@vierofernando/decancer-${name}`)
+ }