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

Fix bug with tracking & merge community changes

This commit is contained in:
Andrea Maria Piana 2022-09-15 15:13:35 +01:00
parent 824bb17ba9
commit a182f3e699
3 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.110.0 0.110.1

5
protocol/common/message_sender.go
View File

@ -275,7 +275,9 @@ func (s *MessageSender) sendCommunity(
return nil, err return nil, err
} }
} }
} else { return nil, nil
}
wrappedMessage, err := s.wrapMessageV1(rawMessage) wrappedMessage, err := s.wrapMessageV1(rawMessage)
if err != nil { if err != nil {
return nil, err return nil, err
@ -321,7 +323,6 @@ func (s *MessageSender) sendCommunity(
s.logger.Debug("sent community message ", zap.String("messageID", messageID.String()), zap.String("hash", types.EncodeHex(hash))) s.logger.Debug("sent community message ", zap.String("messageID", messageID.String()), zap.String("hash", types.EncodeHex(hash)))
} }
}
s.transport.Track(messageIDs, hash, newMessage) s.transport.Track(messageIDs, hash, newMessage)
return messageID, nil return messageID, nil
} }

5
protocol/messenger_response.go
View File

@ -255,10 +255,8 @@ func (r *MessengerResponse) Merge(response *MessengerResponse) error {
len(response.Bookmarks)+ len(response.Bookmarks)+
len(response.clearedHistories)+ len(response.clearedHistories)+
len(response.VerificationRequests)+ len(response.VerificationRequests)+
len(response.trustStatus)+
len(response.DiscordChannels)+ len(response.DiscordChannels)+
len(response.DiscordCategories)+ len(response.DiscordCategories) != 0 {
len(response.CommunityChanges) != 0 {
return ErrNotImplemented return ErrNotImplemented
} }
@ -272,6 +270,7 @@ func (r *MessengerResponse) Merge(response *MessengerResponse) error {
r.AddVerificationRequests(response.VerificationRequests) r.AddVerificationRequests(response.VerificationRequests)
r.AddTrustStatuses(response.trustStatus) r.AddTrustStatuses(response.trustStatus)
r.AddActivityCenterNotifications(response.ActivityCenterNotifications()) r.AddActivityCenterNotifications(response.ActivityCenterNotifications())
r.CommunityChanges = append(r.CommunityChanges, response.CommunityChanges...)
return nil return nil
} }