From 7139d81a5e1009ee7017604f8811d95390516f02 Mon Sep 17 00:00:00 2001
From: Dragory <dragory.up@gmail.com>
Date: Thu, 3 Jan 2019 04:37:44 +0200
Subject: [PATCH] Separate timed/indefinite mutes/unmutes in logs

---
 src/data/DefaultLogMessages.json |  4 +++-
 src/data/LogType.ts              |  5 ++++-
 src/plugins/ModActions.ts        | 35 +++++++++++++++++++++++---------
 3 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/src/data/DefaultLogMessages.json b/src/data/DefaultLogMessages.json
index 9e4adef2..16526c86 100644
--- a/src/data/DefaultLogMessages.json
+++ b/src/data/DefaultLogMessages.json
@@ -1,7 +1,9 @@
 {
   "MEMBER_WARN": "⚠️ **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was warned by {mod.username}#{mod.discriminator}",
-  "MEMBER_MUTE": "🔇 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was muted by {mod.username}#{mod.discriminator}",
+  "MEMBER_MUTE": "🔇 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was muted indefinitely by {mod.username}#{mod.discriminator}",
+  "MEMBER_TIMED_MUTE": "🔇 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was muted for **{time}** by {mod.username}#{mod.discriminator}",
   "MEMBER_UNMUTE": "🔉 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was unmuted by {mod.username}#{mod.discriminator}",
+  "MEMBER_TIMED_UNMUTE": "🔉 **{member.user.username}#{member.user.discriminator}** (`{member.id}`) was scheduled to be unmuted in **{time}** by {mod.username}#{mod.discriminator}",
   "MEMBER_MUTE_EXPIRED": "🔉 **{member.user.username}#{member.user.discriminator}**'s mute expired",
   "MEMBER_KICK": "👢 **{user.username}#{user.discriminator}** (`{user.id}`) was kicked by {mod.username}#{mod.discriminator}",
   "MEMBER_BAN": "🔨 **{user.username}#{user.discriminator}** (`{user.id}`) was banned by {mod.username}#{mod.discriminator}",
diff --git a/src/data/LogType.ts b/src/data/LogType.ts
index 898ebcd5..975e0224 100644
--- a/src/data/LogType.ts
+++ b/src/data/LogType.ts
@@ -39,5 +39,8 @@ export enum LogType {
 
   CASE_CREATE,
 
-  MASSBAN
+  MASSBAN,
+
+  MEMBER_TIMED_MUTE,
+  MEMBER_TIMED_UNMUTE
 }
diff --git a/src/plugins/ModActions.ts b/src/plugins/ModActions.ts
index 5f87d259..77887f69 100644
--- a/src/plugins/ModActions.ts
+++ b/src/plugins/ModActions.ts
@@ -426,10 +426,18 @@ export class ModActionsPlugin extends ZeppelinPlugin {
     msg.channel.createMessage(successMessage(response));
 
     // Log the action
-    this.serverLogs.log(LogType.MEMBER_MUTE, {
-      mod: stripObjectToScalars(msg.member.user),
-      member: stripObjectToScalars(args.member, ["user"])
-    });
+    if (muteTime) {
+      this.serverLogs.log(LogType.MEMBER_TIMED_MUTE, {
+        mod: stripObjectToScalars(msg.member.user),
+        member: stripObjectToScalars(args.member, ["user"]),
+        time: timeUntilUnmute
+      });
+    } else {
+      this.serverLogs.log(LogType.MEMBER_MUTE, {
+        mod: stripObjectToScalars(msg.member.user),
+        member: stripObjectToScalars(args.member, ["user"])
+      });
+    }
   }
 
   @d.command("unmute", "<member:Member> [time:string] [reason:string$]")
@@ -478,6 +486,13 @@ export class ModActionsPlugin extends ZeppelinPlugin {
           })`
         )
       );
+
+      // Log the action
+      this.serverLogs.log(LogType.MEMBER_TIMED_UNMUTE, {
+        mod: stripObjectToScalars(msg.member.user),
+        member: stripObjectToScalars(args.member, ["user"]),
+        time: timeUntilUnmute
+      });
     } else {
       // Otherwise remove "muted" role immediately
       this.serverLogs.ignoreLog(LogType.MEMBER_ROLE_REMOVE, args.member.id);
@@ -491,13 +506,13 @@ export class ModActionsPlugin extends ZeppelinPlugin {
           })`
         )
       );
-    }
 
-    // Log the action
-    this.serverLogs.log(LogType.MEMBER_UNMUTE, {
-      mod: stripObjectToScalars(msg.member.user),
-      member: stripObjectToScalars(args.member, ["user"])
-    });
+      // Log the action
+      this.serverLogs.log(LogType.MEMBER_UNMUTE, {
+        mod: stripObjectToScalars(msg.member.user),
+        member: stripObjectToScalars(args.member, ["user"])
+      });
+    }
   }
 
   @d.command("mutes")