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

# @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](3261294822))

bots/discord/CHANGELOG.md

@@ -1,3 +1,10 @@
+# @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)
 
 

bots/discord/package.json

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

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'
 
@@ -54,59 +55,56 @@ export const getResponseFromText = async (
                     break
                 }
             }
+        }
+    }
 
-            // 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}`,
-                    )
+    // 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 (matchedLabel.confidence >= trigger!.threshold) {
-                        logger.debug('Label confidence is enough')
-                        responseConfig = { ...responseConfig, ...response, label: trigger!.label }
-                    }
-                }
+            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 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 (matchedLabel.confidence >= trigger!.threshold) {
+                logger.debug('Label confidence is enough')
+                responseConfig = { ...responseConfig, ...response, label: trigger!.label }
+            }
+        }
+    }
 
-                    for (let j = firstLabelIndex + 1; j < textTriggers!.length; j++) {
-                        const trigger = textTriggers![j]!
+    // 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 (trigger instanceof RegExp) {
-                            if (trigger.test(content)) {
-                                logger.debug(`Message matched regex (after mode): ${trigger.source}`)
-                                responseConfig = responses[i]!
-                                break
-                            }
-                        }
+            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
                     }
                 }
             }
@@ -163,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>,
+]

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