updating eventbus fields

This commit is contained in:
erinn 2019-01-22 11:12:20 -08:00
parent e19711e599
commit cea689e832
1 changed files with 14 additions and 15 deletions

View File

@ -5,7 +5,6 @@ import (
"cwtch.im/ui/go/cwutil" "cwtch.im/ui/go/cwutil"
"cwtch.im/ui/go/gobjects" "cwtch.im/ui/go/gobjects"
"cwtch.im/ui/go/the" "cwtch.im/ui/go/the"
"git.openprivacy.ca/openprivacy/libricochet-go/log"
"time" "time"
) )
@ -16,25 +15,25 @@ func IncomingListener(callback func(*gobjects.Message)) {
for { for {
e := q.Next() e := q.Next()
log.Debugf("got event %s", e.EventType)
switch e.EventType { switch e.EventType {
case event.NewMessageFromPeer: case event.NewMessageFromPeer://event.TimestampReceived, event.RemotePeer, event.Data
ts, _ := time.Parse(time.RFC3339Nano, e.Data[event.TimestampReceived])
callback(&gobjects.Message{ callback(&gobjects.Message{
Handle: e.Data["Onion"], Handle: e.Data[event.RemotePeer],
From: e.Data["Onion"], From: e.Data[event.RemotePeer],
Message: e.Data["Data"], Message: e.Data[event.Data],
Image: cwutil.RandomProfileImage(e.Data["Onion"]), Image: cwutil.RandomProfileImage(e.Data[event.RemotePeer]),
Timestamp: time.Now(), Timestamp: ts,
}) })
case event.NewMessageFromGroup: case event.NewMessageFromGroup://event.TimestampReceived, event.TimestampSent, event.Data, event.GroupID, event.RemotePeer
log.Debugf("NewMessageFromGroup!") ts, _ := time.Parse(time.RFC3339Nano, e.Data[event.TimestampReceived])
callback(&gobjects.Message{ callback(&gobjects.Message{
Handle: e.Data["GroupID"], Handle: e.Data[event.GroupID],
From: e.Data["Onion"], From: e.Data[event.RemotePeer],
Message: e.Data["Data"], Message: e.Data[event.Data],
Image: cwutil.RandomGroupImage(e.Data["GroupID"]), Image: cwutil.RandomGroupImage(e.Data[event.GroupID]),
Timestamp: time.Now(), Timestamp: ts,
}) })
} }
} }