✨ initial basic modmail features

Author: laquasicinque

src/v2/cache/cacheFns.ts

@@ -33,8 +33,9 @@ export async function upsert(options: CacheUpsertOptions) {
   const { guild, type, user, meta } = options;
 
   // Cannot use destructuring due to the properties being optional and TS not liking it
-  // eslint-disable-next-line unicorn/consistent-destructuring
-  const expireTime = "expiresAt" in options ? options.expiresAt : Date.now() + options.expiresIn;
+   
+  const expireTime =
+    'expiresAt' in options ? options.expiresAt : Date.now() + options.expiresIn;
 
   const result = await GenericCache.findOneAndUpdate(
     {
@@ -62,3 +63,19 @@ async function _purge() {
     timestamp: { $lt: Date.now() },
   });
 }
+
+export async function purgeType({
+  guild,
+  type,
+}: {
+  guild: string;
+  type: string;
+}) {
+  await Promise.all([
+    _purge(),
+    GenericCache.deleteMany({
+      type,
+      guild,
+    }),
+  ]);
+}

src/v2/commands/index.ts

@@ -125,10 +125,17 @@ export const registerCommands = async (client: Client): Promise<void> => {
         }
       } catch (error) {
         console.error(error);
-        await interaction.reply({
-          ephemeral: true,
-          content: 'Something went wrong when trying to execute the command',
-        });
+
+        if (interaction.deferred) {
+          await interaction.editReply({
+            content: 'Something went wrong when trying to execute the command',
+          });
+        } else {
+          await interaction.reply({
+            ephemeral: true,
+            content: 'Something went wrong when trying to execute the command',
+          });
+        }
       }
     })
   );

src/v2/commands/post/index.ts

@@ -22,6 +22,7 @@ import { cache } from '../../spam_filter/index.js';
 import { MultistepForm } from '../../utils/MultistepForm.js';
 import { asyncCatch } from '../../utils/asyncCatch.js';
 import { createEmbed, createMarkdownCodeBlock } from '../../utils/discordTools.js';
+import { lock, unlock } from '../../utils/dmLock';
 import { map } from '../../utils/map.js';
 import { pipe } from '../../utils/pipe.js';
 import { capitalize } from '../../utils/string.js';
@@ -278,12 +279,12 @@ const handleJobPostingRequest = async (
 ): Promise<void> => {
   const { guild, member } = interaction;
   const { user: author } = interaction;
-  const { username, discriminator, id } = author;
+  const { username, discriminator, id: userID } = author;
 
-  const filter: CollectorFilter<[Message]> = m => m.author.id === id;
+  const filter: CollectorFilter<[Message]> = m => m.author.id === userID;
   const send = (str: string) => author.send(str);
   // Generate cache entry
-  const entry = generateCacheEntry(id);
+  const entry = generateCacheEntry(userID);
 
   try {
     // Check if the user has been cached
@@ -312,10 +313,10 @@ const handleJobPostingRequest = async (
 
     // Notify the user regarding the rules, and get the channel
     const channel = await author.createDM();
-
     const form = new MultistepForm(questions, channel, author);
-
+    lock(guild.id, userID, 'JOB_POST_FORM')
     const answers = (await form.getResult('guidelines')) as unknown as Answers;
+    unlock(guild.id, userID, 'JOB_POST_FORM')
 
     console.log(answers)
     // Just return if the iteration breaks due to invalid input
@@ -326,7 +327,7 @@ const handleJobPostingRequest = async (
 
     const url = await createJobPost(answers, guild, {
       discriminator,
-      userID: id,
+      userID,
       username,
     });
 

src/v2/index.ts

@@ -32,8 +32,8 @@ import pointDecaySystem, { loadLastDecayFromDB } from './helpful_role/point_deca
 import { registerMessageContextMenu } from './message_context/index.js';
 import { handleDM } from './modules/modmail/index.js';
 import { registerUserContextMenu } from './user_context/index.js';
-import { asyncCatch } from './utils/asyncCatch.js';
 import { stripMarkdownQuote } from './utils/content_format.js';
+import { purge as purgeDMLocks } from './utils/dmLock.js';
 
 const NON_COMMAND_MSG_TYPES = new Set([
   'GUILD_TEXT',
@@ -84,6 +84,7 @@ client.on('ready', () => {
 });
 
 client.once('ready', async (): Promise<void> => {
+purgeDMLocks(SERVER_ID)
   pointDecaySystem({
     guild: client.guilds.resolve(SERVER_ID)
   })
@@ -141,10 +142,11 @@ const isWebdevAndWebDesignServer = (msg: Message) =>
   msg.guild?.id === SERVER_ID || false;
 
 
-client.on('messageCreate', msg => {
+client.on('messageCreate', async msg => {
   if (msg.author.bot) {
     return;
   }
+
   if(msg.channel.type === 'DM') {
     return handleDM(msg)
   }

src/v2/modules/modmail/commands/close.ts

@@ -0,0 +1,69 @@
+import type { ThreadChannel } from "discord.js";
+
+import type { CommandDataWithHandler } from "../../../../types";
+import { SERVER_ID, MOD_ROLE_ID } from "../../../env";
+import { ModMailThread } from "../db/modmail_thread";
+import { cache } from "../util/cache";
+
+export const closeCommand: CommandDataWithHandler = {
+  type: "CHAT_INPUT",
+  description: 'Close a modmail thread',
+  name: "close",
+  options: [
+    {
+      name: 'reason',
+      description: "Reason or note regarding the closing of the modmail thread",
+      type: "STRING"
+    }
+  ],
+  guildValidate: guild => guild.id === SERVER_ID,
+  defaultPermission: false,
+  async managePermissions(guild, permissions) {
+    await permissions.add({
+      guild,
+      permissions: [
+        {
+          id: MOD_ROLE_ID,
+          type: 'ROLE',
+          permission: true,
+        },
+      ],
+    });
+  },
+  async handler(client, interaction) {
+    const [modmailThread] = await Promise.all([
+      ModMailThread.findOne({ threadId: interaction.channel.id }),
+      interaction.deferReply(),
+    ]);
+
+    if(!modmailThread) {
+      interaction.editReply({ content: "Could not find modmail thread" })
+      throw new Error("Could not find modmail thread")
+    }
+
+    if(modmailThread.closedAt) {
+      interaction.editReply({ content: "This modmail thread is already closed" })
+      return
+    }
+
+    const thread = interaction.channel as ThreadChannel
+
+    await thread.setName(`✅ ${thread.name.replace(/^✅ /u, '')}`);
+
+    await thread.setArchived(true);
+
+    cache.del(`${modmailThread.guildId}|${modmailThread.userId}`);
+    cache.del(modmailThread.threadId);
+
+    await modmailThread.updateOne({
+      closedAt: Date.now()
+    }).exec();
+
+
+    const reason = interaction.options.get('reason')?.value as string
+
+    interaction.editReply({
+      content: ["Modmail Thread Closed.", reason? `Note/Reason: ${reason}` : null].filter(Boolean).join('\n'),
+    })
+  }
+}