feat: add new notifyResult variable to logs

rubyowo · rubyowo · commit bef5e172a709 · 2025-06-17T18:19:14.000+04:00
diff --git a/backend/src/data/DefaultLogMessages.json b/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>)",
diff --git a/backend/src/plugins/Logs/events/LogsGuildBanEvts.ts b/backend/src/plugins/Logs/events/LogsGuildBanEvts.ts
@@ -28,6 +28,7 @@ export const LogsGuildBanAddEvt = logsEvt({
       user,
       caseNumber: 0,
       reason: "",
+      notifyResult: "",
     });
   },
 });
diff --git a/backend/src/plugins/Logs/logFunctions/logMemberBan.ts b/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,
diff --git a/backend/src/plugins/Logs/logFunctions/logMemberKick.ts b/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,
diff --git a/backend/src/plugins/Logs/logFunctions/logMemberMute.ts b/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,
diff --git a/backend/src/plugins/Logs/logFunctions/logMemberTimedBan.ts b/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,
diff --git a/backend/src/plugins/Logs/logFunctions/logMemberTimedMute.ts b/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,
     }),
     {},
   );
diff --git a/backend/src/plugins/Logs/logFunctions/logMemberWarn.ts b/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,
diff --git a/backend/src/plugins/ModActions/commands/ban/actualBanCmd.ts b/backend/src/plugins/ModActions/commands/ban/actualBanCmd.ts
@@ -112,13 +112,15 @@ export async function actualBanCmd(
           caseNumber: createdCase.case_number,
           reason: formattedReason,
           banTime: humanizeDuration(time),
+          notifyResult: "",
         });
       } else {
         pluginData.getPlugin(LogsPlugin).logMemberBan({
           mod: mod.user,
           user,
           caseNumber: createdCase.case_number,
           reason: formattedReason,
+          notifyResult: "",
         });
       }
 
diff --git a/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts b/backend/src/plugins/ModActions/events/CreateBanCaseOnManualBanEvt.ts
@@ -70,6 +70,7 @@ export const CreateBanCaseOnManualBanEvt = modActionsEvt({
       user: userToTemplateSafeUser(user),
       caseNumber: createdCase?.case_number ?? 0,
       reason,
+      notifyResult: "",
     });
 
     pluginData.state.events.emit("ban", user.id, reason);
diff --git a/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts b/backend/src/plugins/ModActions/events/CreateKickCaseOnManualKickEvt.ts
@@ -58,6 +58,7 @@ export const CreateKickCaseOnManualKickEvt = modActionsEvt({
         mod,
         caseNumber: createdCase?.case_number ?? 0,
         reason: kickAuditLogEntry.reason || "",
+        notifyResult: "",
       });
 
       pluginData.state.events.emit("kick", member.id, kickAuditLogEntry.reason || undefined);
diff --git a/backend/src/plugins/ModActions/functions/banUserId.ts b/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,
     });
   }
 
diff --git a/backend/src/plugins/ModActions/functions/kickMember.ts b/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);
diff --git a/backend/src/plugins/ModActions/functions/warnMember.ts b/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);
diff --git a/backend/src/plugins/Mutes/functions/muteUser.ts b/backend/src/plugins/Mutes/functions/muteUser.ts
@@ -288,13 +288,15 @@ export async function muteUser(
       time: timeUntilUnmuteStr,
       caseNumber: theCase.case_number,
       reason: reason ?? "",
+      notifyResult: notifyResult.text,
     });
   } else {
     pluginData.getPlugin(LogsPlugin).logMemberMute({
       mod,
       user,
       caseNumber: theCase.case_number,
       reason: reason ?? "",
+      notifyResult: notifyResult.text,
     });
   }
 

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ export interface LogMemberBanData {`
`12`	`12`	`user: User \| UnknownUser;`
`13`	`13`	`caseNumber: number;`
`14`	`14`	`reason: string;`
	`15`	`+ notifyResult: string \| undefined;`
`15`	`16`	`}`
`16`	`17`
`17`	`18`	`export function logMemberBan(pluginData: GuildPluginData<LogsPluginType>, data: LogMemberBanData) {`
`@@ -23,6 +24,7 @@ export function logMemberBan(pluginData: GuildPluginData<LogsPluginType>, data:`
`23`	`24`	`user: userToTemplateSafeUser(data.user),`
`24`	`25`	`caseNumber: data.caseNumber,`
`25`	`26`	`reason: data.reason,`
	`27`	`+ notifyResult: data.notifyResult,`
`26`	`28`	`}),`
`27`	`29`	`{`
`28`	`30`	`userId: data.user.id,`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ export interface LogMemberTimedBanData {`
`13`	`13`	`banTime: string;`
`14`	`14`	`caseNumber: number;`
`15`	`15`	`reason: string;`
	`16`	`+ notifyResult: string \| undefined;`
`16`	`17`	`}`
`17`	`18`
`18`	`19`	`export function logMemberTimedBan(pluginData: GuildPluginData<LogsPluginType>, data: LogMemberTimedBanData) {`
`@@ -25,6 +26,7 @@ export function logMemberTimedBan(pluginData: GuildPluginData<LogsPluginType>, d`
`25`	`26`	`banTime: data.banTime,`
`26`	`27`	`caseNumber: data.caseNumber,`
`27`	`28`	`reason: data.reason,`
	`29`	`+ notifyResult: data.notifyResult,`
`28`	`30`	`}),`
`29`	`31`	`{`
`30`	`32`	`userId: data.user.id,`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ export interface LogMemberWarnData {`
`11`	`11`	`member: GuildMember;`
`12`	`12`	`caseNumber: number;`
`13`	`13`	`reason: string;`
	`14`	`+ notifyResult: string \| undefined;`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`export function logMemberWarn(pluginData: GuildPluginData<LogsPluginType>, data: LogMemberWarnData) {`
`@@ -22,6 +23,7 @@ export function logMemberWarn(pluginData: GuildPluginData<LogsPluginType>, data:`
`22`	`23`	`member: memberToTemplateSafeMember(data.member),`
`23`	`24`	`caseNumber: data.caseNumber,`
`24`	`25`	`reason: data.reason,`
	`26`	`+ notifyResult: data.notifyResult,`
`25`	`27`	`}),`
`26`	`28`	`{`
`27`	`29`	`userId: data.member.id,`