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,56 @@
+# @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)
+
+
+### 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)
 
 

bots/discord/package.json

@@ -2,7 +2,7 @@
   "name": "@revanced/discord-bot",
   "type": "module",
   "private": true,
-  "version": "1.0.0-dev.23",
+  "version": "1.0.0-dev.29",
   "description": "🤖 Discord bot assisting ReVanced",
   "main": "src/index.ts",
   "scripts": {
@@ -33,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"
   }
 }

bots/discord/src/classes/Command.ts

@@ -373,7 +373,7 @@ export default class Command<
             memberRequirementsForUsers = 'pass',
         } = this.requirements
 
-        const member = this.isGuildSpecific() ? null : (executor as GuildMember)
+        const member = this.isGuildSpecific() ? (executor as GuildMember) : null
         const boolDefaultCondition = defaultCondition !== 'fail'
         const boolMemberRequirementsForUsers = memberRequirementsForUsers !== 'fail'
 

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

@@ -19,14 +19,17 @@ 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',
                     // biome-ignore lint/security/noGlobalEval: This is fine as it's an admin command
-                    value: `\`\`\`js\n${inspect(eval(code), {
+                    value: `\`\`\`js\n${inspect(await eval(code), {
                         depth: 1,
                         showHidden,
                         getters: true,

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

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

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

@@ -7,22 +7,39 @@ withContext(on, 'messageCreate', async ({ discord, logger }, msg) => {
     const store = discord.stickyMessages[msg.guildId]?.[msg.channelId]
     if (!store) return
 
+    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 (!store.timerActive) 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/events/discord/messageReactionAdd/correctResponse.ts

@@ -20,11 +20,10 @@ 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
-
+    
     // If there's no config, we can't do anything
     if (!msConfig?.humanCorrections) return
 
@@ -33,6 +32,7 @@ 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

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

bots/discord/src/utils/discord/rolePresets.ts

@@ -7,7 +7,7 @@ import { and, eq } from 'drizzle-orm'
 type PresetKey = string
 
 export const applyRolePreset = async (member: GuildMember, presetName: PresetKey, expires: number) => {
-    const afterInsert = await applyRolesUsingPreset(presetName, member, true)
+    const { removed, callback } = await applyRolesUsingPreset(presetName, member)
     const until = expires === Infinity ? null : Math.ceil(expires / 1000)
 
     await database
@@ -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)),
+    }
 }

bots/discord/src/utils/duration.ts

@@ -1,18 +1,6 @@
-export const parseDuration = (duration: string) => {
-    if (!duration.length) return Number.NaN
-    const matches = duration.match(/(?:(\d+y)?(\d+M)?(\d+w)?(\d+)d)?(?:(\d+)h)?(?:(\d+)m)?(?:(\d+)s?)/)!
+import parse from 'parse-duration'
 
-    const [, years, months, weeks, days, hours, minutes, seconds] = matches.map(Number)
-    return (
-        (years || 0) * 290304e5 +
-        (months || 0) * 24192e5 +
-        (weeks || 0) * 6048e5 +
-        (days || 0) * 864e5 +
-        (hours || 0) * 36e5 +
-        (minutes || 0) * 6e4 +
-        (seconds || 0) * 1e3
-    )
-}
+export const parseDuration = (duration: string) => parse(duration, 'ms') ?? Number.NaN
 
 export const durationToString = (duration: number) => {
     if (duration === 0) return '0s'

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.3.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.5",
+    "lefthook": "^1.7.15",
     "portainer-service-webhook": "https://github.com/newarifrh/portainer-service-webhook#v1",
-    "semantic-release": "^24.0.0",
-    "turbo": "^2.0.9",
-    "typescript": "^5.5.4"
+    "semantic-release": "^24.1.1",
+    "turbo": "^2.1.2",
+    "typescript": "^5.6.2"
   },
   "trustedDependencies": [
     "@biomejs/biome",