chore(release): 1.0.4 [skip ci]

## @revanced/discord-bot [1.0.4](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.0.3...@revanced/discord-bot@1.0.4) (2025-04-14)

### Bug Fixes

* **bots/discord:** fix sticky messages logic again ([aa7501c](aa7501c309))
* **bots/discord:** remove expired presets from db if unapplying is not possible ([9d705e5](9d705e580c))

apis/websocket/package.json

@@ -37,4 +37,4 @@
     "@types/ws": "^8.18.1",
     "typed-emitter": "^2.1.0"
   }
-}
+}

bots/discord/CHANGELOG.md

@@ -1,3 +1,11 @@
+## @revanced/discord-bot [1.0.4](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.0.3...@revanced/discord-bot@1.0.4) (2025-04-14)
+
+
+### Bug Fixes
+
+* **bots/discord:** fix sticky messages logic again ([aa7501c](https://github.com/revanced/revanced-bots/commit/aa7501c3097a790265e4ea624d07c4a9c3c1b908))
+* **bots/discord:** remove expired presets from db if unapplying is not possible ([9d705e5](https://github.com/revanced/revanced-bots/commit/9d705e580c05d8b25df6f845d3aac747adaca116))
+
 ## @revanced/discord-bot [1.0.3](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.0.2...@revanced/discord-bot@1.0.3) (2025-04-09)
 
 

bots/discord/package.json

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

bots/discord/src/context.ts

@@ -101,7 +101,7 @@ export const discord = {
                 timerActive: boolean
                 timerMs: number
                 forceTimerMs?: number
-                send: (forced?: boolean) => Promise<void>
+                send: () => Promise<void>
                 currentMessage?: Message<true>
                 timer?: NodeJS.Timeout
                 forceTimer?: NodeJS.Timeout

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

@@ -7,29 +7,18 @@ withContext(on, 'messageCreate', async ({ discord, logger }, msg) => {
     const store = discord.stickyMessages[msg.guildId]?.[msg.channelId]
     if (!store) return
 
-    if (store.timerActive) {
-        // Timer is already active, so we try to start the force timer
-        if (store.forceTimerMs && !store.forceTimerActive) {
-            // Force timer isn't active, so we start it
-            logger.debug(
-                `Channel ${msg.channelId} in guild ${msg.guildId} is active, starting force send timer and clearing existing timer`,
-            )
+    // (Re)start the timer
+    store.timerActive = true
+    if (store.timer) store.timer.refresh()
+    else store.timer = setTimeout(store.send, store.timerMs) as NodeJS.Timeout
 
-            // Clear the timer
-            clearTimeout(store.timer)
-            store.timerActive = false
+    // Timer is already active, and force timer isn't active, so we start the latter
+    if (store.timerActive && store.forceTimerMs && !store.forceTimerActive) {
+        logger.debug(`Channel ${msg.channelId} in guild ${msg.guildId} is active, starting force send timer`)
 
-            // Start the force timer
-            store.forceTimerActive = true
-            // biome-ignore lint/suspicious/noAssignInExpressions: This works fine
-            ;(store.forceTimer ??= setTimeout(store.send, store.forceTimerMs)).refresh()
-        }
-    } else if (store.forceTimerActive) {
-        // Force timer is already active, so force send the message, and clear the force timer
-        store.send(true)
-    } else {
-        // Both timers aren't active, so we start the timer
-        store.timerActive = true
-        if (!store.timer) store.timer = setTimeout(store.send, store.timerMs) as NodeJS.Timeout
+        // (Re)start the force timer
+        store.forceTimerActive = true
+        if (store.forceTimer) store.forceTimer.refresh()
+        else store.forceTimer = setTimeout(store.send, store.forceTimerMs)
     }
 })

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

@@ -0,0 +1,6 @@
+import { on, withContext } from '$/utils/discord/events'
+
+export default withContext(on, 'ready', async ({ 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`)
+})

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

@@ -0,0 +1,43 @@
+import { database, logger } from '$/context'
+import { appliedPresets } from '$/database/schemas'
+import { on, withContext } from '$/utils/discord/events'
+import { removeRolePreset } from '$/utils/discord/rolePresets'
+import { and, eq, lt } from 'drizzle-orm'
+
+import { type Client, DiscordAPIError } from 'discord.js'
+
+export default withContext(on, 'ready', async ({ config }, client) => {
+    if (config.rolePresets) {
+        removeExpiredPresets(client)
+        setTimeout(() => removeExpiredPresets(client), config.rolePresets.checkExpiredEvery)
+    }
+})
+
+async function removeExpiredPresets(client: Client) {
+    logger.debug('Checking for expired role presets...')
+
+    const expireds = await database.query.appliedPresets.findMany({
+        where: lt(appliedPresets.until, Math.floor(Date.now() / 1000)),
+    })
+
+    for (const expired of expireds) {
+        try {
+            logger.debug(`Removing role preset for ${expired.memberId} in ${expired.guildId}`)
+
+            const guild = await client.guilds.fetch(expired.guildId)
+            const member = await guild.members.fetch(expired.memberId)
+
+            await removeRolePreset(member, expired.preset)
+        } catch (e) {
+            // Unknown Member: https://discord.com/developers/docs/topics/opcodes-and-status-codes#json
+            if (!(e instanceof DiscordAPIError) || e.code !== 10007) {
+                logger.error(`Error while removing role preset for ${expired.memberId} in ${expired.guildId}: ${e}`)
+                continue
+            }
+        }
+
+        await database
+            .delete(appliedPresets)
+            .where(and(eq(appliedPresets.guildId, expired.guildId), eq(appliedPresets.memberId, expired.memberId)))
+    }
+}

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

@@ -1,16 +1,7 @@
-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 { and, eq, lt } from 'drizzle-orm'
-
-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)
@@ -25,39 +16,31 @@ export default withContext(on, 'ready', async ({ config, discord, logger }, clie
                         `Channel ${channelId} in guild ${guildId} is not a text channel, sticky messages will not be sent`,
                     )
 
-                const send = async (forced = false) => {
+                const send = async () => {
+                    const store = discord.stickyMessages[guildId]![channelId]
+                    if (!store) return
+
                     try {
-                        const msg = await channel.send({
+                        const oldMsg = store.currentMessage
+
+                        store.currentMessage = 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
-
-                        // Clear any remaining timers
-                        clearTimeout(store.timer)
-                        clearTimeout(store.forceTimer)
-                        store.forceTimerActive = store.timerActive = false
-
-                        if (!forced)
-                            logger.debug(
-                                `Timer ended for sticky message in channel ${channelId} in guild ${guildId}, channel is inactive`,
-                            )
-                        else
-                            logger.debug(
-                                `Force timer for sticky message in channel ${channelId} in guild ${guildId} hasn't ended but a message was sent, channel is too active`,
-                            )
-
-                        logger.debug(`Sent sticky message to channel ${channelId} in guild ${guildId}`)
+                        await oldMsg?.delete()
                     } catch (e) {
                         logger.error(
                             `Error while sending sticky message to channel ${channelId} in guild ${guildId}:`,
                             e,
                         )
+                    } finally {
+                        // Clear any remaining timers
+                        clearTimeout(store.timer)
+                        clearTimeout(store.forceTimer)
+                        store.forceTimerActive = store.timerActive = false
+
+                        logger.debug(`Sent sticky message to channel ${channelId} in guild ${guildId}`)
                     }
                 }
 
@@ -76,32 +59,4 @@ export default withContext(on, 'ready', async ({ config, discord, logger }, clie
                 await send()
             }
         }
-
-    if (config.rolePresets) {
-        removeExpiredPresets(client)
-        setTimeout(() => removeExpiredPresets(client), config.rolePresets.checkExpiredEvery)
-    }
 })
-
-const removeExpiredPresets = async (client: Client) => {
-    logger.debug('Checking for expired role presets...')
-
-    const expireds = await database.query.appliedPresets.findMany({
-        where: lt(appliedPresets.until, Math.floor(Date.now() / 1000)),
-    })
-
-    for (const expired of expireds)
-        try {
-            logger.debug(`Removing role preset for ${expired.memberId} in ${expired.guildId}`)
-
-            const guild = await client.guilds.fetch(expired.guildId)
-            const member = await guild.members.fetch(expired.memberId)
-
-            await removeRolePreset(member, expired.preset)
-            await database
-                .delete(appliedPresets)
-                .where(and(eq(appliedPresets.guildId, expired.guildId), eq(appliedPresets.memberId, expired.memberId)))
-        } catch (e) {
-            logger.error(`Error while removing role preset for ${expired.memberId} in ${expired.guildId}: ${e}`)
-        }
-}