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

# @revanced/discord-bot [1.0.0-dev.33](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.32...@revanced/discord-bot@1.0.0-dev.33) (2024-09-25)

### Features

* **bots/discord:** add trigger to context for eval ([b5f4097](b5f4097538))

bots/discord/CHANGELOG.md

@@ -1,3 +1,46 @@
+# @revanced/discord-bot [1.0.0-dev.33](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.32...@revanced/discord-bot@1.0.0-dev.33) (2024-09-25)
+
+
+### Features
+
+* **bots/discord:** add trigger to context for eval ([b5f4097](https://github.com/revanced/revanced-helper/commit/b5f40975386677ffff343c42f8ffac21f847a0b7))
+
+# @revanced/discord-bot [1.0.0-dev.32](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.31...@revanced/discord-bot@1.0.0-dev.32) (2024-09-25)
+
+
+### Bug Fixes
+
+* **bots/discord:** contextify object before sandboxing ([062735f](https://github.com/revanced/revanced-helper/commit/062735f6d552890404d6192244c51a11b0709580))
+
+# @revanced/discord-bot [1.0.0-dev.31](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.30...@revanced/discord-bot@1.0.0-dev.31) (2024-09-25)
+
+
+### Bug Fixes
+
+* **bots/discord:** persist changes in context for eval command ([5b4965d](https://github.com/revanced/revanced-helper/commit/5b4965dcc7285676b2b3b6756c249bd56eaf8485))
+
+# @revanced/discord-bot [1.0.0-dev.30](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.29...@revanced/discord-bot@1.0.0-dev.30) (2024-09-24)
+
+
+### Features
+
+* **bots/discord:** improve admin commands ([0346741](https://github.com/revanced/revanced-helper/commit/03467411882b8598e2c06f389a09ef2e201bb43f))
+
+# @revanced/discord-bot [1.0.0-dev.29](https://github.com/revanced/revanced-helper/compare/@revanced/discord-bot@1.0.0-dev.28...@revanced/discord-bot@1.0.0-dev.29) (2024-09-21)
+
+
+### Bug Fixes
+
+* **bots/discord:** fix get response logic ([3261294](https://github.com/revanced/revanced-helper/commit/3261294822b0a9faec094536ed5be2d3e1d5e17b))
+
+# @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)
 
 

bots/discord/package.json

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

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

@@ -1,8 +1,12 @@
+import { unlinkSync, writeFileSync } from 'fs'
+import { join } from 'path'
 import { inspect } from 'util'
+import { createContext, runInContext } from 'vm'
 import { ApplicationCommandOptionType } from 'discord.js'
 
 import { AdminCommand } from '$/classes/Command'
 import { createSuccessEmbed } from '$/utils/discord/embeds'
+import { parseDuration } from '$/utils/duration'
 
 export default new AdminCommand({
     name: 'eval',
@@ -18,26 +22,74 @@ export default new AdminCommand({
             type: ApplicationCommandOptionType.Boolean,
             required: false,
         },
+        ['inspect-depth']: {
+            description: 'How many times to recurse while formatting the object (default: 1)',
+            type: ApplicationCommandOptionType.Integer,
+            required: false,
+        },
+        timeout: {
+            description: 'Timeout for the evaluation (default: 10s)',
+            type: ApplicationCommandOptionType.String,
+            required: false,
+        },
     },
-    async execute(context, trigger, { code, 'show-hidden': showHidden }) {
-        // So it doesn't show up as unused, and we can use it in `code`
-        context
+    async execute(context, trigger, { code, 'show-hidden': showHidden, timeout, ['inspect-depth']: inspectDepth }) {
+        const currentToken = context.discord.client.token
+        const currentEnvToken = process.env['DISCORD_TOKEN']
+        context.discord.client.token = null
+        process.env['DISCORD_TOKEN'] = undefined
+
+        // This allows developers to access and modify the context object to apply changes
+        // to the bot while the bot is running, minus malicious actors getting the token to perform malicious actions
+        const output = await runInContext(
+            code,
+            createContext({
+                ...globalThis,
+                context,
+                trigger,
+            }),
+            {
+                timeout: parseDuration(timeout ?? '10s'),
+                filename: 'eval',
+                displayErrors: true,
+            },
+        )
+
+        context.discord.client.token = currentToken
+        process.env['DISCORD_TOKEN'] = currentEnvToken
+
+        const inspectedOutput = inspect(output, {
+            depth: inspectDepth ?? 1,
+            showHidden,
+            getters: showHidden,
+            numericSeparator: true,
+            showProxy: showHidden,
+        })
+
+        const embed = createSuccessEmbed('Evaluate', `\`\`\`js\n${code}\`\`\``)
+        const files: string[] = []
+        const filepath = join(Bun.main, '..', `output-eval-${Date.now()}.js`)
+
+        if (inspectedOutput.length > 1000) {
+            writeFileSync(filepath, inspectedOutput)
+            files.push(filepath)
+
+            embed.addFields({
+                name: 'Result',
+                value: '```js\n// (output too long, file uploaded)```',
+            })
+        } else
+            embed.addFields({
+                name: 'Result',
+                value: `\`\`\`js\n${inspectedOutput}\`\`\``,
+            })
 
         await trigger.reply({
             ephemeral: true,
-            embeds: [
-                createSuccessEmbed('Evaluate', `\`\`\`js\n${code}\`\`\``).addFields({
-                    name: 'Result',
-                    // 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,
-                    })}\`\`\``,
-                }),
-            ],
+            embeds: [embed],
+            files,
         })
+
+        if (files.length) unlinkSync(filepath)
     },
 })

bots/discord/src/commands/admin/exception-test.ts

@@ -11,7 +11,10 @@ export default new AdminCommand({
             description: 'The type of exception to throw',
             type: ApplicationCommandOptionType.String,
             required: true,
-            choices: Object.keys(CommandErrorType).map(k => ({ name: k, value: k })),
+            choices: [
+                { name: 'Process', value: 'Process' },
+                ...Object.keys(CommandErrorType).map(k => ({ name: k, value: k })),
+            ],
         },
     },
     async execute(_, __, { type }) {

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

@@ -1,5 +1,5 @@
+import { dirname, join } from 'path'
 import { AdminCommand } from '$/classes/Command'
-import { join, dirname } from 'path'
 
 import type { Config } from 'config.schema'
 
@@ -8,7 +8,12 @@ export default new AdminCommand({
     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
+        logger.info(`Reload triggered by ${context.executor.tag} (${context.executor.id})`)
+
+        // Apparently the query strings only work with non-Windows "URLs", otherwise it'd just infinitely hang
+        const path = `${Bun.pathToFileURL(join(dirname(Bun.main), '..', 'config.js')).toString()}?cache=${Date.now()}`
+        logger.debug(`Reloading configuration from: ${path}`)
+        context.config = ((await import(path)) as { default: Config }).default
 
         if ('deferReply' in trigger) await trigger.deferReply({ ephemeral: true })
 
@@ -32,6 +37,6 @@ export default new AdminCommand({
         await discord.client.login(process.env['DISCORD_TOKEN'])
 
         // @ts-expect-error: TypeScript dum
-        await trigger[('deferReply' in trigger ? 'editReply' : 'reply')]({ content: 'Reloaded configuration' })
+        await trigger['deferReply' in trigger ? 'editReply' : 'reply']({ content: 'Reloaded configuration' })
     },
 })

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

@@ -1,4 +1,3 @@
-import { MessageScanLabeledResponseReactions } from '$/constants'
 import { responses } from '$/database/schemas'
 import { getResponseFromText, messageMatchesFilter } from '$/utils/discord/messageScan'
 import { createMessageScanResponseEmbed } from '$utils/discord/embeds'
@@ -22,7 +21,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
 
     if (msg.content.length) {
         try {
-            logger.debug(`Classifying message ${msg.id}`)
+            logger.debug(`Classifying message ${msg.id}, possible responses is ${filteredResponses.length}`)
 
             const { response, label, respondToReply } = await getResponseFromText(
                 msg.content,
@@ -48,10 +47,6 @@ withContext(on, 'messageCreate', async (context, msg) => {
                         label,
                         content: msg.content,
                     })
-
-                    for (const reaction of Object.values(MessageScanLabeledResponseReactions)) {
-                        await reply.react(reaction)
-                    }
                 }
             }
         } catch (e) {
@@ -60,16 +55,13 @@ withContext(on, 'messageCreate', async (context, msg) => {
     }
 
     if (msg.attachments.size && config.attachments?.scanAttachments) {
-        logger.debug(`Classifying message attachments for ${msg.id}`)
+        logger.debug(`Classifying message attachments for ${msg.id}, possible responses is ${filteredResponses.length}`)
 
         for (const attachment of msg.attachments.values()) {
             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)
-            ) {
+            if (config.attachments.allowedMimeTypes && !config.attachments.allowedMimeTypes.includes(mimeType)) {
                 logger.debug(`Disallowed MIME type for attachment: ${attachment.url}, ${mimeType}`)
                 continue
             }
@@ -86,10 +78,14 @@ withContext(on, 'messageCreate', async (context, msg) => {
 
                 if (isTextFile) {
                     const content = await (await fetch(attachment.url)).text()
-                    response = await getResponseFromText(content, filteredResponses, context, { skipApiRequest: true }).then(it => it.response)
+                    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, { onlyImageTriggers: true }).then(it => it.response)
+                    response = await getResponseFromText(content, filteredResponses, context, {
+                        imageTriggersOnly: true,
+                    }).then(it => it.response)
                 }
 
                 if (response) {

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

@@ -7,23 +7,51 @@ withContext(on, 'messageCreate', async ({ discord, logger }, msg) => {
     const store = discord.stickyMessages[msg.guildId]?.[msg.channelId]
     if (!store) return
 
+    // TODO: Fix this by fixing the logic below
+    if (store.timerActive && store.forceTimerActive) {
+        logger.error(
+            `Both timers are active in sticky message store: ${msg.guildId}.${msg.channelId}, this should not happen!`,
+        )
+        logger.info('Clearing the timer and the restarting the force timer...')
+        clearTimeout(store.timer)
+        store.timerActive = false
+        // If the force timer is active, it implies the force timer exists
+        store.forceTimer!.refresh()
+    }
+
     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 {
-        // If there is a timer, but it isn't active, restart it
-        if (!timerPreviouslyActive) store.timer.refresh()
-        // If there is a timer and it is active, but the force timer isn't active...
-        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:
+                - (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`,
+            )
 
             // Clear the timer
             clearTimeout(store.timer)
             store.timerActive = false
-            store.forceTimerActive = true
 
             // (Re)start the force timer
+            store.forceTimerActive = true
             if (!store.forceTimer)
                 store.forceTimer = setTimeout(
                     () =>

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

@@ -1,6 +1,7 @@
 import { type Response, responses } from '$/database/schemas'
 import type { Config, ConfigMessageScanResponse, ConfigMessageScanResponseLabelConfig } from 'config.schema'
-import type { Message, PartialUser, User } from 'discord.js'
+import { ButtonStyle, ComponentType } from 'discord.js'
+import type { APIActionRowComponent, APIButtonComponent, Message, PartialUser, User } from 'discord.js'
 import { eq } from 'drizzle-orm'
 import { createMessageScanResponseEmbed } from './embeds'
 
@@ -9,7 +10,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'>,
-    flags: { onlyImageTriggers?: boolean; skipApiRequest?: boolean } = {}
+    flags: { imageTriggersOnly?: boolean; textRegexesOnly?: boolean } = {},
 ): Promise<
     Omit<ConfigMessageScanResponse, 'triggers'> & { label?: string; triggers?: ConfigMessageScanResponse['triggers'] }
 > => {
@@ -31,7 +32,7 @@ export const getResponseFromText = async (
             triggers: { text: textTriggers, image: imageTriggers },
         } = trigger
 
-        if (flags.onlyImageTriggers) {
+        if (flags.imageTriggersOnly) {
             if (imageTriggers)
                 for (const regex of imageTriggers)
                     if (regex.test(content)) {
@@ -39,7 +40,7 @@ export const getResponseFromText = async (
                         responseConfig = trigger
                         break
                     }
-        } else
+        } else {
             for (let j = 0; j < textTriggers!.length; j++) {
                 const regex = textTriggers![j]!
 
@@ -54,10 +55,11 @@ export const getResponseFromText = async (
                     break
                 }
             }
+        }
     }
 
     // If none of the regexes match, we can search for labels immediately
-    if (!responseConfig.triggers && !flags.onlyImageTriggers && !flags.skipApiRequest) {
+    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) {
@@ -87,7 +89,7 @@ export const getResponseFromText = async (
     }
 
     // If we still don't have a response config, we can match all regexes after the initial label trigger
-    if (!responseConfig.triggers && flags.onlyImageTriggers) {
+    if (!responseConfig.triggers && !flags.imageTriggersOnly) {
         logger.debug('No match from NLP, doing after regexes')
         for (let i = 0; i < responses.length; i++) {
             const {
@@ -159,14 +161,41 @@ export const handleUserResponseCorrection = async (
             })
             .where(eq(responses.replyId, response.replyId))
 
-        await reply.edit({
+        return void (await reply.edit({
             ...correctLabelResponse.response,
             embeds: correctLabelResponse.response.embeds?.map(createMessageScanResponseEmbed),
-        })
+            components: [],
+        }))
     }
 
     await api.client.trainMessage(response.content, label)
     logger.debug(`User ${user.id} trained message ${response.replyId} as ${label} (positive)`)
 
-    await reply.reactions.removeAll()
+    await reply.edit({
+        components: [],
+    })
 }
+
+export const createMessageScanResponseComponents = (reply: Message<true>) => [
+    {
+        type: ComponentType.ActionRow,
+        components: [
+            {
+                type: ComponentType.Button,
+                style: ButtonStyle.Secondary,
+                emoji: {
+                    id: '👍',
+                },
+                custom_id: `train:${reply.id}`,
+            },
+            {
+                type: ComponentType.Button,
+                style: ButtonStyle.Secondary,
+                emoji: {
+                    id: '🔧',
+                },
+                custom_id: `edit:${reply.id}`,
+            },
+        ],
+    } as APIActionRowComponent<APIButtonComponent>,
+]

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

@@ -23,10 +23,7 @@ export const sendPresetReplyAndLogs = (
         ]),
     )
 
-export const sendModerationReplyAndLogs = async (
-    interaction: CommandInteraction | 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)] })

package.json

@@ -30,22 +30,22 @@
   "packageManager": "bun@1.1.20",
   "devDependencies": {
     "@anolilab/multi-semantic-release": "^1.1.3",
-    "@biomejs/biome": "^1.8.3",
+    "@biomejs/biome": "^1.9.2",
     "@codedependant/semantic-release-docker": "^5.0.3",
-    "@commitlint/cli": "^19.4.0",
-    "@commitlint/config-conventional": "^19.2.2",
+    "@commitlint/cli": "^19.5.0",
+    "@commitlint/config-conventional": "^19.5.0",
     "@saithodev/semantic-release-backmerge": "^4.0.1",
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/exec": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@tsconfig/strictest": "^2.0.5",
-    "@types/bun": "^1.1.6",
+    "@types/bun": "^1.1.10",
     "conventional-changelog-conventionalcommits": "^7.0.2",
-    "lefthook": "^1.7.14",
+    "lefthook": "^1.7.15",
     "portainer-service-webhook": "https://github.com/newarifrh/portainer-service-webhook#v1",
-    "semantic-release": "^24.1.0",
-    "turbo": "^2.0.14",
-    "typescript": "^5.5.4"
+    "semantic-release": "^24.1.1",
+    "turbo": "^2.1.2",
+    "typescript": "^5.6.2"
   },
   "trustedDependencies": [
     "@biomejs/biome",