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

WIP

This commit is contained in:
Pascal Precht 2022-10-28 09:09:41 +02:00
parent b2d3e46e72
commit 419fd90bbe
No known key found for this signature in database
GPG Key ID: 3017C135E0731E5A
1 changed files with 69 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
protocol/messenger_handler.go
View File

@ -923,6 +923,11 @@ func (m *Messenger) HandleHistoryArchiveMagnetlinkMessage(state *ReceivedMessage
// part of and doesn't own the private key at the same time
if !signedByOwnedCommunity && joinedCommunity && clock >= lastClock {
err := m.communitiesManager.UpdateMagnetlinkMessageClock(id, clock)
if err != nil {
return err
}
m.communitiesManager.UnseedHistoryArchiveTorrent(id)
m.downloadHistoryArchiveTasksWaitGroup.Add(1)
go func() {
@ -943,7 +948,10 @@ func (m *Messenger) HandleHistoryArchiveMagnetlinkMessage(state *ReceivedMessage
}
}
messagesToHandle, err := m.communitiesManager.ExtractMessagesFromHistoryArchives(id, downloadedArchiveIDs)
var response *MessengerResponse
for _, archiveID := range downloadedArchiveIDs {
messagesToHandle, err := m.communitiesManager.ExtractMessagesFromHistoryArchives(id, []string{archiveID})
if err != nil {
log.Println("failed to extract history archive messages", err)
m.logger.Debug("failed to extract history archive messages", zap.Error(err))
@ -969,11 +977,45 @@ func (m *Messenger) HandleHistoryArchiveMagnetlinkMessage(state *ReceivedMessage
m.logger.Debug("failed to write history archive messages to database", zap.Error(err))
}
response, err := m.handleRetrievedMessages(otherMessages, false)
r, err := m.handleRetrievedMessages(otherMessages, false)
if err != nil {
log.Println("failed to write history archive messages to database", err)
m.logger.Debug("failed to write history archive messages to database", zap.Error(err))
}
response.Merge(r)
}
// messagesToHandle, err := m.communitiesManager.ExtractMessagesFromHistoryArchives(id, downloadedArchiveIDs)
// if err != nil {
// log.Println("failed to extract history archive messages", err)
// m.logger.Debug("failed to extract history archive messages", zap.Error(err))
// return
// }
// importedMessages := make(map[transport.Filter][]*types.Message, 0)
// otherMessages := make(map[transport.Filter][]*types.Message, 0)
// for filter, messages := range messagesToHandle {
// for _, message := range messages {
// if message.ThirdPartyID != "" {
// importedMessages[filter] = append(importedMessages[filter], message)
// } else {
// otherMessages[filter] = append(otherMessages[filter], message)
// }
// }
// }
// err = m.handleImportedMessages(importedMessages)
// if err != nil {
// log.Println("failed to handle imported messages", err)
// m.logger.Debug("failed to write history archive messages to database", zap.Error(err))
// }
// response, err := m.handleRetrievedMessages(otherMessages, false)
// if err != nil {
// log.Println("failed to write history archive messages to database", err)
// m.logger.Debug("failed to write history archive messages to database", zap.Error(err))
// }
if !response.IsEmpty() {
notifications := response.Notifications()
response.ClearNotifications()
@ -982,8 +1024,6 @@ func (m *Messenger) HandleHistoryArchiveMagnetlinkMessage(state *ReceivedMessage
}
m.config.messengerSignalsHandler.DownloadingHistoryArchivesFinished(types.EncodeHex(id))
}()
return m.communitiesManager.UpdateMagnetlinkMessageClock(id, clock)
}
}
return nil