Merge pull request #5 from mattermost/plt-3462

PLT-3462 Added the ability to clear notifications
mattermost · Aug 24, 2016 · 865a20d · 865a20d
2 parents f38b7a9 + dd46bcd
commit 865a20d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/server/push_notification.go b/server/push_notification.go
@@ -11,6 +11,8 @@ import (
 const (
 	PUSH_NOTIFY_APPLE   = "apple"
 	PUSH_NOTIFY_ANDROID = "android"
+	PUSH_TYPE_MESSAGE   = "message"
+	PUSH_TYPE_CLEAR     = "clear"
 )
 
 type PushNotification struct {
@@ -24,6 +26,7 @@ type PushNotification struct {
 	ContentAvailable int    `json:"cont_ava"`
 	ChannelId        string `json:"channel_id"`
 	ChannelName      string `json:"channel_name"`
+	Type             string `json:"type"`
 }
 
 func (me *PushNotification) ToJson() string {

diff --git a/server/server.go b/server/server.go
@@ -90,10 +90,16 @@ func handleSendNotification(w http.ResponseWriter, r *http.Request) {
 }
 
 func sendAndroidNotification(msg *PushNotification) {
-	data := map[string]interface{}{"message": emoji.Sprint(msg.Message), "channel_id": msg.ChannelId, "channel_name": msg.ChannelName}
-	regIDs := []string{msg.DeviceId}
+	var data map[string]interface{}
+	if msg.Type == PUSH_TYPE_CLEAR {
+		data = map[string]interface{}{"type": PUSH_TYPE_CLEAR, "channel_id": msg.ChannelId}
+	} else {
+		data = map[string]interface{}{"type": PUSH_TYPE_MESSAGE, "message": emoji.Sprint(msg.Message), "channel_id": msg.ChannelId, "channel_name": msg.ChannelName}
+	}
 
+	regIDs := []string{msg.DeviceId}
 	gcmMsg := gcm.NewMessage(data, regIDs...)
+
 	sender := &gcm.Sender{ApiKey: CfgPP.AndroidApiKey}
 
 	LogInfo("Sending android push notification")
@@ -105,16 +111,21 @@ func sendAndroidNotification(msg *PushNotification) {
 	}
 
 	if resp.Failure > 0 {
-		LogError(fmt.Sprintf("Android reponse: %v", resp))
+		LogError(fmt.Sprintf("Android response: %v", resp))
 	}
 }
 
 func sendAppleNotification(msg *PushNotification) {
 	payload := apns.NewPayload()
-	payload.Alert = emoji.Sprint(msg.Message)
+
+	if msg.Type != PUSH_TYPE_CLEAR {
+		payload.Alert = emoji.Sprint(msg.Message)
+		payload.Badge = msg.Badge
+		payload.Category = msg.Category
+		payload.Sound = "default"
+	}
+
 	payload.Badge = msg.Badge
-	payload.Category = msg.Category
-	payload.Sound = "default"
 
 	pn := apns.NewPushNotification()
 	pn.DeviceToken = msg.DeviceId