From 63c25317eb67628e85e8e2f4628fdf9843444125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= <pubgit@mikescher.com>
Date: Sat, 15 Jun 2024 18:24:33 +0200
Subject: [PATCH] Server: switch android back to data-only notifications

---
 scnserver/push/firebase.go | 51 ++++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/scnserver/push/firebase.go b/scnserver/push/firebase.go
index 90030ae..75c3644 100644
--- a/scnserver/push/firebase.go
+++ b/scnserver/push/firebase.go
@@ -11,8 +11,10 @@ import (
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/rs/zerolog/log"
+	"gogs.mikescher.com/BlackForestBytes/goext/langext"
 	"io"
 	"net/http"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -55,30 +57,43 @@ func (fb FirebaseConnector) SendNotification(ctx context.Context, user models.Us
 
 	uri := "https://fcm.googleapis.com/v1/projects/" + fb.fbProject + "/messages:send"
 
-	jsonBody := gin.H{
-		"token": client.FCMToken,
-	}
+	jsonBody := gin.H{}
 
 	if client.Type == models.ClientTypeIOS {
-		jsonBody["notification"] = gin.H{
-			"title": msg.Title,
-			"body":  msg.ShortContent(),
-		}
-		jsonBody["apns"] = gin.H{}
-	} else if client.Type == models.ClientTypeAndroid {
-		jsonBody["android"] = gin.H{
-			"priority": "high",
+		jsonBody = gin.H{
+			"token": client.FCMToken,
 			"notification": gin.H{
-				"event_time": msg.Timestamp().Format(time.RFC3339),
-				"title":      msg.FormatNotificationTitle(user, channel),
-				"body":       msg.ShortContent(),
+				"title": msg.Title,
+				"body":  msg.ShortContent(),
+			},
+			"apns": gin.H{},
+		}
+	} else if client.Type == models.ClientTypeAndroid {
+		jsonBody = gin.H{
+			"token": client.FCMToken,
+			"android": gin.H{
+				"priority":    "high",
+				"fcm_options": gin.H{},
+			},
+			"data": gin.H{
+				"scn_msg_id": msg.MessageID.String(),
+				"usr_msg_id": langext.Coalesce(msg.UserMessageID, ""),
+				"client_id":  client.ClientID.String(),
+				"timestamp":  strconv.FormatInt(msg.Timestamp().Unix(), 10),
+				"priority":   strconv.Itoa(msg.Priority),
+				"trimmed":    langext.Conditional(msg.NeedsTrim(), "true", "false"),
+				"title":      msg.Title,
+				"channel":    channel.DisplayName,
+				"body":       langext.Coalesce(msg.TrimmedContent(), ""),
 			},
-			"fcm_options": gin.H{},
 		}
 	} else {
-		jsonBody["notification"] = gin.H{
-			"title": msg.FormatNotificationTitle(user, channel),
-			"body":  msg.ShortContent(),
+		jsonBody = gin.H{
+			"token": client.FCMToken,
+			"notification": gin.H{
+				"title": msg.FormatNotificationTitle(user, channel),
+				"body":  msg.ShortContent(),
+			},
 		}
 	}