feat: private message command now works

Author: Nitrrine

src/commands/index.ts

@@ -7,6 +7,7 @@ import { githubCommand } from './github'
 import { pingCommand } from './ping'
 import { solvedCommand } from './solved'
 import { verifyCommand } from './verify'
+import { pmCommand } from '@/commands/pm'
 
 export const commands: AnyCommand[] = [
 	docsCommand,
@@ -16,6 +17,7 @@ export const commands: AnyCommand[] = [
 	verifyCommand,
 	resetCommand,
 	projectCommand,
+	pmCommand,
 ]
 
 export default commands

src/commands/pm.ts

@@ -1,29 +1,52 @@
 import { ChatInputCommand } from '@/types'
-import { ChatInputCommandInteraction, EmbedBuilder, SlashCommandBuilder } from 'discord.js'
+import {
+	ChatInputCommandInteraction,
+	EmbedBuilder,
+	GuildMemberRoleManager,
+	SlashCommandBuilder,
+} from 'discord.js'
+import process from 'node:process'
+import { PERMISSION_ERROR_TEXT } from '@/data'
+import { info } from '@/logging/logger'
 
 export const pmCommand: ChatInputCommand = {
 	data: new SlashCommandBuilder()
 		.setName('pm')
-		.setDescription('Send a private message.')
+		.setDescription('Send a private message')
 		.addStringOption((option) =>
 			option.setName('id').setDescription('Discord User ID').setRequired(true),
 		)
+		.addStringOption((option) =>
+			option.setName('reason').setDescription('Reason for sending a message').setRequired(true),
+		)
 		.addStringOption((option) =>
 			option.setName('message').setDescription('Private message').setRequired(true),
 		)
 		.addStringOption((option) =>
 			option.setName('title').setDescription('Embed title').setRequired(false),
 		) as SlashCommandBuilder,
 	meta: {
-		name: 'reset',
-		description: 'Reset user active role and message counter',
+		name: 'pm',
+		description: 'Send a private message',
 		category: 'moderation',
 		guildOnly: true,
 	},
 	execute: async (interaction: ChatInputCommandInteraction) => {
-		if (!interaction.guild) return
+		if (!interaction.guild || !interaction.member) return
+		if (
+			!(interaction.member.roles as GuildMemberRoleManager).cache.has(
+				process.env.DISCORD_MODERATOR_ROLE_ID!,
+			)
+		) {
+			await interaction.reply({
+				content: PERMISSION_ERROR_TEXT,
+				flags: 'Ephemeral',
+			})
+			return
+		}
 
 		const id = interaction.options.getString('id', true)
+		const reason = interaction.options.getString('reason', true)
 		const message = interaction.options.getString('message', true)
 		const title = interaction.options.getString('title', false)
 		const member = await interaction.guild.members.fetch(id)
@@ -34,5 +57,12 @@ export const pmCommand: ChatInputCommand = {
 			.setDescription(message)
 
 		await member.user.send({ embeds: [embed] })
+		await interaction.reply({
+			content: 'Private message has been successfully sent!',
+			flags: 'Ephemeral',
+		})
+		info(
+			`:incoming_envelope: Moderator (\`${interaction.user.username}\`, ID: ${interaction.user.id}) has sent a private message to a user ${member.user} (\`${member.user.username}\`, ID: ${member.user.id}), with a reason: ${reason}.`,
+		)
 	},
 }

src/commands/reset.ts

@@ -7,6 +7,8 @@ import { db } from '@/db'
 import { users } from '@/db/schema'
 import { ChatInputCommand } from '@/types'
 import { info } from '@/logging/logger'
+import content from '*?raw'
+import { PERMISSION_ERROR_TEXT } from '@/data'
 
 export const resetCommand: ChatInputCommand = {
 	data: new SlashCommandBuilder()
@@ -27,6 +29,13 @@ export const resetCommand: ChatInputCommand = {
 		const id = interaction.options.getString('id', true)
 		const member = await interaction.guild.members.fetch(id)
 
+		if (!member.roles.cache.has(process.env.DISCORD_MODERATOR_ROLE_ID!)) {
+			await interaction.reply({
+				content: PERMISSION_ERROR_TEXT,
+				flags: 'Ephemeral',
+			})
+			return
+		}
 		await db.update(users).set({ messagesSent: 0 }).where(eq(users.id, id))
 		await member.roles.remove(process.env.ACTIVE_ROLE_ID!)