status-im
/
status-go
mirror of https://github.com/status-im/status-go.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Added emoji reaction JSON RPC un/marshalling

This commit is contained in:
Samuel Hawksby-Robinson 2020-07-10 13:54:08 +01:00 committed by Andrea Maria Piana
parent 39bd6d479a
commit 8089468e83
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
protocol/message.go
View File

@ -122,6 +122,14 @@ func (m *Message) MarshalJSON() ([]byte, error) {
Hash string `json:"hash"` Hash string `json:"hash"`
Pack int32 `json:"pack"` Pack int32 `json:"pack"`
} }
type EmojiReactionAlias struct {
MessageId string `json:"message_id"`
Type int32 `json:"type"`
}
type EmojiReactionRetractionAlias struct {
EmojiReactionId string `json:"emoji_reaction_id"`
}
item := struct { item := struct {
ID string `json:"id"` ID string `json:"id"`
WhisperTimestamp uint64 `json:"whisperTimestamp"` WhisperTimestamp uint64 `json:"whisperTimestamp"`
@ -206,8 +214,14 @@ func (m *Message) UnmarshalJSON(data []byte) error {
if err := json.Unmarshal(data, &aux); err != nil { if err := json.Unmarshal(data, &aux); err != nil {
return err return err
} }
if aux.ContentType == protobuf.ChatMessage_STICKER {
switch aux.ContentType {
case protobuf.ChatMessage_STICKER:
m.Payload = &protobuf.ChatMessage_Sticker{Sticker: aux.Sticker} m.Payload = &protobuf.ChatMessage_Sticker{Sticker: aux.Sticker}
case protobuf.ChatMessage_EMOJI_REACTION:
m.Payload = &protobuf.ChatMessage_EmojiReaction{EmojiReaction: aux.EmojiReaction}
case protobuf.ChatMessage_EMOJI_REACTION_RETRACTION:
m.Payload = &protobuf.ChatMessage_EmojiReactionRetraction{EmojiReactionRetraction: aux.EmojiReactionRetraction}
} }
if aux.ContentType == protobuf.ChatMessage_AUDIO { if aux.ContentType == protobuf.ChatMessage_AUDIO {
m.Payload = &protobuf.ChatMessage_Audio{ m.Payload = &protobuf.ChatMessage_Audio{