From 533745e0e4c3fbe95fa1bc701e6a8a41a7acf0f3 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Fri, 7 Jun 2024 20:50:27 +0800
Subject: [PATCH] :bug: Bug fix and fix

---
 .idea/workspace.xml           | 8 ++++----
 pkg/services/notifications.go | 5 ++++-
 settings.toml                 | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 30172ca..33721c5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,10 +4,10 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":sparkles: Apple push notification services">
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Bug fixes">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/grpc/notify.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/grpc/notify.go" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pkg/services/notifications.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/services/notifications.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/settings.toml" beforeDir="false" afterPath="$PROJECT_DIR$/settings.toml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -142,7 +142,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value=":sparkles: Batch mark notify as read API" />
     <MESSAGE value=":bug: Bug fixes of risk detection&#10;:lipstick: Optimized UI" />
     <MESSAGE value=":sparkles: Realm in passport" />
     <MESSAGE value=":sparkles: Realm GRPC" />
@@ -167,7 +166,8 @@
     <MESSAGE value=":bug: Bug fixes in update avatar" />
     <MESSAGE value=":sparkles: Firebase is back" />
     <MESSAGE value=":sparkles: Apple push notification services" />
-    <option name="LAST_COMMIT_MESSAGE" value=":sparkles: Apple push notification services" />
+    <MESSAGE value=":bug: Bug fixes" />
+    <option name="LAST_COMMIT_MESSAGE" value=":bug: Bug fixes" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/pkg/services/notifications.go b/pkg/services/notifications.go
index ddfdd3e..2974ad7 100644
--- a/pkg/services/notifications.go
+++ b/pkg/services/notifications.go
@@ -8,6 +8,7 @@ import (
 	"github.com/rs/zerolog/log"
 	"github.com/sideshow/apns2"
 	payload2 "github.com/sideshow/apns2/payload"
+	"github.com/spf13/viper"
 	"reflect"
 )
 
@@ -112,13 +113,15 @@ func PushNotification(notification models.Notification) error {
 					NewPayload().
 					AlertTitle(notification.Subject).
 					AlertBody(notification.Content).
+					Badge(1).
 					MarshalJSON()
 				if err != nil {
 					log.Warn().Err(err).Msg("An error occurred when preparing to notify subscriber via APNs...")
 				}
 				payload := &apns2.Notification{
+					ApnsID:      subscriber.DeviceID,
 					DeviceToken: subscriber.DeviceToken,
-					Topic:       "dev.solsynth.solian",
+					Topic:       viper.GetString("apns_topic"),
 					Payload:     data,
 				}
 
diff --git a/settings.toml b/settings.toml
index 263d49b..b72b3bf 100644
--- a/settings.toml
+++ b/settings.toml
@@ -6,6 +6,7 @@ grpc_bind = "0.0.0.0:7444"
 domain = "localhost"
 secret = "LtTjzAGFLshwXhN4ZD4nG5KlMv1MWcsvfv03TSZYnT1VhiAnLIZFTnHUwR0XhGgi"
 
+apns_topic = "dev.solsynth.solian.Runner"
 apns_credentials = ""
 apns_credentials_team = "000000000"
 apns_credentials_key = "000000000"