Mikescher/SimpleCloudNotifier
1
0
Fork 0
Code Pull Requests Actions Releases Activity

Server: switch android back to data-only notifications

Browse Source
This commit is contained in:
Mike Schwörer 2024-06-15 18:24:33 +02:00
parent b0a6736f70
commit 63c25317eb
Signed by: Mikescher
GPG Key ID: D3C7172E0A70F8CF
1 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
scnserver/push/firebase.go
View File

@ -11,8 +11,10 @@ import (
"fmt" "fmt"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"gogs.mikescher.com/BlackForestBytes/goext/langext"
"io" "io"
"net/http" "net/http"
"strconv"
"strings" "strings"
"time" "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" uri := "https://fcm.googleapis.com/v1/projects/" + fb.fbProject + "/messages:send"
jsonBody := gin.H{ jsonBody := gin.H{}
"token": client.FCMToken,
}
if client.Type == models.ClientTypeIOS { if client.Type == models.ClientTypeIOS {
jsonBody["notification"] = gin.H{ jsonBody = gin.H{
"token": client.FCMToken,
"notification": gin.H{
"title": msg.Title, "title": msg.Title,
"body": msg.ShortContent(), "body": msg.ShortContent(),
},
"apns": gin.H{},
} }
jsonBody["apns"] = gin.H{}
} else if client.Type == models.ClientTypeAndroid { } else if client.Type == models.ClientTypeAndroid {
jsonBody["android"] = gin.H{ jsonBody = gin.H{
"token": client.FCMToken,
"android": gin.H{
"priority": "high", "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(), ""),
},
}
} else {
jsonBody = gin.H{
"token": client.FCMToken,
"notification": gin.H{ "notification": gin.H{
"event_time": msg.Timestamp().Format(time.RFC3339),
"title": msg.FormatNotificationTitle(user, channel), "title": msg.FormatNotificationTitle(user, channel),
"body": msg.ShortContent(), "body": msg.ShortContent(),
}, },
"fcm_options": gin.H{},
}
} else {
jsonBody["notification"] = gin.H{
"title": msg.FormatNotificationTitle(user, channel),
"body": msg.ShortContent(),
} }
} }