chore(release): 1.1.1 [skip ci]

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

### Bug Fixes

* **bots/discord:** fix sticky msg force timer always starting, add more logging ([cb4dc42](cb4dc42dfa))

README.md

@@ -58,7 +58,7 @@
    Continuing the legacy of Vanced
 </p>
 
-# 🤖 ReVanced Helper
+# 🤖 ReVanced Bots
 
 Bots assisting ReVanced on multiple platforms.
 
@@ -67,4 +67,4 @@ Bots assisting ReVanced on multiple platforms.
 Thank you for considering! This project is made in TypeScript and we use the [Bun](https://bun.sh) JavaScript runtime.
 
 Please refer to the [documentation](./docs) for more information.  
-You can find projects under the [`apis`](./apis/), [`bots`](./bots), and [`packages`](./packages/) directories.
+You can find projects under the [`apis`](./apis/), [`bots`](./bots), and [`packages`](./packages/) directories.

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,34 @@
+## @revanced/discord-bot [1.1.1](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.1.0...@revanced/discord-bot@1.1.1) (2025-04-14)
+
+
+### Bug Fixes
+
+* **bots/discord:** fix sticky msg force timer always starting, add more logging ([cb4dc42](https://github.com/revanced/revanced-bots/commit/cb4dc42dfab8cf9821b03316cf56b405abd497ae))
+
+# @revanced/discord-bot [1.1.0](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.0.4...@revanced/discord-bot@1.1.0) (2025-04-14)
+
+
+### Features
+
+* **bots/discord:** delete and send sticky msg concurrently, add more logging ([247a00f](https://github.com/revanced/revanced-bots/commit/247a00f57fc2a45fe828cc41e6f0e38e67e83a20))
+
+## @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)
+
+
+### Bug Fixes
+
+* **bots/discord:** attempt to fix sticky messages one last time ([65288ec](https://github.com/revanced/revanced-bots/commit/65288ec4242b32d0b5e213b3d7af602bb9a829ca))
+
+## @revanced/discord-bot [1.0.2](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.0.1...@revanced/discord-bot@1.0.2) (2025-04-09)
+
 ## @revanced/discord-bot [1.0.1](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.0.0...@revanced/discord-bot@1.0.1) (2025-04-09)
 
 

bots/discord/package.json

@@ -2,7 +2,7 @@
   "name": "@revanced/discord-bot",
   "type": "module",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.1.1",
   "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,41 +7,22 @@ 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) {
-            // Force timer isn't active, so we start it
-            if (!store.forceTimerActive) {
-                logger.debug(
-                    `Channel ${msg.channelId} in guild ${msg.guildId} is active, starting force send timer and clearing existing timer`,
-                )
+    // Timer is already active from previous event, 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 very active, starting sticky message force timer`,
+        )
 
-                // Clear the timer
-                clearTimeout(store.timer)
-                store.timerActive = false
-
-                // (Re)start the force timer
-                store.forceTimerActive = true
-                if (!store.forceTimer)
-                    store.forceTimer = setTimeout(
-                        () =>
-                            store.send(true).then(() => {
-                                store.forceTimerActive = false
-                            }),
-                        store.forceTimerMs,
-                    ) as NodeJS.Timeout
-                else store.forceTimer.refresh()
-            } else {
-                // Force timer is already active, so we clear the force timer
-                store.forceTimerActive = false
-                clearTimeout(store.forceTimer)
-                // and force send
-                store.send(true)
-            }
-        }
-    } else if (!store.forceTimerActive) {
-        // 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)
     }
+
+    logger.debug(`Channel ${msg.channelId} in guild ${msg.guildId} is active, starting sticky message 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
 })

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

@@ -1,107 +0,0 @@
-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)
-            // In case of configuration refresh, this will not be nullable
-            const oldStore = discord.stickyMessages[guildId]
-            discord.stickyMessages[guildId] = {}
-
-            for (const [channelId, { message, timeout, forceSendTimeout }] of Object.entries(channels)) {
-                const channel = await guild.channels.fetch(channelId)
-                if (!channel?.isTextBased())
-                    return void logger.warn(
-                        `Channel ${channelId} in guild ${guildId} is not a text channel, sticky messages will not be sent`,
-                    )
-
-                const send = async (forced = false) => {
-                    try {
-                        const msg = 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(
-                                `Timeout ended for sticky message in channel ${channelId} in guild ${guildId}, channel is inactive`,
-                            )
-                        else
-                            logger.debug(
-                                `Forced send timeout for sticky message in channel ${channelId} in guild ${guildId} ended, channel is too active`,
-                            )
-
-                        logger.debug(`Sent sticky message to channel ${channelId} in guild ${guildId}`)
-                    } catch (e) {
-                        logger.error(
-                            `Error while sending sticky message to channel ${channelId} in guild ${guildId}:`,
-                            e,
-                        )
-                    }
-                }
-
-                // Set up the store
-                discord.stickyMessages[guildId]![channelId] = {
-                    forceTimerActive: false,
-                    timerActive: false,
-                    forceTimerMs: forceSendTimeout,
-                    timerMs: timeout,
-                    send,
-                    // If the store exists before the configuration refresh, take its current message
-                    currentMessage: oldStore?.[channelId]?.currentMessage,
-                }
-
-                // Send a new sticky message immediately, as well as deleting the old/outdated message, if it exists
-                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}`)
-        }
-}

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

@@ -0,0 +1,68 @@
+import { applyCommonEmbedStyles } from '$/utils/discord/embeds'
+import { on, withContext } from '$/utils/discord/events'
+
+export default withContext(on, 'ready', async ({ config, discord, logger }, client) => {
+    if (config.stickyMessages)
+        for (const [guildId, channels] of Object.entries(config.stickyMessages)) {
+            const guild = await client.guilds.fetch(guildId)
+            // In case of configuration refresh, this will not be nullable
+            const oldStore = discord.stickyMessages[guildId]
+            discord.stickyMessages[guildId] = {}
+
+            for (const [channelId, { message, timeout, forceSendTimeout }] of Object.entries(channels)) {
+                const channel = await guild.channels.fetch(channelId)
+                if (!channel?.isTextBased())
+                    return void logger.warn(
+                        `Channel ${channelId} in guild ${guildId} is not a text channel, sticky messages will not be sent`,
+                    )
+
+                // Set up the store
+                // biome-ignore lint/suspicious/noAssignInExpressions: don't care
+                const store = (discord.stickyMessages[guildId]![channelId] = {
+                    forceTimerActive: false,
+                    timerActive: false,
+                    forceTimerMs: forceSendTimeout,
+                    timerMs: timeout,
+                    async send() {
+                        try {
+                            await Promise.all([
+                                channel
+                                    .send({
+                                        ...message,
+                                        embeds: message.embeds?.map(it => applyCommonEmbedStyles(it, true, true, true)),
+                                    })
+                                    .then(msg => {
+                                        this.currentMessage = msg
+                                        logger.debug(`Sent sticky message to channel ${channelId} in guild ${guildId}`)
+                                    }),
+                                this.currentMessage
+                                    ?.delete()
+                                    ?.then(() =>
+                                        logger.debug(
+                                            `Deleted old sticky message from channel ${channelId} in guild ${guildId}`,
+                                        ),
+                                    ),
+                            ])
+                        } catch (e) {
+                            logger.error(
+                                `Error while managing sticky message of channel ${channelId} in guild ${guildId}:`,
+                                e,
+                            )
+                        } finally {
+                            // Clear any remaining timers
+                            clearTimeout(this.timer)
+                            clearTimeout(this.forceTimer)
+                            this.forceTimerActive = this.timerActive = false
+
+                            logger.debug(`Cleared sticky message timer for channel ${channelId} in guild ${guildId}`)
+                        }
+                    },
+                    // If the store exists before the configuration refresh, take its current message
+                    currentMessage: oldStore?.[channelId]?.currentMessage,
+                })
+
+                // Send a new sticky message immediately, as well as deleting the old/outdated message, if it exists
+                await store.send()
+            }
+        }
+})