Merge branch 'ebf201902221553' of cwtch.im/ui into master
This commit is contained in:
commit
0fc8fc342b
|
@ -40,6 +40,18 @@ func IncomingListener(callback func(*gobjects.Message), groupErrorCallback func(
|
||||||
the.Peer.SendMessageToPeer(e.Data[event.RemotePeer], "ack")
|
the.Peer.SendMessageToPeer(e.Data[event.RemotePeer], "ack")
|
||||||
}
|
}
|
||||||
case event.NewMessageFromGroup://event.TimestampReceived, event.TimestampSent, event.Data, event.GroupID, event.RemotePeer
|
case event.NewMessageFromGroup://event.TimestampReceived, event.TimestampSent, event.Data, event.GroupID, event.RemotePeer
|
||||||
|
var name string
|
||||||
|
var exists bool
|
||||||
|
ctc := the.Peer.GetContact(e.Data[event.RemotePeer])
|
||||||
|
if ctc != nil {
|
||||||
|
name, exists = ctc.GetAttribute("nick")
|
||||||
|
if !exists || name == "" {
|
||||||
|
name = e.Data[event.RemotePeer] + "..."
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
name = e.Data[event.RemotePeer] + "..."
|
||||||
|
}
|
||||||
|
|
||||||
ts, _ := time.Parse(time.RFC3339Nano, e.Data[event.TimestampSent])
|
ts, _ := time.Parse(time.RFC3339Nano, e.Data[event.TimestampSent])
|
||||||
callback(&gobjects.Message{
|
callback(&gobjects.Message{
|
||||||
MessageID: e.Data[event.Signature],
|
MessageID: e.Data[event.Signature],
|
||||||
|
@ -50,6 +62,7 @@ func IncomingListener(callback func(*gobjects.Message), groupErrorCallback func(
|
||||||
FromMe: e.Data[event.RemotePeer] == the.Peer.GetProfile().Onion,
|
FromMe: e.Data[event.RemotePeer] == the.Peer.GetProfile().Onion,
|
||||||
Timestamp: ts,
|
Timestamp: ts,
|
||||||
Acknowledged: true,
|
Acknowledged: true,
|
||||||
|
DisplayName: name,
|
||||||
})
|
})
|
||||||
case event.NewGroupInvite:
|
case event.NewGroupInvite:
|
||||||
log.Debugf("got a group invite!")
|
log.Debugf("got a group invite!")
|
||||||
|
|
Reference in New Issue