DeforaNetworks/corteza
DeforaNetworks/corteza
3
0
Fork 0
Code

Fix for message service - broadcast messages with loaded attachments

Browse Source
This commit is contained in:
Denis Arh 2018-10-25 11:07:46 +02:00
parent 31c38f683c
commit 0b3ebc9996
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sam/service/message.go
View File

@ -88,27 +88,39 @@ func (svc *message) Find(filter *types.MessageFilter) (mm types.MessageSet, err
return nil, err
}
mm.Walk(func(i *types.Message) (err error) {
err = mm.Walk(func(i *types.Message) (err error) {
i.User, err = svc.usr.FindByID(i.UserID)
return
})
if err != nil {
return
}
return mm, svc.loadAttachments(mm)
}
func (svc *message) loadAttachments(mm types.MessageSet) (err error) {
var ids []uint64
mm.Walk(func(m *types.Message) error {
var (
ids []uint64
aa types.MessageAttachmentSet
)
err = mm.Walk(func(m *types.Message) error {
if m.Type == types.MessageTypeAttachment || m.Type == types.MessageTypeInlineImage {
ids = append(ids, m.ID)
}
return nil
})
if set, err := svc.attachment.FindAttachmentByMessageID(ids...); err != nil {
return err
if err != nil {
return
}
if aa, err = svc.attachment.FindAttachmentByMessageID(ids...); err != nil {
return
} else {
return set.Walk(func(a *types.MessageAttachment) error {
return aa.Walk(func(a *types.MessageAttachment) error {
if a.MessageID > 0 {
if m := mm.FindById(a.MessageID); m != nil {
m.Attachment = &a.Attachment
@ -337,8 +349,10 @@ func (svc *message) Unflag(messageID uint64) error {
// Sends message to event loop
//
// It also preloads user
func (svc *message) sendEvent(messages ...*types.Message) (err error) {
for _, msg := range messages {
func (svc *message) sendEvent(mm ...*types.Message) (err error) {
svc.loadAttachments(mm)
for _, msg := range mm {
if msg.User == nil {
// @todo pull user from cache
if msg.User, err = svc.usr.FindByID(msg.UserID); err != nil {