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

# @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](dd8872c027))
* **bots/discord:** give only removed roles for role presets ([522ad28](522ad28fd8))
* **bots/discord:** replace duration parser with a library ([94c4fed](94c4fedc06))

bots/discord/CHANGELOG.md

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

bots/discord/package.json

@@ -2,7 +2,7 @@
   "name": "@revanced/discord-bot",
   "type": "module",
   "private": true,
-  "version": "1.0.0-dev.25",
+  "version": "1.0.0-dev.27",
   "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/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/stickyMessageReset.ts

@@ -7,12 +7,13 @@ 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 (!timerPreviouslyActive) 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`)

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

@@ -32,7 +32,7 @@
     "@anolilab/multi-semantic-release": "^1.1.3",
     "@biomejs/biome": "^1.8.3",
     "@codedependant/semantic-release-docker": "^5.0.3",
-    "@commitlint/cli": "^19.3.0",
+    "@commitlint/cli": "^19.4.0",
     "@commitlint/config-conventional": "^19.2.2",
     "@saithodev/semantic-release-backmerge": "^4.0.1",
     "@semantic-release/changelog": "^6.0.3",
@@ -41,10 +41,10 @@
     "@tsconfig/strictest": "^2.0.5",
     "@types/bun": "^1.1.6",
     "conventional-changelog-conventionalcommits": "^7.0.2",
-    "lefthook": "^1.7.5",
+    "lefthook": "^1.7.14",
     "portainer-service-webhook": "https://github.com/newarifrh/portainer-service-webhook#v1",
-    "semantic-release": "^24.0.0",
-    "turbo": "^2.0.9",
+    "semantic-release": "^24.1.0",
+    "turbo": "^2.0.14",
     "typescript": "^5.5.4"
   },
   "trustedDependencies": [