From 36c15751ffee4d7cbf7000dce6cbd533af735489 Mon Sep 17 00:00:00 2001
From: Dominika <sokolov.dominika@gmail.com>
Date: Sat, 16 Jan 2021 20:09:26 -0500
Subject: [PATCH] [fix] DiscordNotifs color and detection bug

Signed-off-by: Dominika <sokolov.dominika@gmail.com>
---
 .../me/zeroeightsix/kami/module/modules/chat/ChatTimestamp.kt  | 3 +++
 .../me/zeroeightsix/kami/module/modules/chat/DiscordNotifs.kt  | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/chat/ChatTimestamp.kt b/src/main/java/me/zeroeightsix/kami/module/modules/chat/ChatTimestamp.kt
index 4efba10c3..29c2df434 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/chat/ChatTimestamp.kt
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/chat/ChatTimestamp.kt
@@ -31,6 +31,9 @@ internal object ChatTimestamp : Module(
     val formattedTime: String
         get() = "${separator.left}${color format TimeUtils.getTime(timeFormat, timeUnit)}${separator.right} "
 
+    val time: String
+        get() = "${separator.left}${TimeUtils.getTime(timeFormat, timeUnit)}${separator.right}"
+
     @Suppress("unused")
     private enum class Separator(override val displayName: String, val left: String, val right: String) : DisplayEnum {
         ARROWS("< >", "<", ">"),
diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/chat/DiscordNotifs.kt b/src/main/java/me/zeroeightsix/kami/module/modules/chat/DiscordNotifs.kt
index 72cf05c43..cc3dc40a1 100644
--- a/src/main/java/me/zeroeightsix/kami/module/modules/chat/DiscordNotifs.kt
+++ b/src/main/java/me/zeroeightsix/kami/module/modules/chat/DiscordNotifs.kt
@@ -80,7 +80,6 @@ internal object DiscordNotifs : Module(
             || direct.value && MessageDetection.Direct.ANY detect message
             || restart.value && MessageDetection.Server.RESTART detect message
             || queue.value && MessageDetection.Server.QUEUE detect message
-            || importantPings.value && MessageDetection.Server.QUEUE detect message
     }
 
     private fun getMessageType(message: String, server: String): String {
@@ -109,7 +108,7 @@ internal object DiscordNotifs : Module(
 
     private fun getTime() =
         if (!time.value) ""
-        else ChatTimestamp.formattedTime
+        else ChatTimestamp.time
 
     private fun sendMessage(content: String, avatarUrl: String) {
         val tm = TemmieWebhook(url.value)