refactor: update colours

Author: laquasicinque

.vscode/settings.json

@@ -5,6 +5,7 @@
   "references.preferredLocation": "view",
   "editor.suggest.maxVisibleSuggestions": 5,
   "editor.rulers": [80],
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.formatOnSave": true,
   "eslint.packageManager": "yarn",
   "search.exclude": {

src/v2/commands/warn/index.ts

@@ -119,7 +119,6 @@ function permutations<T>(items: T[][]) {
 }
 
 function comb(items: { name: string; value: string }[]) {
-  console.log(items);
   const names = [...pluckʹ(items, 'name')];
   const values = [...pluckʹ(items, 'value')];
 
@@ -130,7 +129,6 @@ function comb(items: { name: string; value: string }[]) {
 }
 
 function removeRepeated<T>(arr: Fuse.FuseResult<T>[][]) {
-  console.log(arr)
   return arr.filter(x => {
     const s = new Set(x.map(i=>i.refIndex))
     if(s.size !== x.length) {return false}

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

@@ -1,13 +1,8 @@
-import type {
-  EmbedField,
-  GuildMember,
-  GuildMemberRoleManager} from 'discord.js';
-import { MessageEmbed } from 'discord.js';
-
 import { closeCommand } from './close';
+import { initiateModmail } from './initiateModmail';
 import { reportMessage } from './reportMsg';
 import { reportUser } from './reportUser';
 import { sendCommand } from './send';
 
 
-export const commands = [sendCommand, reportMessage, reportUser, closeCommand           ];
+export const commands = [sendCommand, reportMessage, initiateModmail, reportUser, closeCommand           ];

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

@@ -0,0 +1,39 @@
+import type { GuildMember} from "discord.js";
+
+import type { CommandDataWithHandler } from "../../../../types";
+import { SERVER_ID, MOD_ROLE_ID } from "../../../env";
+import { createModMailThread } from "../util/createModMailThread";
+import { createReporteeEmbed, createInitialEmbed, createInitiatorEmbed } from "../util/embeds";
+
+
+export const initiateModmail: CommandDataWithHandler = {
+  type: 'USER',
+  name: 'Initiate Modmail',
+  guildValidate: guild => guild.id === SERVER_ID,
+  async handler(client, interaction) {
+    if (!interaction.isUserContextMenu()) {
+      return;
+    }
+
+    await interaction.deferReply({ ephemeral: true });
+
+    const thread = await createModMailThread(
+      interaction.guild,
+      interaction.targetUser
+    );
+
+    const initialMsg = await thread.send({
+      content: `<@&${MOD_ROLE_ID}>`,
+      embeds: [
+        createInitialEmbed(),
+        createInitiatorEmbed(interaction.member as GuildMember),
+        createReporteeEmbed(interaction.targetMember as GuildMember),
+      ],
+    });
+
+    await initialMsg.pin();
+    interaction.editReply({
+      content: `Created thread <#${thread.id}>`
+    })
+  },
+};

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

@@ -3,6 +3,7 @@ import { MessageActionRow, MessageButton, MessageEmbed } from "discord.js";
 import type { CommandDataWithHandler } from "../../../../types";
 import { SERVER_ID, MOD_ROLE_ID } from "../../../env";
 import { ModMailThread } from "../db/modmail_thread";
+import { COLOR_DELETED_MSG } from "../util/colors";
 
 export const sendCommand: CommandDataWithHandler = {
   type: 'CHAT_INPUT',
@@ -115,9 +116,9 @@ export const sendCommand: CommandDataWithHandler = {
           await message.delete()
           if("edit" in interaction.message) {
             interaction.message.edit({
-              content: `*The message below was deleted by <@${interaction.user.id}> at <t:${Date.now()/1000}>*`,
+              content: `*The message below was deleted by <@${interaction.user.id}> at <t:${Math.floor(Date.now()/1000)}>*`,
               embeds: [
-                interaction.message.embeds[0].setColor(0x90_00_00)
+                interaction.message.embeds[0].setColor(COLOR_DELETED_MSG)
               ],
               components: []
             })

src/v2/modules/modmail/util/colors.ts

@@ -0,0 +1,7 @@
+// colors are hex, the seperators stop color highlighting with extensions.
+/* eslint-disable unicorn/numeric-separators-style */
+export const COLOR_MOD = 0x42b883
+export const COLOR_REPORTER = 0x50a000
+export const COLOR_REPORTEE = 0xfcba03
+export const COLOR_USER_EMBED = 0x4287f5
+export const COLOR_DELETED_MSG = 0x900000

src/v2/modules/modmail/util/embeds.ts

@@ -1,6 +1,8 @@
 import type { EmbedField, GuildMember, GuildMemberRoleManager } from 'discord.js';
 import { MessageEmbed } from 'discord.js';
 
+import { COLOR_MOD, COLOR_REPORTEE, COLOR_REPORTER, COLOR_USER_EMBED } from './colors';
+
 
 export function createInitialEmbed(): MessageEmbed {
   return new MessageEmbed().setTitle('New Ticket')
@@ -24,21 +26,35 @@ export function createReporterEmbed(member: GuildMember): MessageEmbed {
   return new MessageEmbed()
     .setTitle('Reporter')
     .setDescription('Below is information regarding the reporter')
-    .setColor(5_283_840)
+    .setColor(COLOR_REPORTER)
     .setAuthor({
       name: `${member.user.username}#${member.user.discriminator}`,
       iconURL: member.user.avatarURL(),
     })
     .setThumbnail(member.user.avatarURL())
     .addFields(createUserFields(member));
 }
+export function createInitiatorEmbed(member: GuildMember) : MessageEmbed{
+  return new MessageEmbed()
+    .setTitle('Initiator')
+    .setDescription(
+      `This modmail was intiated by a ${member.user.toString()} at <t:${Date.now()/1000}>`
+    )
+    .setColor(COLOR_MOD)
+    .setAuthor({
+      name: `${member.user.username}#${member.user.discriminator}`,
+      iconURL: member.user.avatarURL(),
+    })
+    .setThumbnail(member.user.avatarURL())
+}
+
 export function createReporteeEmbed(member: GuildMember) : MessageEmbed{
   return new MessageEmbed()
     .setTitle('Reportee')
     .setDescription(
       'Below is information regarding the user that has been reported'
     )
-    .setColor(16_750_080)
+    .setColor(COLOR_REPORTEE)
     .setAuthor({
       name: `${member.user.username}#${member.user.discriminator}`,
       iconURL: member.user.avatarURL(),
@@ -53,7 +69,7 @@ export function createUserEmbed(member: GuildMember): MessageEmbed {
     .setDescription(
       'Information about the user'
     )
-    .setColor(16_750_080)
+    .setColor(COLOR_USER_EMBED)
     .setAuthor({
       name: `${member.user.username}#${member.user.discriminator}`,
       iconURL: member.user.avatarURL(),

src/v2/modules/modmail/util/getModMailThread.ts

@@ -8,7 +8,6 @@ export const getModMailThread = async (guild: Guild, user: User): Promise<Thread
   const cachedThread = cache.get(`${guild.id}|${user.id}`);
 
   if (cachedThread) {
-    console.log("Cached from",`${guild.id}|${user.id}`)
     return cachedThread;
   }