From 6d035c114738828d5a2384996babc8309a1cd03d Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Sat, 8 Jun 2024 20:11:58 +0800
Subject: [PATCH] :fire: Remove ws connected does not push notify feature

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

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fa0d6ab..1eed85a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,7 +4,7 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Fix APNs pushes no sound">
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Fix APNs pushes no sound (again)">
       <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>
@@ -141,7 +141,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value=":bug: Bug fixes on forgot add realm members for account" />
     <MESSAGE value=":bug: Bug fix on missing id in realm" />
     <MESSAGE value=":bug: Bug fixes on realm missing member on creation" />
     <MESSAGE value=":bug: Dumb man make dumb mistake again" />
@@ -166,7 +165,8 @@
     <MESSAGE value=":bug: Fix APNs non-production" />
     <MESSAGE value=":bug: Bug fixes on notification badges for APNs" />
     <MESSAGE value=":bug: Fix APNs pushes no sound" />
-    <option name="LAST_COMMIT_MESSAGE" value=":bug: Fix APNs pushes no sound" />
+    <MESSAGE value=":bug: Fix APNs pushes no sound (again)" />
+    <option name="LAST_COMMIT_MESSAGE" value=":bug: Fix APNs pushes no sound (again)" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/pkg/services/notifications.go b/pkg/services/notifications.go
index 43c76b0..c9c65f6 100644
--- a/pkg/services/notifications.go
+++ b/pkg/services/notifications.go
@@ -58,19 +58,14 @@ func NewNotification(notification models.Notification) error {
 }
 
 func PushNotification(notification models.Notification) error {
-	frontendAvailable := false
 	for conn := range wsConn[notification.RecipientID] {
-		frontendAvailable = true
 		_ = conn.WriteMessage(1, models.UnifiedCommand{
 			Action:  "notifications.new",
 			Payload: notification,
 		}.Marshal())
 	}
 
-	// Skip push notification when frontend notify is available
-	if frontendAvailable && !notification.IsForcePush {
-		return nil
-	}
+	// TODO Detect the push notification is turned off (still push when IsForcePush is on)
 
 	var subscribers []models.NotificationSubscriber
 	if err := database.C.Where(&models.NotificationSubscriber{