Handle test notifications

mattermost · Feb 23, 2022 · 36bd327 · 36bd327
1 parent f181455
commit 36bd327
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/server/android_notification_server.go b/server/android_notification_server.go
@@ -40,12 +40,15 @@ func (me *AndroidNotificationServer) SendNotification(msg *PushNotification) Pus
 	data := map[string]interface{}{
 		"ack_id":         msg.AckID,
 		"type":           pushType,
-		"badge":          msg.Badge,
 		"version":        msg.Version,
 		"channel_id":     msg.ChannelID,
 		"is_crt_enabled": msg.IsCRTEnabled,
 	}
 
+	if msg.Badge != -1 {
+		data["badge"] = msg.Badge
+	}
+
 	if msg.RootID != "" {
 		data["root_id"] = msg.RootID
 	}

diff --git a/server/apple_notification_server.go b/server/apple_notification_server.go
@@ -80,7 +80,9 @@ func (me *AppleNotificationServer) Initialize() bool {
 func (me *AppleNotificationServer) SendNotification(msg *PushNotification) PushResponse {
 
 	data := payload.NewPayload()
-	data.Badge(msg.Badge)
+	if msg.Badge != -1 {
+		data.Badge(msg.Badge)
+	}
 
 	notification := &apns.Notification{}
 	notification.DeviceToken = msg.DeviceID
@@ -114,7 +116,7 @@ func (me *AppleNotificationServer) SendNotification(msg *PushNotification) PushR
 					data.Custom("channel_name", msg.ChannelName)
 				}
 			}
-		case PushTypeClear:
+		case PushTypeClear, PushTypeTest:
 			data.ContentAvailable()
 		case PushTypeUpdateBadge:
 			// Handled by the apps, nothing else to do here

diff --git a/server/push_notification.go b/server/push_notification.go
@@ -16,6 +16,7 @@ const (
 	PushTypeClear       = "clear"
 	PushTypeUpdateBadge = "update_badge"
 	PushTypeSession     = "session"
+	PushTypeTest        = "test"
 
 	PushMessageV2 = "v2"