From 40179a5557c83fc7495e5cb44a1beb248ec5c1e7 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sun, 9 Jun 2024 22:32:20 +0800
Subject: [PATCH] :bug: Fix message notifying

---
 pkg/services/messages.go | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/pkg/services/messages.go b/pkg/services/messages.go
index a0ece7c..a73fd9a 100644
--- a/pkg/services/messages.go
+++ b/pkg/services/messages.go
@@ -85,16 +85,18 @@ func NewMessage(message models.Message) (models.Message, error) {
 		channel := message.Channel
 		message, _ = GetMessage(message.Channel, message.ID)
 		for _, member := range members {
-			doesNotify := true
-			if member.ID == message.SenderID {
-				doesNotify = false
-			} else {
+			PushCommand(member.AccountID, models.UnifiedCommand{
+				Action:  "messages.new",
+				Payload: message,
+			})
+
+			if member.ID != message.SenderID {
 				switch member.Notify {
 				case models.NotifyLevelNone:
-					doesNotify = false
+					continue
 				case models.NotifyLevelMentioned:
 					if member.ID == message.ReplyTo.SenderID {
-						break
+						continue
 					}
 					if val, ok := message.Content["mentioned_users"]; ok {
 						if usernames, ok := val.([]string); ok {
@@ -103,13 +105,10 @@ func NewMessage(message models.Message) (models.Message, error) {
 							}
 						}
 					}
-					doesNotify = false
 				default:
 					break
 				}
-			}
 
-			if doesNotify {
 				var displayText string
 				if message.Content["algorithm"] == "plain" {
 					displayText, _ = message.Content["value"].(string)
@@ -132,11 +131,6 @@ func NewMessage(message models.Message) (models.Message, error) {
 					log.Warn().Err(err).Msg("An error occurred when trying notify user.")
 				}
 			}
-
-			PushCommand(member.AccountID, models.UnifiedCommand{
-				Action:  "messages.new",
-				Payload: message,
-			})
 		}
 	}