add contenthash to NewMessageFromPeer and NewMessageFromGroup
This commit is contained in:
parent
36631a9111
commit
d0b0752fe5
|
@ -261,6 +261,7 @@ const (
|
||||||
EventID = Field("EventID")
|
EventID = Field("EventID")
|
||||||
EventContext = Field("EventContext")
|
EventContext = Field("EventContext")
|
||||||
Index = Field("Index")
|
Index = Field("Index")
|
||||||
|
ContentHash = Field("ContentHash")
|
||||||
|
|
||||||
// Handle denotes a contact handle of any type.
|
// Handle denotes a contact handle of any type.
|
||||||
Handle = Field("Handle")
|
Handle = Field("Handle")
|
||||||
|
|
|
@ -1062,6 +1062,7 @@ func (cp *cwtchPeer) eventHandler() {
|
||||||
// Republish as NewMessageFromPeer
|
// Republish as NewMessageFromPeer
|
||||||
ev.EventType = event.NewMessageFromPeer
|
ev.EventType = event.NewMessageFromPeer
|
||||||
ev.Data[event.Index] = strconv.Itoa(id)
|
ev.Data[event.Index] = strconv.Itoa(id)
|
||||||
|
ev.Data[event.ContentHash] = model.CalculateContentHash(ev.Data[event.RemotePeer], ev.Data[event.Data])
|
||||||
cp.eventBus.Publish(ev)
|
cp.eventBus.Publish(ev)
|
||||||
}
|
}
|
||||||
case event.PeerAcknowledgement:
|
case event.PeerAcknowledgement:
|
||||||
|
@ -1252,9 +1253,10 @@ func (cp *cwtchPeer) attemptInsertOrAcknowledgeLegacyGroupConversation(conversat
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
cp.mutex.Lock()
|
cp.mutex.Lock()
|
||||||
id, err := cp.storage.InsertMessage(conversationID, 0, dm.Text, model.Attributes{constants.AttrAck: constants.True, "PreviousSignature": base64.StdEncoding.EncodeToString(dm.PreviousMessageSig), constants.AttrAuthor: dm.Onion, constants.AttrSentTimestamp: time.Unix(int64(dm.Timestamp), 0).Format(time.RFC3339Nano)}, signature, model.CalculateContentHash(dm.Onion, dm.Text))
|
contenthash := model.CalculateContentHash(dm.Onion, dm.Text)
|
||||||
|
id, err := cp.storage.InsertMessage(conversationID, 0, dm.Text, model.Attributes{constants.AttrAck: constants.True, "PreviousSignature": base64.StdEncoding.EncodeToString(dm.PreviousMessageSig), constants.AttrAuthor: dm.Onion, constants.AttrSentTimestamp: time.Unix(int64(dm.Timestamp), 0).Format(time.RFC3339Nano)}, signature, contenthash)
|
||||||
if err == nil {
|
if err == nil {
|
||||||
cp.eventBus.Publish(event.NewEvent(event.NewMessageFromGroup, map[event.Field]string{event.ConversationID: strconv.Itoa(conversationID), event.TimestampSent: time.Unix(int64(dm.Timestamp), 0).Format(time.RFC3339Nano), event.RemotePeer: dm.Onion, event.Index: strconv.Itoa(id), event.Data: dm.Text}))
|
cp.eventBus.Publish(event.NewEvent(event.NewMessageFromGroup, map[event.Field]string{event.ConversationID: strconv.Itoa(conversationID), event.TimestampSent: time.Unix(int64(dm.Timestamp), 0).Format(time.RFC3339Nano), event.RemotePeer: dm.Onion, event.Index: strconv.Itoa(id), event.Data: dm.Text, event.ContentHash: contenthash}))
|
||||||
}
|
}
|
||||||
cp.mutex.Unlock()
|
cp.mutex.Unlock()
|
||||||
return err
|
return err
|
||||||
|
|
Loading…
Reference in New Issue