fix(bots/discord): give only removed roles for role presets

bots/discord/package.json

@@ -33,14 +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",
     "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/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/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)),
+    }
 }