feat: add new notifyResult variable to logs

Author: rubyowo

backend/src/data/DefaultLogMessages.json

@@ -1,14 +1,14 @@
 {
   "MEMBER_NOTE": "{timestamp} 🖊 Note added on {userMention(user)} by {userMention(mod)}",
-  "MEMBER_WARN": "{timestamp} ⚠️ {userMention(member)} was warned by {userMention(mod)}",
-  "MEMBER_MUTE": "{timestamp} 🔇 {userMention(user)} was muted indefinitely by {userMention(mod)}",
-  "MEMBER_TIMED_MUTE": "{timestamp} 🔇 {userMention(user)} was muted for **{time}** by {userMention(mod)}",
+  "MEMBER_WARN": "{timestamp} ⚠️ {userMention(member)} was warned by {userMention(mod)} ({notifyResult})",
+  "MEMBER_MUTE": "{timestamp} 🔇 {userMention(user)} was muted indefinitely by {userMention(mod)} ({notifyResult})",
+  "MEMBER_TIMED_MUTE": "{timestamp} 🔇 {userMention(user)} was muted for **{time}** by {userMention(mod)} ({notifyResult})",
   "MEMBER_UNMUTE": "{timestamp} 🔊 {userMention(user)} was unmuted by {userMention(mod)}",
   "MEMBER_TIMED_UNMUTE": "{timestamp} 🔊 {userMention(user)} was scheduled to be unmuted in **{time}** by {userMention(mod)}",
   "MEMBER_MUTE_EXPIRED": "{timestamp} 🔊 {userMention(member)}'s mute expired",
-  "MEMBER_KICK": "{timestamp} 👢 {userMention(user)} was kicked by {userMention(mod)}",
-  "MEMBER_BAN": "{timestamp} 🔨 {userMention(user)} was banned by {userMention(mod)}",
-  "MEMBER_UNBAN": "{timestamp} 🔓 User (`{userId}`) was unbanned by {userMention(mod)}",
+  "MEMBER_KICK": "{timestamp} 👢 {userMention(user)} was kicked by {userMention(mod)} ({notifyResult})",
+  "MEMBER_BAN": "{timestamp} 🔨 {userMention(user)} was banned by {userMention(mod)} ({notifyResult})",
+  "MEMBER_UNBAN": "{timestamp} 🔓 User (`{userId}`) was unbanned by {userMention(mod)} ({notifyResult})",
   "MEMBER_FORCEBAN": "{timestamp} 🔨 User (`{userId}`) was forcebanned by {userMention(mod)}",
   "MEMBER_SOFTBAN": "{timestamp} 🔨 {userMention(member)} was softbanned by {userMention(mod)}",
   "MEMBER_JOIN": "{timestamp} 📥 {new} {userMention(member)} joined (created <t:{account_age_ts}:R>)",

backend/src/plugins/Logs/logFunctions/logMemberBan.ts

@@ -12,6 +12,7 @@ export interface LogMemberBanData {
   user: User | UnknownUser;
   caseNumber: number;
   reason: string;
+  notifyResult: string | undefined;
 }
 
 export function logMemberBan(pluginData: GuildPluginData<LogsPluginType>, data: LogMemberBanData) {
@@ -23,6 +24,7 @@ export function logMemberBan(pluginData: GuildPluginData<LogsPluginType>, data:
       user: userToTemplateSafeUser(data.user),
       caseNumber: data.caseNumber,
       reason: data.reason,
+      notifyResult: data.notifyResult,
     }),
     {
       userId: data.user.id,

backend/src/plugins/Logs/logFunctions/logMemberKick.ts

@@ -12,6 +12,7 @@ export interface LogMemberKickData {
   user: User;
   caseNumber: number;
   reason: string;
+  notifyResult: string | undefined;
 }
 
 export function logMemberKick(pluginData: GuildPluginData<LogsPluginType>, data: LogMemberKickData) {
@@ -23,6 +24,7 @@ export function logMemberKick(pluginData: GuildPluginData<LogsPluginType>, data:
       user: userToTemplateSafeUser(data.user),
       caseNumber: data.caseNumber,
       reason: data.reason,
+      notifyResult: data.notifyResult,
     }),
     {
       userId: data.user.id,

backend/src/plugins/Logs/logFunctions/logMemberMute.ts

@@ -12,6 +12,7 @@ export interface LogMemberMuteData {
   user: User | UnknownUser;
   caseNumber: number;
   reason: string;
+  notifyResult: string | undefined;
 }
 
 export function logMemberMute(pluginData: GuildPluginData<LogsPluginType>, data: LogMemberMuteData) {
@@ -23,6 +24,7 @@ export function logMemberMute(pluginData: GuildPluginData<LogsPluginType>, data:
       user: userToTemplateSafeUser(data.user),
       caseNumber: data.caseNumber,
       reason: data.reason,
+      notifyResult: data.notifyResult,
     }),
     {
       userId: data.user.id,

backend/src/plugins/Logs/logFunctions/logMemberTimedBan.ts

@@ -13,6 +13,7 @@ export interface LogMemberTimedBanData {
   banTime: string;
   caseNumber: number;
   reason: string;
+  notifyResult: string | undefined;
 }
 
 export function logMemberTimedBan(pluginData: GuildPluginData<LogsPluginType>, data: LogMemberTimedBanData) {
@@ -25,6 +26,7 @@ export function logMemberTimedBan(pluginData: GuildPluginData<LogsPluginType>, d
       banTime: data.banTime,
       caseNumber: data.caseNumber,
       reason: data.reason,
+      notifyResult: data.notifyResult,
     }),
     {
       userId: data.user.id,

backend/src/plugins/Logs/logFunctions/logMemberTimedMute.ts

@@ -13,6 +13,7 @@ export interface LogMemberTimedMuteData {
   time: string;
   caseNumber: number;
   reason: string;
+  notifyResult: string | undefined;
 }
 
 export function logMemberTimedMute(pluginData: GuildPluginData<LogsPluginType>, data: LogMemberTimedMuteData) {
@@ -25,6 +26,7 @@ export function logMemberTimedMute(pluginData: GuildPluginData<LogsPluginType>,
       time: data.time,
       caseNumber: data.caseNumber,
       reason: data.reason,
+      notifyResult: data.notifyResult,
     }),
     {},
   );

backend/src/plugins/Logs/logFunctions/logMemberWarn.ts

@@ -11,6 +11,7 @@ export interface LogMemberWarnData {
   member: GuildMember;
   caseNumber: number;
   reason: string;
+  notifyResult: string | undefined;
 }
 
 export function logMemberWarn(pluginData: GuildPluginData<LogsPluginType>, data: LogMemberWarnData) {
@@ -22,6 +23,7 @@ export function logMemberWarn(pluginData: GuildPluginData<LogsPluginType>, data:
       member: memberToTemplateSafeMember(data.member),
       caseNumber: data.caseNumber,
       reason: data.reason,
+      notifyResult: data.notifyResult,
     }),
     {
       userId: data.member.id,

backend/src/plugins/ModActions/functions/banUserId.ts

@@ -174,13 +174,15 @@ export async function banUserId(
       caseNumber: createdCase.case_number,
       reason: reason ?? "",
       banTime: humanizeDuration(banTime),
+      notifyResult: notifyResult.text,
     });
   } else {
     pluginData.getPlugin(LogsPlugin).logMemberBan({
       mod,
       user,
       caseNumber: createdCase.case_number,
       reason: reason ?? "",
+      notifyResult: notifyResult.text,
     });
   }
 

backend/src/plugins/ModActions/functions/kickMember.ts

@@ -99,6 +99,7 @@ export async function kickMember(
     user: member.user,
     caseNumber: createdCase.case_number,
     reason: reason ?? "",
+    notifyResult: notifyResult.text
   });
 
   pluginData.state.events.emit("kick", member.id, reason, kickOptions.isAutomodAction);

backend/src/plugins/ModActions/functions/warnMember.ts

@@ -96,6 +96,7 @@ export async function warnMember(
     member,
     caseNumber: createdCase.case_number,
     reason: reason ?? "",
+    notifyResult: notifyResult.text,
   });
 
   pluginData.state.events.emit("warn", member.id, reason, warnOptions.isAutomodAction);