chore: `forceFetchingBackup` param added to `RequestAllHistoricMessages` and `RequestAllHistoricMessagesWithRetries` functions
This commit is contained in:
parent
4eb3d7485a
commit
56cad423f0
|
@ -834,7 +834,7 @@ func (m *Messenger) handleConnectionChange(online bool) {
|
||||||
m.shouldPublishContactCode = false
|
m.shouldPublishContactCode = false
|
||||||
}
|
}
|
||||||
go func() {
|
go func() {
|
||||||
_, err := m.RequestAllHistoricMessagesWithRetries()
|
_, err := m.RequestAllHistoricMessagesWithRetries(false)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
m.logger.Warn("failed to fetch historic messages", zap.Error(err))
|
m.logger.Warn("failed to fetch historic messages", zap.Error(err))
|
||||||
}
|
}
|
||||||
|
|
|
@ -294,12 +294,12 @@ func (m *Messenger) resetFiltersPriority(filters []*transport.Filter) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Messenger) RequestAllHistoricMessagesWithRetries() (*MessengerResponse, error) {
|
func (m *Messenger) RequestAllHistoricMessagesWithRetries(forceFetchingBackup bool) (*MessengerResponse, error) {
|
||||||
return m.performMailserverRequest(m.RequestAllHistoricMessages)
|
return m.performMailserverRequest(func() (*MessengerResponse, error) { return m.RequestAllHistoricMessages(forceFetchingBackup) })
|
||||||
}
|
}
|
||||||
|
|
||||||
// RequestAllHistoricMessages requests all the historic messages for any topic
|
// RequestAllHistoricMessages requests all the historic messages for any topic
|
||||||
func (m *Messenger) RequestAllHistoricMessages() (*MessengerResponse, error) {
|
func (m *Messenger) RequestAllHistoricMessages(forceFetchingBackup bool) (*MessengerResponse, error) {
|
||||||
shouldSync, err := m.shouldSync()
|
shouldSync, err := m.shouldSync()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
|
@ -314,7 +314,7 @@ func (m *Messenger) RequestAllHistoricMessages() (*MessengerResponse, error) {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
if !backupFetched {
|
if forceFetchingBackup || !backupFetched {
|
||||||
m.logger.Info("fetching backup")
|
m.logger.Info("fetching backup")
|
||||||
err := m.syncBackup()
|
err := m.syncBackup()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -515,7 +515,7 @@ func (m *Messenger) handleMailserverCycleEvent(connectedPeers []ConnectedPeer) e
|
||||||
}
|
}
|
||||||
// Query mailserver
|
// Query mailserver
|
||||||
go func() {
|
go func() {
|
||||||
_, err := m.performMailserverRequest(m.RequestAllHistoricMessages)
|
_, err := m.performMailserverRequest(func() (*MessengerResponse, error) { return m.RequestAllHistoricMessages(false) })
|
||||||
if err != nil {
|
if err != nil {
|
||||||
m.logger.Error("could not perform mailserver request", zap.Error(err))
|
m.logger.Error("could not perform mailserver request", zap.Error(err))
|
||||||
}
|
}
|
||||||
|
|
|
@ -1172,12 +1172,12 @@ func (api *PublicAPI) DeleteActivityCenterNotifications(ctx context.Context, ids
|
||||||
return api.service.messenger.DeleteActivityCenterNotifications(ctx, ids, false)
|
return api.service.messenger.DeleteActivityCenterNotifications(ctx, ids, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (api *PublicAPI) RequestAllHistoricMessages() (*protocol.MessengerResponse, error) {
|
func (api *PublicAPI) RequestAllHistoricMessages(forceFetchingBackup bool) (*protocol.MessengerResponse, error) {
|
||||||
return api.service.messenger.RequestAllHistoricMessages()
|
return api.service.messenger.RequestAllHistoricMessages(forceFetchingBackup)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (api *PublicAPI) RequestAllHistoricMessagesWithRetries() (*protocol.MessengerResponse, error) {
|
func (api *PublicAPI) RequestAllHistoricMessagesWithRetries(forceFetchingBackup bool) (*protocol.MessengerResponse, error) {
|
||||||
return api.service.messenger.RequestAllHistoricMessagesWithRetries()
|
return api.service.messenger.RequestAllHistoricMessagesWithRetries(forceFetchingBackup)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (api *PublicAPI) DisconnectActiveMailserver() {
|
func (api *PublicAPI) DisconnectActiveMailserver() {
|
||||||
|
|
Loading…
Reference in New Issue