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

camel case emojiReactions

This commit is contained in:
Andrea Maria Piana 2020-07-28 13:37:17 +02:00
parent a1a6e1c6c0
commit 7e7d95a907
No known key found for this signature in database
GPG Key ID: AA6CCA6DE0E06424
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
protocol/emoji_reaction.go
View File

@ -53,17 +53,25 @@ func (e *EmojiReaction) SetMessageType(messageType protobuf.MessageType) {
func (e EmojiReaction) MarshalJSON() ([]byte, error) {
type EmojiAlias EmojiReaction
item := struct {
EmojiAlias
ID string `json:"id"`
EmojiID protobuf.EmojiReaction_Type `json:"emojiId"`
ID string `json:"id"`
Clock uint64 `json:"clock,omitempty"`
ChatID string `json:"chatId,omitempty"`
LocalChatID string `json:"localChatId,omitempty"`
From string `json:"from"`
MessageID string `json:"messageId,omitempty"`
MessageType protobuf.MessageType `json:"messageType,omitempty"`
EmojiID protobuf.EmojiReaction_Type `json:"emojiId,omitempty"`
}{
EmojiAlias: (EmojiAlias)(e),
ID: e.ID(),
EmojiID: e.Type,
}
// cleanup type
item.Type = 0
ID: e.ID(),
Clock: e.Clock,
ChatID: e.ChatId,
LocalChatID: e.LocalChatID,
From: e.From,
MessageID: e.MessageId,
MessageType: e.MessageType,
EmojiID: e.Type,
}
return json.Marshal(item)
}