status-im/status-go
2
0
Fork 0
mirror of https://github.com/status-im/status-go.git synced 2025-01-12 15:45:07 +00:00
Code Issues Projects Releases Wiki Activity

Set joined=message.clock on syncing pubchat creation

Browse Source
This commit is contained in:
Roman Volosovskyi 2021-12-17 15:57:54 +02:00
parent 91e9fb4804
commit 36b4ecabbf
No known key found for this signature in database
GPG Key ID: 0238A4B5ECEE70DE
6 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
0.92.5
0.92.6

10
protocol/messenger_chats.go
View File

@ -346,10 +346,10 @@ func (m *Messenger) DeactivateChat(request *requests.DeactivateChat) (*Messenger
return nil, err
}
return m.deactivateChat(request.ID, true)
return m.deactivateChat(request.ID, 0, true)
}
func (m *Messenger) deactivateChat(chatID string, shouldBeSynced bool) (*MessengerResponse, error) {
func (m *Messenger) deactivateChat(chatID string, deactivationClock uint64, shouldBeSynced bool) (*MessengerResponse, error) {
var response MessengerResponse
chat, ok := m.allChats.Load(chatID)
if !ok {
@ -375,9 +375,11 @@ func (m *Messenger) deactivateChat(chatID string, shouldBeSynced bool) (*Messeng
}
}
clock, _ := chat.NextClockAndTimestamp(m.getTimesource())
if deactivationClock == 0 {
deactivationClock, _ = chat.NextClockAndTimestamp(m.getTimesource())
}
err = m.persistence.DeactivateChat(chat, clock)
err = m.persistence.DeactivateChat(chat, deactivationClock)
if err != nil {
return nil, err

2
protocol/messenger_contacts.go
View File

@ -214,7 +214,7 @@ func (m *Messenger) removeContact(ctx context.Context, response *MessengerRespon
_, ok = m.allChats.Load(profileChatID)
if ok {
chatResponse, err := m.deactivateChat(profileChatID, false)
chatResponse, err := m.deactivateChat(profileChatID, 0, false)
if err != nil {
return err
}

5
protocol/messenger_handler.go
View File

@ -421,8 +421,9 @@ func (m *Messenger) HandleSyncInstallationPublicChat(state *ReceivedMessageState
chat := existingChat
if !ok {
chat = CreatePublicChat(chatID, state.Timesource)
chat.Joined = int64(message.Clock)
} else {
existingChat.Joined = int64(state.Timesource.GetCurrentTime())
existingChat.Joined = int64(message.Clock)
}
state.AllChats.Store(chat.ID, chat)
@ -448,7 +449,7 @@ func (m *Messenger) HandleSyncChatRemoved(state *ReceivedMessageState, message p
}
}
response, err := m.deactivateChat(message.Id, false)
response, err := m.deactivateChat(message.Id, message.Clock, false)
if err != nil {
return err
}

2
protocol/messenger_installations_test.go
View File

@ -163,7 +163,7 @@ func (s *MessengerInstallationSuite) TestSyncInstallation() {
chat2 := CreatePublicChat(removedChatID, s.m.transport)
err = s.m.SaveChat(chat2)
s.Require().NoError(err)
_, err = s.m.deactivateChat(removedChatID, true)
_, err = s.m.deactivateChat(removedChatID, 0, true)
s.Require().NoError(err)
// pair

2
protocol/messenger_sync_chat_test.go
View File

@ -121,7 +121,7 @@ func (s *MessengerSyncChatSuite) TestRemovePubChat() {
s.Pair()
_, err = s.alice1.deactivateChat(publicChatName, true)
_, err = s.alice1.deactivateChat(publicChatName, 0, true)
s.Require().NoError(err)
var allChats []*Chat