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

bots/discord/CHANGELOG.md

@@ -1,3 +1,11 @@
+# @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.28",
   "description": "🤖 Discord bot assisting ReVanced",
   "main": "src/index.ts",
   "scripts": {

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

@@ -66,10 +66,7 @@ withContext(on, 'messageCreate', async (context, msg) => {
             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 +83,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

@@ -12,18 +12,34 @@ withContext(on, 'messageCreate', async ({ discord, logger }, msg) => {
     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

@@ -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'>,
-    flags: { onlyImageTriggers?: boolean; skipApiRequest?: boolean } = {}
+    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 (flags.onlyImageTriggers) {
+        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 && !flags.onlyImageTriggers && !flags.skipApiRequest) {
-        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 && flags.onlyImageTriggers) {
-        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
+                            }
+                        }
                     }
                 }
             }

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