From 0e89e325d480190c137d60dac2fb6db86d16c198 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Mon, 13 May 2024 22:31:19 +0800
Subject: [PATCH] :bug: Fix notification push issue

---
 .idea/workspace.xml           | 7 ++++---
 pkg/services/notifications.go | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b25ca93..d12a850 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,8 +4,9 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Bug fixes on E2EE">
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Fix key exchange cause echo">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/services/notifications.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/services/notifications.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -138,7 +139,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value=":sparkles: New ticket ways" />
     <MESSAGE value=":sparkles: Sign up &amp; Sign in" />
     <MESSAGE value=":sparkles: An entire complete sign in user flow" />
     <MESSAGE value=":sparkles: User center page" />
@@ -163,7 +163,8 @@
     <MESSAGE value=":recycle: Improved the notification subscriber API" />
     <MESSAGE value=":sparkles: E2EE Key Exchange" />
     <MESSAGE value=":bug: Bug fixes on E2EE" />
-    <option name="LAST_COMMIT_MESSAGE" value=":bug: Bug fixes on E2EE" />
+    <MESSAGE value=":bug: Fix key exchange cause echo" />
+    <option name="LAST_COMMIT_MESSAGE" value=":bug: Fix key exchange cause echo" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/pkg/services/notifications.go b/pkg/services/notifications.go
index 2a7d7d3..83be5ed 100644
--- a/pkg/services/notifications.go
+++ b/pkg/services/notifications.go
@@ -2,7 +2,6 @@ package services
 
 import (
 	"context"
-	jsoniter "github.com/json-iterator/go"
 	"reflect"
 
 	"firebase.google.com/go/messaging"
@@ -58,11 +57,10 @@ func NewNotification(notification models.Notification) error {
 }
 
 func PushNotification(notification models.Notification) error {
-	raw, _ := jsoniter.Marshal(notification)
 	for conn := range wsConn[notification.RecipientID] {
 		_ = conn.WriteMessage(1, models.UnifiedCommand{
 			Action:  "notifications.new",
-			Payload: raw,
+			Payload: notification,
 		}.Marshal())
 	}