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

Revert "Revert "fix protocol.MessageNotificationBody marshalling"" 

This reverts commit cf0a16dff1.
This commit is contained in:
Andrea Maria Piana 2021-01-26 12:49:50 +01:00 committed by Roman Volosovskyi
parent 84db2fb472
commit eec9518825
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
protocol/local_notifications.go
View File

@ -3,7 +3,7 @@ package protocol
import "github.com/status-im/status-go/protocol/common" import "github.com/status-im/status-go/protocol/common"
type MessageNotificationBody struct { type MessageNotificationBody struct {
Message *common.Message Message *common.Message `json:"message"`
Contact *Contact Contact *Contact `json:"contact"`
Chat *Chat Chat *Chat `json:"chat"`
} }

6
services/local-notifications/core.go
View File

@ -137,7 +137,7 @@ func (n *Notification) MarshalJSON() ([]byte, error) {
switch n.BodyType { switch n.BodyType {
case TypeTransaction: case TypeTransaction:
if nb, ok := n.Body.(*notificationBody); ok { if nb, ok := n.Body.(notificationBody); ok {
body, err = json.Marshal(nb) body, err = json.Marshal(nb)
if err != nil { if err != nil {
return nil, err return nil, err
@ -147,7 +147,7 @@ func (n *Notification) MarshalJSON() ([]byte, error) {
} }
case TypeMessage: case TypeMessage:
if nmb, ok := n.Body.(*protocol.MessageNotificationBody); ok { if nmb, ok := n.Body.(protocol.MessageNotificationBody); ok {
body, err = json.Marshal(nmb) body, err = json.Marshal(nmb)
if err != nil { if err != nil {
return nil, err return nil, err
@ -273,7 +273,7 @@ func (s *Service) buildTransactionNotification(rawTransfer wallet.Transfer) *Not
return &Notification{ return &Notification{
BodyType: TypeTransaction, BodyType: TypeTransaction,
ID: transfer.ID, ID: transfer.ID,
Body: &body, Body: body,
Deeplink: deeplink, Deeplink: deeplink,
Category: CategoryTransaction, Category: CategoryTransaction,
} }