Send channel as prefix for compat clients

scnserver/api/ginresp/wrapper.go

@@ -11,6 +11,7 @@ import (
 	"github.com/rs/zerolog/log"
 	"gogs.mikescher.com/BlackForestBytes/goext/dataext"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
+	"runtime/debug"
 	"time"
 )
 
@@ -37,10 +38,11 @@ func Wrap(rlacc RequestLogAcceptor, fn WHandlerFunc) gin.HandlerFunc {
 
 		for ctr := 1; ; ctr++ {
 
-			wrap, panicObj := callPanicSafe(fn, g)
+			wrap, stackTrace, panicObj := callPanicSafe(fn, g)
 			if panicObj != nil {
 				log.Error().Interface("panicObj", panicObj).Msg("Panic occured (in gin handler)")
-				wrap = APIError(g, 500, apierr.PANIC, "A panic occured in the HTTP handler", errors.New(fmt.Sprintf("%+v", panicObj)))
+				log.Error().Msg(stackTrace)
+				wrap = APIError(g, 500, apierr.PANIC, "A panic occured in the HTTP handler", errors.New(fmt.Sprintf("%+v\n\n@:\n%s", panicObj, stackTrace)))
 			}
 
 			if g.Writer.Written() {
@@ -138,16 +140,17 @@ func createRequestLog(g *gin.Context, t0 time.Time, ctr int, resp HTTPResponse,
 	}
 }
 
-func callPanicSafe(fn WHandlerFunc, g *gin.Context) (res HTTPResponse, panicObj any) {
+func callPanicSafe(fn WHandlerFunc, g *gin.Context) (res HTTPResponse, stackTrace string, panicObj any) {
 	defer func() {
 		if rec := recover(); rec != nil {
 			res = nil
+			stackTrace = string(debug.Stack())
 			panicObj = rec
 		}
 	}()
 
 	res = fn(g)
-	return res, nil
+	return res, "", nil
 }
 
 func resetBody(g *gin.Context) error {

scnserver/api/handler/compat.go

@@ -9,6 +9,7 @@ import (
 	"blackforestbytes.com/simplecloudnotifier/logic"
 	"blackforestbytes.com/simplecloudnotifier/models"
 	"database/sql"
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"gogs.mikescher.com/BlackForestBytes/goext/dataext"
 	"gogs.mikescher.com/BlackForestBytes/goext/langext"
@@ -540,7 +541,7 @@ func (h CompatHandler) Requery(g *gin.Context) ginresp.HTTPResponse {
 		}
 
 		compMsgs = append(compMsgs, models.CompatMessage{
-			Title:         v.Title,
+			Title:         compatizeMessageTitle(ctx, h.app, v),
 			Body:          v.Content,
 			Priority:      v.Priority,
 			Timestamp:     v.Timestamp().Unix(),
@@ -788,7 +789,7 @@ func (h CompatHandler) Expand(g *gin.Context) ginresp.HTTPResponse {
 		Success: true,
 		Message: "ok",
 		Data: models.CompatMessage{
-			Title:         msg.Title,
+			Title:         compatizeMessageTitle(ctx, h.app, msg),
 			Body:          msg.Content,
 			Trimmed:       langext.Ptr(false),
 			Priority:      msg.Priority,
@@ -935,3 +936,16 @@ func (h CompatHandler) Upgrade(g *gin.Context) ginresp.HTTPResponse {
 		IsPro:     user.IsPro,
 	}))
 }
+
+func compatizeMessageTitle(ctx *logic.AppContext, app *logic.Application, msg models.Message) string {
+	if msg.ChannelInternalName == "main" {
+		return msg.Title
+	}
+
+	channel, err := app.Database.Primary.GetChannelByID(ctx, msg.ChannelID)
+	if err != nil {
+		return fmt.Sprintf("[%s] %s", "%SCN-ERR%", msg.Title)
+	}
+
+	return fmt.Sprintf("[%s] %s", channel.DisplayName, msg.Title)
+}

scnserver/api/handler/message.go

@@ -284,7 +284,17 @@ func (h MessageHandler) sendMessageInternal(g *gin.Context, ctx *logic.AppContex
 
 		for _, client := range clients {
 
-			fcmDelivID, err := h.app.DeliverMessage(ctx, client, msg)
+			isCompatClient, err := h.database.IsCompatClient(ctx, client.ClientID)
+			if err != nil {
+				return nil, langext.Ptr(ginresp.SendAPIError(g, 500, apierr.DATABASE_ERROR, hl.NONE, "Failed to query compat_clients", err))
+			}
+
+			var titleOverride *string = nil
+			if isCompatClient {
+				titleOverride = langext.Ptr(compatizeMessageTitle(ctx, h.app, msg))
+			}
+
+			fcmDelivID, err := h.app.DeliverMessage(ctx, client, msg, titleOverride)
 			if err != nil {
 				_, err = h.database.CreateRetryDelivery(ctx, client, msg)
 				if err != nil {