HyperNet/Messaging
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

✨ Quick reply api

Browse Source 
✨ Send event id in event notification
This commit is contained in:
LittleSheep
2024-12-21 18:16:47 +08:00
parent c02c8cb610
commit 24783a3b66
4 changed files with 104 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/internal/services/channels.go
View File

@ -3,12 +3,13 @@ package services
import (
"context"
"fmt"
"regexp"
localCache "git.solsynth.dev/hypernet/messaging/pkg/internal/cache"
authm "git.solsynth.dev/hypernet/passport/pkg/authkit/models"
"github.com/eko/gocache/lib/v4/cache"
"github.com/eko/gocache/lib/v4/marshaler"
"github.com/eko/gocache/lib/v4/store"
"regexp"
"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
@ -45,6 +46,19 @@ func CacheChannelIdentityCache(channel models.Channel, member models.ChannelMemb
)
}
func GetChannelIdentityWithID(id uint, user uint) (models.Channel, models.ChannelMember, error) {
var member models.ChannelMember
if err := database.C.Where(models.ChannelMember{
AccountID: user,
ChannelID: id,
}).Preload("Channel").First(&member).Error; err != nil {
return member.Channel, member, fmt.Errorf("channel principal not found: %v", err.Error())
}
return member.Channel, member, nil
}
func GetChannelIdentity(alias string, user uint, realm ...authm.Realm) (models.Channel, models.ChannelMember, error) {
cacheManager := cache.New[any](localCache.S)
marshal := marshaler.New(cacheManager)

28
pkg/internal/services/events.go
View File

@ -2,12 +2,13 @@ package services
import (
"fmt"
"strings"
"git.solsynth.dev/hypernet/messaging/pkg/internal/gap"
"git.solsynth.dev/hypernet/nexus/pkg/nex"
"git.solsynth.dev/hypernet/nexus/pkg/nex/cruda"
"git.solsynth.dev/hypernet/passport/pkg/authkit"
"git.solsynth.dev/hypernet/pusher/pkg/pushkit"
"strings"
"git.solsynth.dev/hypernet/messaging/pkg/internal/database"
"git.solsynth.dev/hypernet/messaging/pkg/internal/models"
@ -180,6 +181,15 @@ func NotifyMessageEvent(members []models.ChannelMember, event models.Event) {
displayTitle := fmt.Sprintf("%s (%s)", event.Sender.Nick, event.Channel.DisplayText())
metadata := map[string]any{
"avatar": event.Sender.Avatar,
"user_id": event.Sender.AccountID,
"user_name": event.Sender.Name,
"user_nick": event.Sender.Nick,
"channel_id": event.ChannelID,
"event_id": event.ID,
}
if len(pendingUsers) > 0 {
log.Debug().
Uint("event_id", event.ID).
@ -195,13 +205,7 @@ func NotifyMessageEvent(members []models.ChannelMember, event models.Event) {
Title: displayTitle,
Subtitle: displaySubtitle,
Body: displayText,
Metadata: map[string]any{
"avatar": event.Sender.Avatar,
"user_id": event.Sender.AccountID,
"user_name": event.Sender.Name,
"user_nick": event.Sender.Nick,
"channel_id": event.ChannelID,
},
Metadata: metadata,
Priority: 5,
},
true,
@ -232,13 +236,7 @@ func NotifyMessageEvent(members []models.ChannelMember, event models.Event) {
Title: displayTitle,
Subtitle: displaySubtitle,
Body: displayText,
Metadata: map[string]any{
"avatar": event.Sender.Avatar,
"user_id": event.Sender.AccountID,
"user_name": event.Sender.Name,
"user_nick": event.Sender.Nick,
"channel_id": event.ChannelID,
},
Metadata: metadata,
Priority: 5,
},
true,