Optimize push deletion logic

Author: Finb

apns/apns.go

@@ -33,9 +33,8 @@ func (p PushMessage) IsEmptyAlert() bool {
 	return p.Title == "" && p.Body == "" && p.Subtitle == ""
 }
 
-// Check if it's an encrypted push notification
-func (p PushMessage) IsEncrypted() bool {
-	return p.ExtParams["ciphertext"] != nil
+func (p PushMessage) IsDelete() bool {
+	return p.ExtParams["delete"] == "1"
 }
 
 const (
@@ -107,8 +106,7 @@ func ReCreateAPNS(maxClientCount int) error {
 func Push(msg *PushMessage) error {
 	pl := payload.NewPayload().MutableContent()
 	pushType := apns2.PushTypeAlert
-
-	if msg.IsEmptyAlert() {
+	if msg.IsDelete() {
 		// Silent push notification
 		pl = pl.ContentAvailable()
 		pushType = apns2.PushTypeBackground

route_push.go

@@ -251,9 +251,9 @@ func push(params map[string]interface{}) (int, error) {
 		return 400, fmt.Errorf("device key is empty")
 	}
 
-	if msg.IsEmptyAlert() && msg.IsEncrypted() {
+	if msg.IsEmptyAlert() {
 		// For encrypted push notifications, a Body is required; otherwise, APNs will discard the notification
-		msg.Body = "Encrypted Message"
+		msg.Body = "Empty Message"
 	}
 
 	deviceToken, err := db.DeviceTokenByKey(msg.DeviceKey)