chore(release): 1.1.3-dev.1 [skip ci]

## @revanced/discord-bot [1.1.3-dev.1](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.1.2...@revanced/discord-bot@1.1.3-dev.1) (2025-05-02)

### Bug Fixes

* **bots/discord:** fix timeout overflow check for role presets ([9d7bd32](9d7bd3286a))

.github/workflows/release.yml

@@ -30,7 +30,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: '**/node_modules'
-          key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lockb') }}
+          key: ${{ runner.os }}-bun-${{ hashFiles('**/bun.lock') }}
           restore-keys: ${{ runner.os }}-bun-
 
       - name: Setup Bun
@@ -50,22 +50,11 @@ jobs:
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build and release
+      - name: Build, release, publish
         env:
-          RELEASE_WORKFLOW_STEP: release
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           DOCKER_REGISTRY_USER: ${{ github.repository_owner }}
           DOCKER_REGISTRY_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
-          DEBUG: semantic-release:*
-        run: bunx multi-semantic-release --debug
-
-        # We call multi-semantic-release twice to publish in a different step
-        # An environment variable determines which plugins in the config to run
-      - name: Trigger Portainer webhooks
-        if: github.ref == 'refs/heads/main'
-        env:
-          RELEASE_WORKFLOW_STEP: publish
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WEBSOCKET_API_PORTAINER_WEBHOOK_URL: ${{ secrets.WEBSOCKET_API_PORTAINER_WEBHOOK_URL }}
           DISCORD_BOT_PORTAINER_WEBHOOK_URL: ${{ secrets.DISCORD_BOT_PORTAINER_WEBHOOK_URL }}
         run: bunx multi-semantic-release

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/.releaserc.js

@@ -1,32 +1,28 @@
 import defineSubprojectReleaseConfig from '../../semantic-release-config.js'
 
 export default defineSubprojectReleaseConfig({
-    plugins:
-        process.env.RELEASE_WORKFLOW_STEP === 'publish'
-            ? [
-                  [
-                      '@semantic-release/exec',
-                      {
-                          publishCmd: 'bun run scripts/trigger-portainer-webhook.ts',
-                      },
-                  ],
-              ]
-            : [
-                  [
-                      '@codedependant/semantic-release-docker',
-                      {
-                          dockerImage: 'revanced-bot-websocket-api',
-                          dockerRegistry: 'ghcr.io',
-                          dockerProject: 'revanced',
-                          dockerContext: '../..',
-                          dockerPlatform: ['linux/amd64', 'linux/arm64'],
-                          dockerBuildQuiet: false,
-                          dockerTags: [
-                              '{{#if prerelease.[0]}}dev{{else}}main{{/if}}',
-                              '{{#unless prerelease.[0]}}latest{{/unless}}',
-                              '{{version}}',
-                          ],
-                      },
-                  ],
-              ],
+    plugins: [
+        [
+            '@codedependant/semantic-release-docker',
+            {
+                dockerImage: 'revanced-bot-websocket-api',
+                dockerRegistry: 'ghcr.io',
+                dockerProject: 'revanced',
+                dockerContext: '../..',
+                dockerPlatform: ['linux/amd64', 'linux/arm64'],
+                dockerBuildQuiet: false,
+                dockerTags: [
+                    '{{#if prerelease.[0]}}dev{{else}}main{{/if}}',
+                    '{{#unless prerelease.[0]}}latest{{/unless}}',
+                    '{{version}}',
+                ],
+            },
+        ],
+        [
+            '@semantic-release/exec',
+            {
+                successCmd: 'bun run scripts/trigger-portainer-webhook.ts',
+            },
+        ],
+    ],
 })

apis/websocket/CHANGELOG.md

@@ -1,6 +1,13 @@
 ## @revanced/bot-websocket-api [1.0.1](https://github.com/revanced/revanced-bots/compare/@revanced/bot-websocket-api@1.0.0...@revanced/bot-websocket-api@1.0.1) (2025-04-09)
 
 
+### Bug Fixes
+
+* **bots/discord:** attempt to fix sticky messages again ([7564b1a](https://github.com/revanced/revanced-bots/commit/7564b1a8f066183df390887ddfd4d73e0baa87ac))
+
+## @revanced/bot-websocket-api [1.0.1](https://github.com/revanced/revanced-bots/compare/@revanced/bot-websocket-api@1.0.0...@revanced/bot-websocket-api@1.0.1) (2025-04-09)
+
+
 ### Bug Fixes
 
 * **bots/discord:** attempt to fix sticky messages again ([7564b1a](https://github.com/revanced/revanced-bots/commit/7564b1a8f066183df390887ddfd4d73e0baa87ac))

apis/websocket/package.json

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

bots/discord/.releaserc.js

@@ -1,32 +1,28 @@
 import defineSubprojectReleaseConfig from '../../semantic-release-config.js'
 
 export default defineSubprojectReleaseConfig({
-    plugins:
-        process.env.RELEASE_WORKFLOW_STEP === 'publish'
-            ? [
-                  [
-                      '@semantic-release/exec',
-                      {
-                          publishCmd: 'bun run scripts/trigger-portainer-webhook.ts',
-                      },
-                  ],
-              ]
-            : [
-                  [
-                      '@codedependant/semantic-release-docker',
-                      {
-                          dockerImage: 'revanced-bot-discord',
-                          dockerRegistry: 'ghcr.io',
-                          dockerProject: 'revanced',
-                          dockerContext: '../..',
-                          dockerPlatform: ['linux/amd64', 'linux/arm64'],
-                          dockerBuildQuiet: false,
-                          dockerTags: [
-                              '{{#if prerelease.[0]}}dev{{else}}main{{/if}}',
-                              '{{#unless prerelease.[0]}}latest{{/unless}}',
-                              '{{version}}',
-                          ],
-                      },
-                  ],
-              ],
+    plugins: [
+        [
+            '@codedependant/semantic-release-docker',
+            {
+                dockerImage: 'revanced-bot-discord',
+                dockerRegistry: 'ghcr.io',
+                dockerProject: 'revanced',
+                dockerContext: '../..',
+                dockerPlatform: ['linux/amd64', 'linux/arm64'],
+                dockerBuildQuiet: false,
+                dockerTags: [
+                    '{{#if prerelease.[0]}}dev{{else}}main{{/if}}',
+                    '{{#unless prerelease.[0]}}latest{{/unless}}',
+                    '{{version}}',
+                ],
+            },
+        ],
+        [
+            '@semantic-release/exec',
+            {
+                successCmd: 'bun run scripts/trigger-portainer-webhook.ts',
+            },
+        ],
+    ],
 })

bots/discord/CHANGELOG.md

@@ -1,3 +1,50 @@
+## @revanced/discord-bot [1.1.3-dev.1](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.1.2...@revanced/discord-bot@1.1.3-dev.1) (2025-05-02)
+
+
+### Bug Fixes
+
+* **bots/discord:** fix timeout overflow check for role presets ([9d7bd32](https://github.com/revanced/revanced-bots/commit/9d7bd3286ad0ad4bdccda6a6c34788bdc53a8fd4))
+
+## @revanced/discord-bot [1.1.2](https://github.com/revanced/revanced-bots/compare/@revanced/discord-bot@1.1.1...@revanced/discord-bot@1.1.2) (2025-04-16)
+
+
+### Bug Fixes
+
+* **bots/discord/commands/admin/reload:** fix type error ([3908854](https://github.com/revanced/revanced-bots/commit/3908854fe090dda67b0d90225ab76f75e95db4c0))
+* **bots/discord/commands/moderation:** check if timeout amount is safe in role-preset commands ([0c1382c](https://github.com/revanced/revanced-bots/commit/0c1382c55856ed1e54c9e53dbb37e9297c5da37c))
+* **bots/discord:** replace use of deprecated `options.ephemeral` in replies ([31e5cf7](https://github.com/revanced/revanced-bots/commit/31e5cf7fc5c7cd0c6ca3b1f3b9410a88b95d8273))
+
+## @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.3-dev.1",
   "description": "🤖 Discord bot assisting ReVanced",
   "main": "src/index.ts",
   "scripts": {

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

@@ -2,7 +2,7 @@ import { unlinkSync, writeFileSync } from 'fs'
 import { join } from 'path'
 import { inspect } from 'util'
 import { createContext, runInContext } from 'vm'
-import { ApplicationCommandOptionType } from 'discord.js'
+import { ApplicationCommandOptionType, MessageFlags } from 'discord.js'
 
 import { AdminCommand } from '$/classes/Command'
 import { createSuccessEmbed } from '$/utils/discord/embeds'
@@ -85,8 +85,8 @@ export default new AdminCommand({
             })
 
         await trigger.reply({
-            ephemeral: true,
             embeds: [embed],
+            flags: MessageFlags.Ephemeral,
             files,
         })
 

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

@@ -1,4 +1,5 @@
 import { AdminCommand } from '$/classes/Command'
+import { type CommandInteraction, MessageFlags } from 'discord.js'
 
 export default new AdminCommand({
     name: 'reload',
@@ -10,7 +11,8 @@ export default new AdminCommand({
         logger.debug('Invalidating previous config...')
         context.config.invalidate()
 
-        if ('deferReply' in trigger) await trigger.deferReply({ ephemeral: true })
+        if ((trigger as CommandInteraction).deferReply)
+            await (trigger as CommandInteraction).deferReply({ flags: MessageFlags.Ephemeral })
 
         logger.info('Reinitializing API client to reload configuration...')
         await api.client.ws.setOptions(

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

@@ -1,4 +1,5 @@
 import { AdminCommand } from '$/classes/Command'
+import { MessageFlags } from 'discord.js'
 
 export default new AdminCommand({
     name: 'stop',
@@ -9,7 +10,7 @@ export default new AdminCommand({
         logger.fatal('Stopping bot...')
         trigger.reply({
             content: 'Stopping... (I will go offline once done)',
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         })
 
         if (!api.client.disconnected) api.client.disconnect()

bots/discord/src/commands/fun/coinflip.ts

@@ -1,4 +1,4 @@
-import { EmbedBuilder } from 'discord.js'
+import { EmbedBuilder, MessageFlags } from 'discord.js'
 
 import Command from '$/classes/Command'
 import { applyCommonEmbedStyles } from '$/utils/discord/embeds'
@@ -18,6 +18,7 @@ export default new Command({
         const reply = await trigger
             .reply({
                 embeds: [embed.toJSON()],
+                flags: MessageFlags.Ephemeral,
             })
             .then(it => it.fetch())
 

bots/discord/src/commands/fun/reply.ts

@@ -1,5 +1,5 @@
 import CommandError, { CommandErrorType } from '$/classes/CommandError'
-import { ApplicationCommandOptionType, Message } from 'discord.js'
+import { ApplicationCommandOptionType, Message, MessageFlags } from 'discord.js'
 import { ModerationCommand } from '../../classes/Command'
 
 export default new ModerationCommand({
@@ -40,7 +40,7 @@ export default new ModerationCommand({
 
         await trigger.reply({
             content: 'OK!',
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         })
     },
 })

bots/discord/src/commands/moderation/cure.ts

@@ -1,6 +1,7 @@
 import { ModerationCommand } from '$/classes/Command'
 import { createSuccessEmbed } from '$/utils/discord/embeds'
 import { cureNickname } from '$/utils/discord/moderation'
+import { MessageFlags } from 'discord.js'
 
 export default new ModerationCommand({
     name: 'cure',
@@ -18,7 +19,7 @@ export default new ModerationCommand({
         await cureNickname(member)
         await interaction.reply({
             embeds: [createSuccessEmbed(null, `Cured nickname for ${member.toString()}`)],
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         })
     },
 })

bots/discord/src/commands/moderation/mute.ts

@@ -3,7 +3,7 @@ import CommandError, { CommandErrorType } from '$/classes/CommandError'
 import { createModerationActionEmbed } from '$/utils/discord/embeds'
 import { sendModerationReplyAndLogs } from '$/utils/discord/moderation'
 import { applyRolePreset, removeRolePreset } from '$/utils/discord/rolePresets'
-import { parseDuration } from '$/utils/duration'
+import { isSafeTimeoutDuration, parseDuration } from '$/utils/duration'
 
 export default new ModerationCommand({
     name: 'mute',
@@ -63,7 +63,7 @@ export default new ModerationCommand({
             createModerationActionEmbed('Muted', user, executor.user, reason, Math.ceil(expires / 1000)),
         )
 
-        if (duration)
+        if (isSafeTimeoutDuration(duration))
             setTimeout(() => {
                 removeRolePreset(member, 'mute')
             }, duration)

bots/discord/src/commands/moderation/role-preset.ts

@@ -2,7 +2,7 @@ import { ModerationCommand } from '$/classes/Command'
 import CommandError, { CommandErrorType } from '$/classes/CommandError'
 import { sendPresetReplyAndLogs } from '$/utils/discord/moderation'
 import { applyRolePreset, removeRolePreset } from '$/utils/discord/rolePresets'
-import { parseDuration } from '$/utils/duration'
+import { isSafeTimeoutDuration, parseDuration } from '$/utils/duration'
 
 const SubcommandOptions = {
     member: {
@@ -78,7 +78,7 @@ export default new ModerationCommand({
             )
         }
 
-        if (expires)
+        if (expires && isSafeTimeoutDuration(expires))
             setTimeout(() => {
                 removeRolePreset(member, preset)
             }, expires)

bots/discord/src/commands/support/train/chat.ts

@@ -2,7 +2,7 @@ import Command from '$/classes/Command'
 import CommandError, { CommandErrorType } from '$/classes/CommandError'
 import { createSuccessEmbed } from '$/utils/discord/embeds'
 import type { ConfigMessageScanResponseLabelConfig } from 'config.schema'
-import type { FetchMessageOptions, MessageResolvable } from 'discord.js'
+import { type FetchMessageOptions, MessageFlags, type MessageResolvable } from 'discord.js'
 import { config } from '../../../context'
 
 const msRcConfig = config.messageScan?.humanCorrections?.allow
@@ -70,7 +70,7 @@ export default new Command({
                     `The provided message has been trained as \`${label}\`. Thank you for your contribution!`,
                 ),
             ],
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         })
     },
 })

bots/discord/src/commands/support/train/context-menu.ts

@@ -1,7 +1,7 @@
 import Command from '$/classes/Command'
 import CommandError, { CommandErrorType } from '$/classes/CommandError'
 import type { ConfigMessageScanResponseLabelConfig } from 'config.schema'
-import { type APIStringSelectComponent, ComponentType } from 'discord.js'
+import { type APIStringSelectComponent, ComponentType, MessageFlags } from 'discord.js'
 import { config } from '../../../context'
 
 const msRcConfig = config.messageScan?.humanCorrections?.allow
@@ -44,7 +44,7 @@ export default new Command({
                     type: ComponentType.ActionRow,
                 },
             ],
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         })
     },
 })

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/interactionCreate/chatCommand.ts

@@ -1,6 +1,7 @@
 import CommandError from '$/classes/CommandError'
 import { createStackTraceEmbed } from '$utils/discord/embeds'
 import { on, withContext } from '$utils/discord/events'
+import { MessageFlags } from 'discord.js'
 
 withContext(on, 'interactionCreate', async (context, interaction) => {
     if (!interaction.isChatInputCommand()) return
@@ -20,7 +21,7 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
 
         await interaction[interaction.replied ? 'followUp' : 'reply']({
             embeds: [err instanceof CommandError ? err.toEmbed() : createStackTraceEmbed(err)],
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         })
 
         // 100 and up are user errors

bots/discord/src/events/discord/interactionCreate/contextMenuCommand.ts

@@ -1,6 +1,7 @@
 import CommandError from '$/classes/CommandError'
 import { createStackTraceEmbed } from '$utils/discord/embeds'
 import { on, withContext } from '$utils/discord/events'
+import { MessageFlags } from 'discord.js'
 
 withContext(on, 'interactionCreate', async (context, interaction) => {
     if (!interaction.isContextMenuCommand()) return
@@ -20,7 +21,7 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
             logger.error(`Error while executing command ${interaction.commandName}:`, err)
         await interaction[interaction.replied ? 'followUp' : 'reply']({
             embeds: [err instanceof CommandError ? err.toEmbed() : createStackTraceEmbed(err)],
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         })
     }
 })

bots/discord/src/events/discord/interactionCreate/correctResponse.ts

@@ -3,7 +3,12 @@ import { handleUserResponseCorrection } from '$/utils/discord/messageScan'
 import { createErrorEmbed, createStackTraceEmbed, createSuccessEmbed } from '$utils/discord/embeds'
 import { on, withContext } from '$utils/discord/events'
 
-import type { ButtonInteraction, StringSelectMenuInteraction, TextBasedChannel } from 'discord.js'
+import {
+    type ButtonInteraction,
+    MessageFlags,
+    type StringSelectMenuInteraction,
+    type TextBasedChannel,
+} from 'discord.js'
 import { eq } from 'drizzle-orm'
 
 // No permission check required as it is already done when the user reacts to a bot response
@@ -26,7 +31,7 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
     if (!response)
         return void (await interaction.reply({
             content: "I don't recall having sent this response, so I cannot correct it.",
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         }))
 
     try {
@@ -91,7 +96,7 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
         logger.error('Failed to handle correct response interaction:', e)
         await interaction.reply({
             embeds: [createStackTraceEmbed(e)],
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         })
     }
 })

bots/discord/src/events/discord/interactionCreate/trainMessage.ts

@@ -1,7 +1,6 @@
 import { createErrorEmbed, createStackTraceEmbed, createSuccessEmbed } from '$utils/discord/embeds'
 import { on, withContext } from '$utils/discord/events'
-
-import type { TextBasedChannel } from 'discord.js'
+import { MessageFlags, type TextBasedChannel } from 'discord.js'
 
 withContext(on, 'interactionCreate', async (context, interaction) => {
     const {
@@ -28,7 +27,7 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
                         'Thank you for your contribution! Unfortunately, the message could not be found.',
                     ),
                 ],
-                ephemeral: true,
+                flags: MessageFlags.Ephemeral,
             }))
 
         const selectedLabel = interaction.values[0]!
@@ -40,13 +39,13 @@ withContext(on, 'interactionCreate', async (context, interaction) => {
                     `Thank you for your contribution! The selected message is being trained as \`${selectedLabel}\`. 🎉`,
                 ),
             ],
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         })
     } catch (e) {
         logger.error('Failed to handle train message interaction:', e)
         await interaction.reply({
             embeds: [createStackTraceEmbed(e)],
-            ephemeral: true,
+            flags: MessageFlags.Ephemeral,
         })
     }
 })

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

bots/discord/src/utils/duration.ts

@@ -23,3 +23,7 @@ export const durationToString = (duration: number) => {
         seconds ? `${seconds}s` : ''
     }`
 }
+
+export function isSafeTimeoutDuration(duration: number) {
+    return duration > 0 && duration < 2 ** 31 - 1
+}

bun.lock

@@ -25,7 +25,7 @@
     },
     "apis/websocket": {
       "name": "@revanced/bot-websocket-api",
-      "version": "1.0.0-dev.10",
+      "version": "1.0.1",
       "dependencies": {
         "@revanced/bot-shared": "workspace:*",
         "@sapphire/async-queue": "^1.5.5",
@@ -40,7 +40,7 @@
     },
     "bots/discord": {
       "name": "@revanced/discord-bot",
-      "version": "1.0.0-dev.36",
+      "version": "1.1.0",
       "dependencies": {
         "@discordjs/builders": "^1.10.1",
         "@discordjs/rest": "^2.4.3",
@@ -74,8 +74,8 @@
       "name": "@revanced/bot-shared",
       "version": "0.1.0",
       "dependencies": {
-        "bson": "^6.8.0",
-        "chalk": "^5.3.0",
+        "bson": "^6.10.3",
+        "chalk": "^5.4.1",
         "tracer": "^1.3.0",
         "valibot": "^0.30.0",
       },
@@ -88,6 +88,7 @@
     "lefthook",
   ],
   "patchedDependencies": {
+    "discord.js@14.18.0": "patches/discord.js@14.18.0.patch",
     "@semantic-release/npm@12.0.1": "patches/@semantic-release%2Fnpm@12.0.1.patch",
     "drizzle-kit@0.22.8": "patches/drizzle-kit@0.22.8.patch",
   },

package.json

@@ -56,6 +56,7 @@
   "patchedDependencies": {
     "@semantic-release/npm@12.0.1": "patches/@semantic-release%2Fnpm@12.0.1.patch",
     "drizzle-kit@0.22.8": "patches/drizzle-kit@0.22.8.patch",
-    "decancer@3.2.4": "patches/decancer@3.2.4.patch"
+    "decancer@3.2.4": "patches/decancer@3.2.4.patch",
+    "discord.js@14.18.0": "patches/discord.js@14.18.0.patch"
   }
 }

patches/discord.js@14.18.0.patch

@@ -0,0 +1,17 @@
+# Make Message#reply work with { flags: MessageFlags.Ephemeral } in typings
+# So our Command system doesn't break
+diff --git a/typings/index.d.mts b/typings/index.d.mts
+index 645b870..fa93158 100644
+--- a/typings/index.d.mts
++++ b/typings/index.d.mts
+@@ -6764,8 +6764,8 @@ export interface MessageCreateOptions extends BaseMessageOptionsWithPoll {
+   stickers?: readonly StickerResolvable[];
+   flags?:
+     | BitFieldResolvable<
+-        Extract<MessageFlagsString, 'SuppressEmbeds' | 'SuppressNotifications'>,
+-        MessageFlags.SuppressEmbeds | MessageFlags.SuppressNotifications
++        Extract<MessageFlagsString, 'SuppressEmbeds' | 'SuppressNotifications' | 'Ephemeral'>,
++        MessageFlags.SuppressEmbeds | MessageFlags.SuppressNotifications | MessageFlags.Ephemeral
+       >
+     | undefined;
+ }

semantic-release-config.js

@@ -11,55 +11,52 @@ const Options = {
             prerelease: true,
         },
     ],
-    plugins:
-        process.env['RELEASE_WORKFLOW_STEP'] !== 'publish'
-            ? [
-                  [
-                      '@semantic-release/commit-analyzer',
-                      {
-                          releaseRules: [{ type: 'build', scope: 'Needs bump', release: 'patch' }],
-                      },
-                  ],
-                  '@semantic-release/release-notes-generator',
-                  '@semantic-release/changelog',
-                  [
-                      '@semantic-release/npm',
-                      {
-                          npmPublish: false,
-                      },
-                  ],
-                  [
-                      '@semantic-release/git',
-                      {
-                          assets: ['CHANGELOG.md', 'package.json', '../../bun.lockb'],
-                      },
-                  ],
-                  [
-                      '@semantic-release/github',
-                      {
-                          assets: [
-                              {
-                                  path: 'dist/*',
-                              },
-                          ],
-                          successComment: false,
-                      },
-                  ],
-                  // This unfortunately has to run multiple times, even though it needs to run only once.
-                  [
-                      '@saithodev/semantic-release-backmerge',
-                      {
-                          backmergeBranches: [
-                              {
-                                  from: 'main',
-                                  to: 'dev',
-                              },
-                          ],
-                          clearWorkspace: true,
-                      },
-                  ],
-              ]
-            : [],
+    plugins: [
+        [
+            '@semantic-release/commit-analyzer',
+            {
+                releaseRules: [{ type: 'build', scope: 'Needs bump', release: 'patch' }],
+            },
+        ],
+        '@semantic-release/release-notes-generator',
+        '@semantic-release/changelog',
+        [
+            '@semantic-release/npm',
+            {
+                npmPublish: false,
+            },
+        ],
+        [
+            '@semantic-release/git',
+            {
+                assets: ['CHANGELOG.md', 'package.json', '../../bun.lockb'],
+            },
+        ],
+        [
+            '@semantic-release/github',
+            {
+                assets: [
+                    {
+                        path: 'dist/*',
+                    },
+                ],
+                successComment: false,
+            },
+        ],
+        // This unfortunately has to run multiple times, even though it needs to run only once.
+        [
+            '@saithodev/semantic-release-backmerge',
+            {
+                backmergeBranches: [
+                    {
+                        from: 'main',
+                        to: 'dev',
+                    },
+                ],
+                clearWorkspace: true,
+            },
+        ],
+    ],
 }
 
 /**
@@ -70,6 +67,6 @@ export default function defineSubprojectReleaseConfig(subprojectOptions) {
     return {
         ...Options,
         ...subprojectOptions,
-        plugins: [...(subprojectOptions.plugins || []), ...(Options.plugins || [])],
+        plugins: [...(Options.plugins || []), ...(subprojectOptions.plugins || [])],
     }
 }