Added Discord attachment link reaction, fixed emoji configuration and moved util functions

backend/src/plugins/ModActions/commands/addcase/AddCaseMsgCmd.ts

@@ -1,7 +1,8 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
 import { CaseTypes } from "../../../../data/CaseTypes";
-import { hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { hasPermission } from "../../../../pluginUtils";
 import { resolveUser } from "../../../../utils";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualAddCaseCmd } from "../../functions/actualCommands/actualAddCaseCmd";
 import { modActionsMsgCmd } from "../../types";
 
@@ -27,7 +28,7 @@ export const AddCaseMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
@@ -35,7 +36,7 @@ export const AddCaseMsgCmd = modActionsMsgCmd({
     let mod = msg.member;
     if (args.mod) {
       if (!(await hasPermission(pluginData, "can_act_as_other", { message: msg }))) {
-        sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "You don't have permission to use -mod");
         return;
       }
 
@@ -45,13 +46,13 @@ export const AddCaseMsgCmd = modActionsMsgCmd({
     // Verify the case type is valid
     const type: string = args.type[0].toUpperCase() + args.type.slice(1).toLowerCase();
     if (!CaseTypes[type]) {
-      sendErrorMessage(pluginData, msg.channel, "Cannot add case: invalid case type");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cannot add case: invalid case type");
       return;
     }
 
     actualAddCaseCmd(
       pluginData,
-      msg.channel,
+      msg,
       msg.member,
       mod,
       [...msg.attachments.values()],

backend/src/plugins/ModActions/commands/addcase/AddCaseSlashCmd.ts

@@ -1,7 +1,8 @@
 import { slashOptions } from "knub";
 import { CaseTypes } from "../../../../data/CaseTypes";
-import { hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { hasPermission } from "../../../../pluginUtils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualAddCaseCmd } from "../../functions/actualCommands/actualAddCaseCmd";
 import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
 
@@ -44,7 +45,9 @@ export const AddCaseSlashCmd = {
 
     if (options.mod) {
       if (!canActAsOther) {
-        sendErrorMessage(pluginData, interaction, "You don't have permission to act as another moderator");
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, "You don't have permission to act as another moderator");
         return;
       }
 

backend/src/plugins/ModActions/commands/ban/BanMsgCmd.ts

@@ -1,6 +1,7 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { hasPermission } from "../../../../pluginUtils";
 import { UserNotificationMethod, resolveUser } from "../../../../utils";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualBanCmd } from "../../functions/actualCommands/actualBanCmd";
 import { readContactMethodsFromArgs } from "../../functions/readContactMethodsFromArgs";
 import { modActionsMsgCmd } from "../../types";
@@ -37,7 +38,7 @@ export const BanMsgCmd = modActionsMsgCmd({
     const user = await resolveUser(pluginData.client, args.user);
 
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
@@ -45,7 +46,7 @@ export const BanMsgCmd = modActionsMsgCmd({
     let mod = msg.member;
     if (args.mod) {
       if (!(await hasPermission(pluginData, "can_act_as_other", { message: msg }))) {
-        sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "You don't have permission to use -mod");
         return;
       }
 
@@ -56,13 +57,13 @@ export const BanMsgCmd = modActionsMsgCmd({
     try {
       contactMethods = readContactMethodsFromArgs(args) ?? undefined;
     } catch (e) {
-      sendErrorMessage(pluginData, msg.channel, e.message);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, e.message);
       return;
     }
 
     actualBanCmd(
       pluginData,
-      msg.channel,
+      msg,
       user,
       args["time"] ? args["time"] : null,
       args.reason || "",

backend/src/plugins/ModActions/commands/ban/BanSlashCmd.ts

@@ -1,8 +1,9 @@
 import { ChannelType } from "discord.js";
 import { slashOptions } from "knub";
-import { hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { hasPermission } from "../../../../pluginUtils";
 import { UserNotificationMethod, convertDelayStringToMS } from "../../../../utils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualBanCmd } from "../../functions/actualCommands/actualBanCmd";
 import { readContactMethodsFromArgs } from "../../functions/readContactMethodsFromArgs";
 import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
@@ -49,7 +50,9 @@ export const BanSlashCmd = {
     const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
 
     if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
-      sendErrorMessage(pluginData, interaction, "Text or attachment required", undefined, undefined, true);
+      pluginData
+        .getPlugin(CommonPlugin)
+        .sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
 
       return;
     }
@@ -62,7 +65,9 @@ export const BanSlashCmd = {
 
     if (options.mod) {
       if (!canActAsOther) {
-        sendErrorMessage(pluginData, interaction, "You don't have permission to act as another moderator");
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, "You don't have permission to act as another moderator");
         return;
       }
 
@@ -73,13 +78,13 @@ export const BanSlashCmd = {
     try {
       contactMethods = readContactMethodsFromArgs(options) ?? undefined;
     } catch (e) {
-      sendErrorMessage(pluginData, interaction, e.message);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, e.message);
       return;
     }
 
     const convertedTime = options.time ? convertDelayStringToMS(options.time) : null;
     if (options.time && !convertedTime) {
-      sendErrorMessage(pluginData, interaction, `Could not convert ${options.time} to a delay`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, `Could not convert ${options.time} to a delay`);
       return;
     }
 

backend/src/plugins/ModActions/commands/case/CaseMsgCmd.ts

@@ -14,6 +14,6 @@ export const CaseMsgCmd = modActionsMsgCmd({
   ],
 
   async run({ pluginData, message: msg, args }) {
-    actualCaseCmd(pluginData, msg.channel, msg.author.id, args.caseNumber);
+    actualCaseCmd(pluginData, msg, msg.author.id, args.caseNumber);
   },
 });

backend/src/plugins/ModActions/commands/cases/CasesModMsgCmd.ts

@@ -29,7 +29,7 @@ export const CasesModMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     return actualCasesCmd(
       pluginData,
-      msg.channel,
+      msg,
       args.mod,
       null,
       msg.author,

backend/src/plugins/ModActions/commands/cases/CasesUserMsgCmd.ts

@@ -1,6 +1,6 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { sendErrorMessage } from "../../../../pluginUtils";
 import { resolveUser } from "../../../../utils";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualCasesCmd } from "../../functions/actualCommands/actualCasesCmd";
 import { modActionsMsgCmd } from "../../types";
 
@@ -33,13 +33,13 @@ export const CasesUserMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
     return actualCasesCmd(
       pluginData,
-      msg.channel,
+      msg,
       args.mod,
       user,
       msg.author,

backend/src/plugins/ModActions/commands/deletecase/DeleteCaseMsgCmd.ts

@@ -18,6 +18,6 @@ export const DeleteCaseMsgCmd = modActionsMsgCmd({
   },
 
   async run({ pluginData, message, args }) {
-    actualDeleteCaseCmd(pluginData, message.channel, message.member, args.caseNumber, args.force);
+    actualDeleteCaseCmd(pluginData, message, message.member, args.caseNumber, args.force);
   },
 });

backend/src/plugins/ModActions/commands/forceban/ForceBanMsgCmd.ts

@@ -1,6 +1,7 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { canActOn, hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { canActOn, hasPermission } from "../../../../pluginUtils";
 import { resolveMember, resolveUser } from "../../../../utils";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualForceBanCmd } from "../../functions/actualCommands/actualForceBanCmd";
 import { isBanned } from "../../functions/isBanned";
 import { modActionsMsgCmd } from "../../types";
@@ -26,21 +27,21 @@ export const ForceBanMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
     // If the user exists as a guild member, make sure we can act on them first
     const member = await resolveMember(pluginData.client, pluginData.guild, user.id);
     if (member && !canActOn(pluginData, msg.member, member)) {
-      sendErrorMessage(pluginData, msg.channel, "Cannot forceban this user: insufficient permissions");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cannot forceban this user: insufficient permissions");
       return;
     }
 
     // Make sure the user isn't already banned
     const banned = await isBanned(pluginData, user.id);
     if (banned) {
-      sendErrorMessage(pluginData, msg.channel, `User is already banned`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User is already banned`);
       return;
     }
 
@@ -48,13 +49,13 @@ export const ForceBanMsgCmd = modActionsMsgCmd({
     let mod = msg.member;
     if (args.mod) {
       if (!(await hasPermission(pluginData, "can_act_as_other", { message: msg }))) {
-        sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "You don't have permission to use -mod");
         return;
       }
 
       mod = args.mod;
     }
 
-    actualForceBanCmd(pluginData, msg.channel, msg.author.id, user, args.reason, [...msg.attachments.values()], mod);
+    actualForceBanCmd(pluginData, msg, msg.author.id, user, args.reason, [...msg.attachments.values()], mod);
   },
 });

backend/src/plugins/ModActions/commands/forceban/ForceBanSlashCmd.ts

@@ -1,7 +1,8 @@
 import { slashOptions } from "knub";
-import { hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { hasPermission } from "../../../../pluginUtils";
 import { convertDelayStringToMS } from "../../../../utils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualForceBanCmd } from "../../functions/actualCommands/actualForceBanCmd";
 import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
 
@@ -26,7 +27,9 @@ export const ForceBanSlashCmd = {
     const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
 
     if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
-      sendErrorMessage(pluginData, interaction, "Text or attachment required", undefined, undefined, true);
+      pluginData
+        .getPlugin(CommonPlugin)
+        .sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
 
       return;
     }
@@ -39,7 +42,9 @@ export const ForceBanSlashCmd = {
 
     if (options.mod) {
       if (!canActAsOther) {
-        sendErrorMessage(pluginData, interaction, "You don't have permission to act as another moderator");
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, "You don't have permission to act as another moderator");
         return;
       }
 
@@ -48,7 +53,7 @@ export const ForceBanSlashCmd = {
 
     const convertedTime = options.time ? convertDelayStringToMS(options.time) : null;
     if (options.time && !convertedTime) {
-      sendErrorMessage(pluginData, interaction, `Could not convert ${options.time} to a delay`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, `Could not convert ${options.time} to a delay`);
       return;
     }
 

backend/src/plugins/ModActions/commands/forcemute/ForceMuteMsgCmd.ts

@@ -1,6 +1,7 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { canActOn, hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { canActOn, hasPermission } from "../../../../pluginUtils";
 import { resolveMember, resolveUser } from "../../../../utils";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualMuteCmd } from "../../functions/actualCommands/actualMuteCmd";
 import { readContactMethodsFromArgs } from "../../functions/readContactMethodsFromArgs";
 import { modActionsMsgCmd } from "../../types";
@@ -35,7 +36,7 @@ export const ForceMuteMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
@@ -43,7 +44,7 @@ export const ForceMuteMsgCmd = modActionsMsgCmd({
 
     // Make sure we're allowed to mute this user
     if (memberToMute && !canActOn(pluginData, msg.member, memberToMute)) {
-      sendErrorMessage(pluginData, msg.channel, "Cannot mute: insufficient permissions");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cannot mute: insufficient permissions");
       return;
     }
 
@@ -53,7 +54,7 @@ export const ForceMuteMsgCmd = modActionsMsgCmd({
 
     if (args.mod) {
       if (!(await hasPermission(pluginData, "can_act_as_other", { message: msg }))) {
-        sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "You don't have permission to use -mod");
         return;
       }
 
@@ -65,13 +66,13 @@ export const ForceMuteMsgCmd = modActionsMsgCmd({
     try {
       contactMethods = readContactMethodsFromArgs(args);
     } catch (e) {
-      sendErrorMessage(pluginData, msg.channel, e.message);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, e.message);
       return;
     }
 
     actualMuteCmd(
       pluginData,
-      msg.channel,
+      msg,
       user,
       [...msg.attachments.values()],
       mod,

backend/src/plugins/ModActions/commands/forcemute/ForceMuteSlashCmd.ts

@@ -1,8 +1,9 @@
 import { ChannelType } from "discord.js";
 import { slashOptions } from "knub";
-import { hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { hasPermission } from "../../../../pluginUtils";
 import { UserNotificationMethod, convertDelayStringToMS } from "../../../../utils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualMuteCmd } from "../../functions/actualCommands/actualMuteCmd";
 import { readContactMethodsFromArgs } from "../../functions/readContactMethodsFromArgs";
 import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
@@ -44,7 +45,9 @@ export const ForceMuteSlashCmd = {
     const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
 
     if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
-      sendErrorMessage(pluginData, interaction, "Text or attachment required", undefined, undefined, true);
+      pluginData
+        .getPlugin(CommonPlugin)
+        .sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
 
       return;
     }
@@ -58,7 +61,9 @@ export const ForceMuteSlashCmd = {
 
     if (options.mod) {
       if (!canActAsOther) {
-        sendErrorMessage(pluginData, interaction, "You don't have permission to act as another moderator");
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, "You don't have permission to act as another moderator");
         return;
       }
 
@@ -68,7 +73,7 @@ export const ForceMuteSlashCmd = {
 
     const convertedTime = options.time ? convertDelayStringToMS(options.time) : null;
     if (options.time && !convertedTime) {
-      sendErrorMessage(pluginData, interaction, `Could not convert ${options.time} to a delay`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, `Could not convert ${options.time} to a delay`);
       return;
     }
 
@@ -76,7 +81,7 @@ export const ForceMuteSlashCmd = {
     try {
       contactMethods = readContactMethodsFromArgs(options) ?? undefined;
     } catch (e) {
-      sendErrorMessage(pluginData, interaction, e.message);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, e.message);
       return;
     }
 

backend/src/plugins/ModActions/commands/forceunmute/ForceUnmuteMsgCmd.ts

@@ -1,6 +1,7 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { canActOn, hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { canActOn, hasPermission } from "../../../../pluginUtils";
 import { resolveMember, resolveUser } from "../../../../utils";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualUnmuteCmd } from "../../functions/actualCommands/actualUnmuteCmd";
 import { modActionsMsgCmd } from "../../types";
 
@@ -32,13 +33,13 @@ export const ForceUnmuteMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
     // Check if they're muted in the first place
     if (!(await pluginData.state.mutes.isMuted(user.id))) {
-      sendErrorMessage(pluginData, msg.channel, "Cannot unmute: member is not muted");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cannot unmute: member is not muted");
       return;
     }
 
@@ -47,7 +48,7 @@ export const ForceUnmuteMsgCmd = modActionsMsgCmd({
 
     // Make sure we're allowed to unmute this member
     if (memberToUnmute && !canActOn(pluginData, msg.member, memberToUnmute)) {
-      sendErrorMessage(pluginData, msg.channel, "Cannot unmute: insufficient permissions");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cannot unmute: insufficient permissions");
       return;
     }
 
@@ -57,7 +58,7 @@ export const ForceUnmuteMsgCmd = modActionsMsgCmd({
 
     if (args.mod) {
       if (!(await hasPermission(pluginData, "can_act_as_other", { message: msg }))) {
-        sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "You don't have permission to use -mod");
         return;
       }
 
@@ -67,7 +68,7 @@ export const ForceUnmuteMsgCmd = modActionsMsgCmd({
 
     actualUnmuteCmd(
       pluginData,
-      msg.channel,
+      msg,
       user,
       [...msg.attachments.values()],
       mod,

backend/src/plugins/ModActions/commands/forceunmute/ForceUnmuteSlashCmd.ts

@@ -1,7 +1,8 @@
 import { slashOptions } from "knub";
-import { hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { hasPermission } from "../../../../pluginUtils";
 import { convertDelayStringToMS } from "../../../../utils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualUnmuteCmd } from "../../functions/actualCommands/actualUnmuteCmd";
 import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
 
@@ -27,7 +28,9 @@ export const ForceUnmuteSlashCmd = {
     const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
 
     if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
-      sendErrorMessage(pluginData, interaction, "Text or attachment required", undefined, undefined, true);
+      pluginData
+        .getPlugin(CommonPlugin)
+        .sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
 
       return;
     }
@@ -41,7 +44,9 @@ export const ForceUnmuteSlashCmd = {
 
     if (options.mod) {
       if (!canActAsOther) {
-        sendErrorMessage(pluginData, interaction, "You don't have permission to act as another moderator");
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, "You don't have permission to act as another moderator");
         return;
       }
 
@@ -51,7 +56,7 @@ export const ForceUnmuteSlashCmd = {
 
     const convertedTime = options.time ? convertDelayStringToMS(options.time) : null;
     if (options.time && !convertedTime) {
-      sendErrorMessage(pluginData, interaction, `Could not convert ${options.time} to a delay`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, `Could not convert ${options.time} to a delay`);
       return;
     }
 

backend/src/plugins/ModActions/commands/hidecase/HideCaseMsgCmd.ts

@@ -14,6 +14,6 @@ export const HideCaseMsgCmd = modActionsMsgCmd({
   ],
 
   async run({ pluginData, message: msg, args }) {
-    actualHideCaseCmd(pluginData, msg.channel, args.caseNum);
+    actualHideCaseCmd(pluginData, msg, args.caseNum);
   },
 });

backend/src/plugins/ModActions/commands/kick/KickMsgCmd.ts

@@ -1,7 +1,7 @@
 import { hasPermission } from "knub/helpers";
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { sendErrorMessage } from "../../../../pluginUtils";
 import { resolveUser } from "../../../../utils";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualKickCmd } from "../../functions/actualCommands/actualKickCmd";
 import { readContactMethodsFromArgs } from "../../functions/readContactMethodsFromArgs";
 import { modActionsMsgCmd } from "../../types";
@@ -30,7 +30,7 @@ export const KickMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
@@ -38,7 +38,7 @@ export const KickMsgCmd = modActionsMsgCmd({
     let mod = msg.member;
     if (args.mod) {
       if (!(await hasPermission(await pluginData.config.getForMessage(msg), "can_act_as_other"))) {
-        sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "You don't have permission to use -mod");
         return;
       }
 
@@ -49,13 +49,13 @@ export const KickMsgCmd = modActionsMsgCmd({
     try {
       contactMethods = readContactMethodsFromArgs(args);
     } catch (e) {
-      sendErrorMessage(pluginData, msg.channel, e.message);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, e.message);
       return;
     }
 
     actualKickCmd(
       pluginData,
-      msg.channel,
+      msg,
       msg.member,
       user,
       args.reason,

backend/src/plugins/ModActions/commands/kick/KickSlashCmd.ts

@@ -1,8 +1,9 @@
 import { ChannelType } from "discord.js";
 import { slashOptions } from "knub";
-import { hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { hasPermission } from "../../../../pluginUtils";
 import { UserNotificationMethod } from "../../../../utils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualKickCmd } from "../../functions/actualCommands/actualKickCmd";
 import { readContactMethodsFromArgs } from "../../functions/readContactMethodsFromArgs";
 import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
@@ -48,7 +49,9 @@ export const KickSlashCmd = {
     const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
 
     if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
-      sendErrorMessage(pluginData, interaction, "Text or attachment required", undefined, undefined, true);
+      pluginData
+        .getPlugin(CommonPlugin)
+        .sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
 
       return;
     }
@@ -61,7 +64,9 @@ export const KickSlashCmd = {
 
     if (options.mod) {
       if (!canActAsOther) {
-        sendErrorMessage(pluginData, interaction, "You don't have permission to act as another moderator");
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, "You don't have permission to act as another moderator");
         return;
       }
 
@@ -72,7 +77,7 @@ export const KickSlashCmd = {
     try {
       contactMethods = readContactMethodsFromArgs(options) ?? undefined;
     } catch (e) {
-      sendErrorMessage(pluginData, interaction, e.message);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, e.message);
       return;
     }
 

backend/src/plugins/ModActions/commands/massban/MassBanMsgCmd.ts

@@ -14,6 +14,6 @@ export const MassBanMsgCmd = modActionsMsgCmd({
   ],
 
   async run({ pluginData, message: msg, args }) {
-    actualMassBanCmd(pluginData, msg.channel, args.userIds, msg.member);
+    actualMassBanCmd(pluginData, msg, args.userIds, msg.member);
   },
 });

backend/src/plugins/ModActions/commands/massmute/MassMuteMsgCmd.ts

@@ -14,6 +14,6 @@ export const MassMuteMsgCmd = modActionsMsgCmd({
   ],
 
   async run({ pluginData, message: msg, args }) {
-    actualMassMuteCmd(pluginData, msg.channel, args.userIds, msg.member);
+    actualMassMuteCmd(pluginData, msg, args.userIds, msg.member);
   },
 });

backend/src/plugins/ModActions/commands/massunban/MassUnbanMsgCmd.ts

@@ -14,6 +14,6 @@ export const MassUnbanMsgCmd = modActionsMsgCmd({
   ],
 
   async run({ pluginData, message: msg, args }) {
-    actualMassBanCmd(pluginData, msg.channel, args.userIds, msg.member);
+    actualMassBanCmd(pluginData, msg, args.userIds, msg.member);
   },
 });

backend/src/plugins/ModActions/commands/mute/MuteMsgCmd.ts

@@ -1,7 +1,8 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { canActOn, hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { canActOn, hasPermission } from "../../../../pluginUtils";
 import { resolveMember, resolveUser } from "../../../../utils";
 import { waitForButtonConfirm } from "../../../../utils/waitForInteraction";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualMuteCmd } from "../../functions/actualCommands/actualMuteCmd";
 import { isBanned } from "../../functions/isBanned";
 import { readContactMethodsFromArgs } from "../../functions/readContactMethodsFromArgs";
@@ -37,7 +38,7 @@ export const MuteMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
@@ -47,22 +48,20 @@ export const MuteMsgCmd = modActionsMsgCmd({
       const _isBanned = await isBanned(pluginData, user.id);
       const prefix = pluginData.fullConfig.prefix;
       if (_isBanned) {
-        sendErrorMessage(
-          pluginData,
-          msg.channel,
-          `User is banned. Use \`${prefix}forcemute\` if you want to mute them anyway.`,
-        );
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(msg, `User is banned. Use \`${prefix}forcemute\` if you want to mute them anyway.`);
         return;
       } else {
         // Ask the mod if we should upgrade to a forcemute as the user is not on the server
         const reply = await waitForButtonConfirm(
-          msg.channel,
+          msg,
           { content: "User not found on the server, forcemute instead?" },
           { confirmText: "Yes", cancelText: "No", restrictToId: msg.member.id },
         );
 
         if (!reply) {
-          sendErrorMessage(pluginData, msg.channel, "User not on server, mute cancelled by moderator");
+          pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "User not on server, mute cancelled by moderator");
           return;
         }
       }
@@ -70,7 +69,7 @@ export const MuteMsgCmd = modActionsMsgCmd({
 
     // Make sure we're allowed to mute this member
     if (memberToMute && !canActOn(pluginData, msg.member, memberToMute)) {
-      sendErrorMessage(pluginData, msg.channel, "Cannot mute: insufficient permissions");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cannot mute: insufficient permissions");
       return;
     }
 
@@ -80,7 +79,7 @@ export const MuteMsgCmd = modActionsMsgCmd({
 
     if (args.mod) {
       if (!(await hasPermission(pluginData, "can_act_as_other", { message: msg }))) {
-        sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "You don't have permission to use -mod");
         return;
       }
 
@@ -92,13 +91,13 @@ export const MuteMsgCmd = modActionsMsgCmd({
     try {
       contactMethods = readContactMethodsFromArgs(args);
     } catch (e) {
-      sendErrorMessage(pluginData, msg.channel, e.message);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, e.message);
       return;
     }
 
     actualMuteCmd(
       pluginData,
-      msg.channel,
+      msg,
       user,
       [...msg.attachments.values()],
       mod,

backend/src/plugins/ModActions/commands/mute/MuteSlashCmd.ts

@@ -1,9 +1,10 @@
 import { ChannelType } from "discord.js";
 import { slashOptions } from "knub";
-import { canActOn, hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { canActOn, hasPermission } from "../../../../pluginUtils";
 import { UserNotificationMethod, convertDelayStringToMS, resolveMember } from "../../../../utils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
 import { waitForButtonConfirm } from "../../../../utils/waitForInteraction";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualMuteCmd } from "../../functions/actualCommands/actualMuteCmd";
 import { isBanned } from "../../functions/isBanned";
 import { readContactMethodsFromArgs } from "../../functions/readContactMethodsFromArgs";
@@ -46,7 +47,9 @@ export const MuteSlashCmd = {
     const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
 
     if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
-      sendErrorMessage(pluginData, interaction, "Text or attachment required", undefined, undefined, true);
+      pluginData
+        .getPlugin(CommonPlugin)
+        .sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
 
       return;
     }
@@ -57,11 +60,9 @@ export const MuteSlashCmd = {
       const _isBanned = await isBanned(pluginData, options.user.id);
       const prefix = pluginData.fullConfig.prefix;
       if (_isBanned) {
-        sendErrorMessage(
-          pluginData,
-          interaction,
-          `User is banned. Use \`${prefix}forcemute\` if you want to mute them anyway.`,
-        );
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, `User is banned. Use \`${prefix}forcemute\` if you want to mute them anyway.`);
         return;
       } else {
         // Ask the mod if we should upgrade to a forcemute as the user is not on the server
@@ -72,7 +73,9 @@ export const MuteSlashCmd = {
         );
 
         if (!reply) {
-          sendErrorMessage(pluginData, interaction, "User not on server, mute cancelled by moderator");
+          pluginData
+            .getPlugin(CommonPlugin)
+            .sendErrorMessage(interaction, "User not on server, mute cancelled by moderator");
           return;
         }
       }
@@ -80,7 +83,7 @@ export const MuteSlashCmd = {
 
     // Make sure we're allowed to mute this member
     if (memberToMute && !canActOn(pluginData, interaction.member, memberToMute)) {
-      sendErrorMessage(pluginData, interaction, "Cannot mute: insufficient permissions");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, "Cannot mute: insufficient permissions");
       return;
     }
 
@@ -93,7 +96,9 @@ export const MuteSlashCmd = {
 
     if (options.mod) {
       if (!canActAsOther) {
-        sendErrorMessage(pluginData, interaction, "You don't have permission to act as another moderator");
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, "You don't have permission to act as another moderator");
         return;
       }
 
@@ -103,7 +108,7 @@ export const MuteSlashCmd = {
 
     const convertedTime = options.time ? convertDelayStringToMS(options.time) : null;
     if (options.time && !convertedTime) {
-      sendErrorMessage(pluginData, interaction, `Could not convert ${options.time} to a delay`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, `Could not convert ${options.time} to a delay`);
       return;
     }
 
@@ -111,7 +116,7 @@ export const MuteSlashCmd = {
     try {
       contactMethods = readContactMethodsFromArgs(options) ?? undefined;
     } catch (e) {
-      sendErrorMessage(pluginData, interaction, e.message);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, e.message);
       return;
     }
 

backend/src/plugins/ModActions/commands/note/NoteMsgCmd.ts

@@ -1,6 +1,6 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { sendErrorMessage } from "../../../../pluginUtils";
 import { resolveUser } from "../../../../utils";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualNoteCmd } from "../../functions/actualCommands/actualNoteCmd";
 import { modActionsMsgCmd } from "../../types";
 
@@ -17,15 +17,15 @@ export const NoteMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
     if (!args.note && msg.attachments.size === 0) {
-      sendErrorMessage(pluginData, msg.channel, "Text or attachment required");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Text or attachment required");
       return;
     }
 
-    actualNoteCmd(pluginData, msg.channel, msg.author, [...msg.attachments.values()], user, args.note || "");
+    actualNoteCmd(pluginData, msg, msg.author, [...msg.attachments.values()], user, args.note || "");
   },
 });

backend/src/plugins/ModActions/commands/note/NoteSlashCmd.ts

@@ -1,6 +1,6 @@
 import { slashOptions } from "knub";
-import { sendErrorMessage } from "../../../../pluginUtils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualNoteCmd } from "../../functions/actualCommands/actualNoteCmd";
 import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
 
@@ -24,7 +24,9 @@ export const NoteSlashCmd = {
     const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
 
     if ((!options.note || options.note.trim() === "") && attachments.length < 1) {
-      sendErrorMessage(pluginData, interaction, "Text or attachment required", undefined, undefined, true);
+      pluginData
+        .getPlugin(CommonPlugin)
+        .sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
 
       return;
     }

backend/src/plugins/ModActions/commands/unban/UnbanMsgCmd.ts

@@ -1,6 +1,7 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { hasPermission } from "../../../../pluginUtils";
 import { resolveUser } from "../../../../utils";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualUnbanCmd } from "../../functions/actualCommands/actualUnbanCmd";
 import { modActionsMsgCmd } from "../../types";
 
@@ -25,7 +26,7 @@ export const UnbanMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
@@ -33,13 +34,13 @@ export const UnbanMsgCmd = modActionsMsgCmd({
     let mod = msg.member;
     if (args.mod) {
       if (!(await hasPermission(pluginData, "can_act_as_other", { message: msg, channelId: msg.channel.id }))) {
-        sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "You don't have permission to use -mod");
         return;
       }
 
       mod = args.mod;
     }
 
-    actualUnbanCmd(pluginData, msg.channel, msg.author.id, user, args.reason, [...msg.attachments.values()], mod);
+    actualUnbanCmd(pluginData, msg, msg.author.id, user, args.reason, [...msg.attachments.values()], mod);
   },
 });

backend/src/plugins/ModActions/commands/unban/UnbanSlashCmd.ts

@@ -1,6 +1,7 @@
 import { slashOptions } from "knub";
-import { hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { hasPermission } from "../../../../pluginUtils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualUnbanCmd } from "../../functions/actualCommands/actualUnbanCmd";
 import { NUMBER_ATTACHMENTS_CASE_CREATION } from "../constants";
 
@@ -25,7 +26,9 @@ export const UnbanSlashCmd = {
     const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
 
     if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
-      sendErrorMessage(pluginData, interaction, "Text or attachment required", undefined, undefined, true);
+      pluginData
+        .getPlugin(CommonPlugin)
+        .sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
 
       return;
     }
@@ -38,7 +41,9 @@ export const UnbanSlashCmd = {
 
     if (options.mod) {
       if (!canActAsOther) {
-        sendErrorMessage(pluginData, interaction, "You don't have permission to act as another moderator");
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, "You don't have permission to act as another moderator");
         return;
       }
 

backend/src/plugins/ModActions/commands/unhidecase/UnhideCaseMsgCmd.ts

@@ -14,6 +14,6 @@ export const UnhideCaseMsgCmd = modActionsMsgCmd({
   ],
 
   async run({ pluginData, message: msg, args }) {
-    actualHideCaseCmd(pluginData, msg.channel, args.caseNum);
+    actualHideCaseCmd(pluginData, msg, args.caseNum);
   },
 });

backend/src/plugins/ModActions/commands/unmute/UnmuteMsgCmd.ts

@@ -1,7 +1,8 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { canActOn, hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { canActOn, hasPermission } from "../../../../pluginUtils";
 import { resolveMember, resolveUser } from "../../../../utils";
 import { waitForButtonConfirm } from "../../../../utils/waitForInteraction";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { MutesPlugin } from "../../../Mutes/MutesPlugin";
 import { actualUnmuteCmd } from "../../functions/actualCommands/actualUnmuteCmd";
 import { isBanned } from "../../functions/isBanned";
@@ -35,7 +36,7 @@ export const UnmuteMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
@@ -49,7 +50,7 @@ export const UnmuteMsgCmd = modActionsMsgCmd({
       !hasMuteRole &&
       !memberToUnmute?.isCommunicationDisabled()
     ) {
-      sendErrorMessage(pluginData, msg.channel, "Cannot unmute: member is not muted");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cannot unmute: member is not muted");
       return;
     }
 
@@ -57,22 +58,20 @@ export const UnmuteMsgCmd = modActionsMsgCmd({
       const banned = await isBanned(pluginData, user.id);
       const prefix = pluginData.fullConfig.prefix;
       if (banned) {
-        sendErrorMessage(
-          pluginData,
-          msg.channel,
-          `User is banned. Use \`${prefix}forceunmute\` to unmute them anyway.`,
-        );
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(msg, `User is banned. Use \`${prefix}forceunmute\` to unmute them anyway.`);
         return;
       } else {
         // Ask the mod if we should upgrade to a forceunmute as the user is not on the server
         const reply = await waitForButtonConfirm(
-          msg.channel,
+          msg,
           { content: "User not on server, forceunmute instead?" },
           { confirmText: "Yes", cancelText: "No", restrictToId: msg.member.id },
         );
 
         if (!reply) {
-          sendErrorMessage(pluginData, msg.channel, "User not on server, unmute cancelled by moderator");
+          pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "User not on server, unmute cancelled by moderator");
           return;
         }
       }
@@ -80,7 +79,7 @@ export const UnmuteMsgCmd = modActionsMsgCmd({
 
     // Make sure we're allowed to unmute this member
     if (memberToUnmute && !canActOn(pluginData, msg.member, memberToUnmute)) {
-      sendErrorMessage(pluginData, msg.channel, "Cannot unmute: insufficient permissions");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cannot unmute: insufficient permissions");
       return;
     }
 
@@ -90,7 +89,7 @@ export const UnmuteMsgCmd = modActionsMsgCmd({
 
     if (args.mod) {
       if (!(await hasPermission(pluginData, "can_act_as_other", { message: msg }))) {
-        sendErrorMessage(pluginData, msg.channel, "You don't have permission to use -mod");
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "You don't have permission to use -mod");
         return;
       }
 
@@ -100,7 +99,7 @@ export const UnmuteMsgCmd = modActionsMsgCmd({
 
     actualUnmuteCmd(
       pluginData,
-      msg.channel,
+      msg,
       user,
       [...msg.attachments.values()],
       mod,

backend/src/plugins/ModActions/commands/unmute/UnmuteSlashCmd.ts

@@ -1,8 +1,9 @@
 import { slashOptions } from "knub";
-import { canActOn, hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { canActOn, hasPermission } from "../../../../pluginUtils";
 import { convertDelayStringToMS, resolveMember } from "../../../../utils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
 import { waitForButtonConfirm } from "../../../../utils/waitForInteraction";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { MutesPlugin } from "../../../Mutes/MutesPlugin";
 import { actualUnmuteCmd } from "../../functions/actualCommands/actualUnmuteCmd";
 import { isBanned } from "../../functions/isBanned";
@@ -30,7 +31,9 @@ export const UnmuteSlashCmd = {
     const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
 
     if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
-      sendErrorMessage(pluginData, interaction, "Text or attachment required", undefined, undefined, true);
+      pluginData
+        .getPlugin(CommonPlugin)
+        .sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
 
       return;
     }
@@ -45,7 +48,7 @@ export const UnmuteSlashCmd = {
       !hasMuteRole &&
       !memberToUnmute?.isCommunicationDisabled()
     ) {
-      sendErrorMessage(pluginData, interaction, "Cannot unmute: member is not muted");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, "Cannot unmute: member is not muted");
       return;
     }
 
@@ -53,11 +56,9 @@ export const UnmuteSlashCmd = {
       const banned = await isBanned(pluginData, options.user.id);
       const prefix = pluginData.fullConfig.prefix;
       if (banned) {
-        sendErrorMessage(
-          pluginData,
-          interaction,
-          `User is banned. Use \`${prefix}forceunmute\` to unmute them anyway.`,
-        );
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, `User is banned. Use \`${prefix}forceunmute\` to unmute them anyway.`);
         return;
       } else {
         // Ask the mod if we should upgrade to a forceunmute as the user is not on the server
@@ -68,7 +69,9 @@ export const UnmuteSlashCmd = {
         );
 
         if (!reply) {
-          sendErrorMessage(pluginData, interaction, "User not on server, unmute cancelled by moderator");
+          pluginData
+            .getPlugin(CommonPlugin)
+            .sendErrorMessage(interaction, "User not on server, unmute cancelled by moderator");
           return;
         }
       }
@@ -76,7 +79,7 @@ export const UnmuteSlashCmd = {
 
     // Make sure we're allowed to unmute this member
     if (memberToUnmute && !canActOn(pluginData, interaction.member, memberToUnmute)) {
-      sendErrorMessage(pluginData, interaction, "Cannot unmute: insufficient permissions");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, "Cannot unmute: insufficient permissions");
       return;
     }
 
@@ -89,7 +92,9 @@ export const UnmuteSlashCmd = {
 
     if (options.mod) {
       if (!canActAsOther) {
-        sendErrorMessage(pluginData, interaction, "You don't have permission to act as another moderator");
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, "You don't have permission to act as another moderator");
         return;
       }
 
@@ -99,7 +104,7 @@ export const UnmuteSlashCmd = {
 
     const convertedTime = options.time ? convertDelayStringToMS(options.time) : null;
     if (options.time && !convertedTime) {
-      sendErrorMessage(pluginData, interaction, `Could not convert ${options.time} to a delay`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, `Could not convert ${options.time} to a delay`);
       return;
     }
 

backend/src/plugins/ModActions/commands/update/UpdateMsgCmd.ts

@@ -19,6 +19,6 @@ export const UpdateMsgCmd = modActionsMsgCmd({
   ],
 
   async run({ pluginData, message: msg, args }) {
-    await updateCase(pluginData, msg.channel, msg.author, args.caseNumber, args.note, [...msg.attachments.values()]);
+    await updateCase(pluginData, msg, msg.author, args.caseNumber, args.note, [...msg.attachments.values()]);
   },
 });

backend/src/plugins/ModActions/commands/warn/WarnMsgCmd.ts

@@ -1,6 +1,7 @@
 import { commandTypeHelpers as ct } from "../../../../commandTypes";
-import { canActOn, hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { canActOn, hasPermission } from "../../../../pluginUtils";
 import { errorMessage, resolveMember, resolveUser } from "../../../../utils";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualWarnCmd } from "../../functions/actualCommands/actualWarnCmd";
 import { isBanned } from "../../functions/isBanned";
 import { readContactMethodsFromArgs } from "../../functions/readContactMethodsFromArgs";
@@ -23,7 +24,7 @@ export const WarnMsgCmd = modActionsMsgCmd({
   async run({ pluginData, message: msg, args }) {
     const user = await resolveUser(pluginData.client, args.user);
     if (!user.id) {
-      sendErrorMessage(pluginData, msg.channel, `User not found`);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found`);
       return;
     }
 
@@ -32,9 +33,9 @@ export const WarnMsgCmd = modActionsMsgCmd({
     if (!memberToWarn) {
       const _isBanned = await isBanned(pluginData, user.id);
       if (_isBanned) {
-        sendErrorMessage(pluginData, msg.channel, `User is banned`);
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User is banned`);
       } else {
-        sendErrorMessage(pluginData, msg.channel, `User not found on the server`);
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, `User not found on the server`);
       }
 
       return;
@@ -42,7 +43,7 @@ export const WarnMsgCmd = modActionsMsgCmd({
 
     // Make sure we're allowed to warn this member
     if (!canActOn(pluginData, msg.member, memberToWarn)) {
-      sendErrorMessage(pluginData, msg.channel, "Cannot warn: insufficient permissions");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, "Cannot warn: insufficient permissions");
       return;
     }
 
@@ -61,13 +62,13 @@ export const WarnMsgCmd = modActionsMsgCmd({
     try {
       contactMethods = readContactMethodsFromArgs(args);
     } catch (e) {
-      sendErrorMessage(pluginData, msg.channel, e.message);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(msg, e.message);
       return;
     }
 
     actualWarnCmd(
       pluginData,
-      msg.channel,
+      msg,
       msg.author.id,
       mod,
       memberToWarn,

backend/src/plugins/ModActions/commands/warn/WarnSlashCmd.ts

@@ -1,8 +1,9 @@
 import { ChannelType } from "discord.js";
 import { slashOptions } from "knub";
-import { canActOn, hasPermission, sendErrorMessage } from "../../../../pluginUtils";
+import { canActOn, hasPermission } from "../../../../pluginUtils";
 import { UserNotificationMethod, resolveMember } from "../../../../utils";
 import { generateAttachmentSlashOptions, retrieveMultipleOptions } from "../../../../utils/multipleSlashOptions";
+import { CommonPlugin } from "../../../Common/CommonPlugin";
 import { actualWarnCmd } from "../../functions/actualCommands/actualWarnCmd";
 import { isBanned } from "../../functions/isBanned";
 import { readContactMethodsFromArgs } from "../../functions/readContactMethodsFromArgs";
@@ -44,7 +45,9 @@ export const WarnSlashCmd = {
     const attachments = retrieveMultipleOptions(NUMBER_ATTACHMENTS_CASE_CREATION, options, "attachment");
 
     if ((!options.reason || options.reason.trim() === "") && attachments.length < 1) {
-      sendErrorMessage(pluginData, interaction, "Text or attachment required", undefined, undefined, true);
+      pluginData
+        .getPlugin(CommonPlugin)
+        .sendErrorMessage(interaction, "Text or attachment required", undefined, undefined, true);
 
       return;
     }
@@ -54,9 +57,9 @@ export const WarnSlashCmd = {
     if (!memberToWarn) {
       const _isBanned = await isBanned(pluginData, options.user.id);
       if (_isBanned) {
-        sendErrorMessage(pluginData, interaction, `User is banned`);
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, `User is banned`);
       } else {
-        sendErrorMessage(pluginData, interaction, `User not found on the server`);
+        pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, `User not found on the server`);
       }
 
       return;
@@ -64,7 +67,7 @@ export const WarnSlashCmd = {
 
     // Make sure we're allowed to warn this member
     if (!canActOn(pluginData, interaction.member, memberToWarn)) {
-      sendErrorMessage(pluginData, interaction, "Cannot warn: insufficient permissions");
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, "Cannot warn: insufficient permissions");
       return;
     }
 
@@ -76,7 +79,9 @@ export const WarnSlashCmd = {
 
     if (options.mod) {
       if (!canActAsOther) {
-        sendErrorMessage(pluginData, interaction, "You don't have permission to act as another moderator");
+        pluginData
+          .getPlugin(CommonPlugin)
+          .sendErrorMessage(interaction, "You don't have permission to act as another moderator");
         return;
       }
 
@@ -87,7 +92,7 @@ export const WarnSlashCmd = {
     try {
       contactMethods = readContactMethodsFromArgs(options) ?? undefined;
     } catch (e) {
-      sendErrorMessage(pluginData, interaction, e.message);
+      pluginData.getPlugin(CommonPlugin).sendErrorMessage(interaction, e.message);
       return;
     }