🐛 Fix message notification show original content
This commit is contained in:
parent
18af7eae81
commit
f38aab68cd
@ -4,6 +4,8 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"git.solsynth.dev/hydrogen/messaging/pkg/database"
|
"git.solsynth.dev/hydrogen/messaging/pkg/database"
|
||||||
"git.solsynth.dev/hydrogen/messaging/pkg/models"
|
"git.solsynth.dev/hydrogen/messaging/pkg/models"
|
||||||
|
"github.com/gofiber/fiber/v2"
|
||||||
|
jsoniter "github.com/json-iterator/go"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -76,6 +78,9 @@ func GetMessageWithPrincipal(channel models.Channel, member models.ChannelMember
|
|||||||
}
|
}
|
||||||
|
|
||||||
func NewMessage(message models.Message) (models.Message, error) {
|
func NewMessage(message models.Message) (models.Message, error) {
|
||||||
|
var decodedContent fiber.Map
|
||||||
|
_ = jsoniter.Unmarshal(message.Content, &decodedContent)
|
||||||
|
|
||||||
var members []models.ChannelMember
|
var members []models.ChannelMember
|
||||||
if err := database.C.Save(&message).Error; err != nil {
|
if err := database.C.Save(&message).Error; err != nil {
|
||||||
return message, err
|
return message, err
|
||||||
@ -88,9 +93,13 @@ func NewMessage(message models.Message) (models.Message, error) {
|
|||||||
if member.ID != message.Sender.ID {
|
if member.ID != message.Sender.ID {
|
||||||
// TODO Check the mentioned status
|
// TODO Check the mentioned status
|
||||||
if member.Notify == models.NotifyLevelAll {
|
if member.Notify == models.NotifyLevelAll {
|
||||||
|
displayText := "*encrypted message*"
|
||||||
|
if decodedContent["algorithm"] == "plain" {
|
||||||
|
displayText, _ = decodedContent["value"].(string)
|
||||||
|
}
|
||||||
err = NotifyAccount(member.Account,
|
err = NotifyAccount(member.Account,
|
||||||
fmt.Sprintf("New Message #%s", channel.Alias),
|
fmt.Sprintf("New Message #%s", channel.Alias),
|
||||||
fmt.Sprintf("%s: %s", message.Sender.Account.Name, message.Content),
|
fmt.Sprintf("%s: %s", message.Sender.Account.Name, displayText),
|
||||||
true,
|
true,
|
||||||
)
|
)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
Loading…
Reference in New Issue
Block a user