add /add-regular-member-role and /revoke-regular-member-role for moderators (#87)

Signed-off-by: GitHub <[email protected]>

Author: joulev

apps/bot/commands/context/mark-answer.ts

@@ -16,7 +16,7 @@ import {
 } from '../../utils.js'
 import { markMessageAsSolution } from '../../db/actions/messages.js'
 import { env } from '../../env.js'
-import { tryToAssignRegularMemberRole } from '../../lib/points.js'
+import { tryToSetRegularMemberRole } from '../../lib/points.js'
 
 export const command: ContextMenuCommand = {
   data: new ContextMenuCommandBuilder()
@@ -108,7 +108,7 @@ export const command: ContextMenuCommand = {
       interaction.targetMessage.author.id,
     )
     if (targetMember) {
-      await tryToAssignRegularMemberRole(interactionMember)
+      await tryToSetRegularMemberRole(interactionMember)
     }
 
     const answeredTagId = mainChannel.availableTags.find((t) =>

apps/bot/commands/slash/give-points.ts renamed to apps/bot/commands/slash/add-regular-member-role.ts

@@ -1,30 +1,23 @@
 import { PermissionFlagsBits, SlashCommandBuilder } from 'discord.js'
 import { SlashCommand } from '../types.js'
-import { addDirectPointsToUser, syncUser } from '../../db/actions/users.js'
-import { tryToAssignRegularMemberRole } from '../../lib/points.js'
+import { addFullPointsToUser, syncUser } from '../../db/actions/users.js'
+import { tryToSetRegularMemberRole } from '../../lib/points.js'
 
 export const command: SlashCommand = {
   data: new SlashCommandBuilder()
-    .setName('give-points')
-    .setDescription('Gives a specific amount of points to the target user')
+    .setName('add-regular-member-role')
+    .setDescription('Add the Regular Member role to the target user')
     .setDMPermission(false)
     .addUserOption((option) =>
       option
         .setName('user')
-        .setDescription('The user to receive the points')
-        .setRequired(true),
-    )
-    .addIntegerOption((option) =>
-      option
-        .setName('points')
-        .setDescription('The amount of point to give')
+        .setDescription('The user to receive the role')
         .setRequired(true),
     )
     .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers),
 
   async execute(interaction) {
     const user = interaction.options.getUser('user', true)
-    const points = interaction.options.getInteger('points', true)
 
     const guildMember = await interaction.guild?.members.fetch(user.id)
 
@@ -39,8 +32,8 @@ export const command: SlashCommand = {
     await interaction.deferReply({ ephemeral: true })
 
     await syncUser(user, guildMember)
-    await addDirectPointsToUser(user.id, points)
-    await tryToAssignRegularMemberRole(guildMember, true)
+    await addFullPointsToUser(user.id)
+    await tryToSetRegularMemberRole(guildMember, true)
 
     await interaction.editReply({ content: 'Done!' })
   },

apps/bot/commands/slash/index.ts

@@ -2,14 +2,16 @@ import * as refreshAnswerCount from './refresh-answer-count.js'
 import * as refreshLastActive from './refresh-last-active.js'
 import * as lockLowEffortPost from './lock-low-effort-post.js'
 import * as removePostAnswer from './remove-post-answer.js'
-import * as givePoints from './give-points.js'
+import * as addRegularMemberRole from './add-regular-member-role.js'
+import * as revokeRegularMemberRole from './revoke-regular-member-role.js'
 import * as getAnswerCount from './get-answer-count.js'
 
 export const slashCommands = [
   refreshAnswerCount.command,
   refreshLastActive.command,
   lockLowEffortPost.command,
   removePostAnswer.command,
-  givePoints.command,
+  addRegularMemberRole.command,
+  revokeRegularMemberRole.command,
   getAnswerCount.command,
 ]

apps/bot/commands/slash/revoke-regular-member-role.ts

@@ -0,0 +1,40 @@
+import { PermissionFlagsBits, SlashCommandBuilder } from 'discord.js'
+import { SlashCommand } from '../types.js'
+import { removeFullPointsFromUser, syncUser } from '../../db/actions/users.js'
+import { tryToSetRegularMemberRole } from '../../lib/points.js'
+
+export const command: SlashCommand = {
+  data: new SlashCommandBuilder()
+    .setName('revoke-regular-member-role')
+    .setDescription('Remove the Regular Member role from the target user')
+    .setDMPermission(false)
+    .addUserOption((option) =>
+      option
+        .setName('user')
+        .setDescription('The user to be stripped of the role')
+        .setRequired(true),
+    )
+    .setDefaultMemberPermissions(PermissionFlagsBits.ModerateMembers),
+
+  async execute(interaction) {
+    const user = interaction.options.getUser('user', true)
+
+    const guildMember = await interaction.guild?.members.fetch(user.id)
+
+    if (!guildMember) {
+      await interaction.reply({
+        content: "I couldn't find the guild member from this user",
+        ephemeral: true,
+      })
+      return
+    }
+
+    await interaction.deferReply({ ephemeral: true })
+
+    await syncUser(user, guildMember)
+    await removeFullPointsFromUser(user.id)
+    await tryToSetRegularMemberRole(guildMember, true)
+
+    await interaction.editReply({ content: 'Done!' })
+  },
+}

apps/bot/db/actions/messages.ts

@@ -3,7 +3,7 @@ import { db, sql } from '@nextjs-forum/db/node'
 import { addPointsToUser, removePointsFromUser, syncUser } from './users.js'
 import { syncChannel, syncMessageChannel } from './channels.js'
 import { updatePostLastActive } from './posts.js'
-import { tryToAssignRegularMemberRole } from '../../lib/points.js'
+import { tryToSetRegularMemberRole } from '../../lib/points.js'
 
 export const syncMessage = async (message: Message) => {
   const authorAsGuildMember = await message.guild?.members.fetch(
@@ -66,7 +66,7 @@ export const syncMessage = async (message: Message) => {
   })
 
   if (authorAsGuildMember) {
-    await tryToAssignRegularMemberRole(authorAsGuildMember)
+    await tryToSetRegularMemberRole(authorAsGuildMember)
   }
 }
 

apps/bot/db/actions/users.ts

@@ -4,7 +4,7 @@ import { KyselyDB, TransactionDB, db, sql } from '@nextjs-forum/db/node'
 import { AnimalModule, Faker, en } from '@faker-js/faker'
 import { type CacheUser, usersCache } from '../../lib/cache.js'
 import { env } from '../../env.js'
-import { POINTS_REWARDS } from '../../lib/points.js'
+import { POINTS_REWARDS, REQUIRED_POINTS_FOR_ROLE } from '../../lib/points.js'
 
 const log = baseLog.extend('users')
 
@@ -130,24 +130,40 @@ const updatePointsBySum = async (
     .execute()
 }
 
+const updatePointsBySet = async (
+  userId: string,
+  value: number,
+  trx: TransactionDB | KyselyDB = db,
+) => {
+  await trx
+    .updateTable('users')
+    .where('snowflakeId', '=', userId)
+    .set({ points: sql`LEAST(999999, ${value})` })
+    .execute()
+}
+
 export const addPointsToUser = async (
   userId: string,
   type: keyof typeof POINTS_REWARDS,
   trx: TransactionDB | KyselyDB = db,
 ) => updatePointsBySum(userId, POINTS_REWARDS[type], trx)
 
-export const addDirectPointsToUser = async (
+export const addFullPointsToUser = async (
   userId: string,
-  value: number,
   trx: TransactionDB | KyselyDB = db,
-) => updatePointsBySum(userId, value, trx)
+) => updatePointsBySet(userId, REQUIRED_POINTS_FOR_ROLE, trx)
 
 export const removePointsFromUser = async (
   userId: string,
   type: keyof typeof POINTS_REWARDS,
   trx: TransactionDB | KyselyDB = db,
 ) => updatePointsBySum(userId, -POINTS_REWARDS[type], trx)
 
+export const removeFullPointsFromUser = async (
+  userId: string,
+  trx: TransactionDB | KyselyDB = db,
+) => updatePointsBySet(userId, 0, trx)
+
 export const getCorrectAnswersCount = (userId: string) => {
   return db
     .selectFrom('users')

apps/bot/lib/points.ts

@@ -8,13 +8,13 @@ export const POINTS_REWARDS = {
   question: 20,
   answer: 50,
 } as const
+export const REQUIRED_POINTS_FOR_ROLE = 1000
 
-const REQUIRED_POINTS_FOR_ROLE = 1000
 const USER_ROLE_SYNC_INTERVAL = 1000 * 60 * 60 // 1 hour
 
 const lastUserSync = new LRUCache<string, number>({ max: 100 })
 
-export const tryToAssignRegularMemberRole = async (
+export const tryToSetRegularMemberRole = async (
   member: GuildMember,
   skipCache: boolean = false,
 ) => {
@@ -30,11 +30,23 @@ export const tryToAssignRegularMemberRole = async (
   }
 
   lastUserSync.set(member.id, Date.now())
-  if (member.roles.cache.has(env.REGULAR_MEMBER_ROLE_ID)) return
 
   const user = await getUserById(member.id)
-  if (!user || user.points < REQUIRED_POINTS_FOR_ROLE) return
+  if (!user) return
 
+  const userPointsSatisfyRole = user.points >= REQUIRED_POINTS_FOR_ROLE
+  const memberHasRole = member.roles.cache.has(env.REGULAR_MEMBER_ROLE_ID)
+
+  if (memberHasRole && userPointsSatisfyRole) return
+  if (!memberHasRole && !userPointsSatisfyRole) return
+
+  if (memberHasRole && !userPointsSatisfyRole) {
+    await member.roles.remove(env.REGULAR_MEMBER_ROLE_ID)
+    // We don't need to alert the user about this.
+    return
+  }
+
+  // Now, it is !memberHasRole && userPointsSatisfyRole
   await member.roles.add(env.REGULAR_MEMBER_ROLE_ID)
   await member.send({
     embeds: [