cwtch.im
/
server
7
3
Fork 4
Code Issues 7 Pull Requests Releases 17 Wiki Activity

Fix infinite loop on fresh server #3

Merged
dan merged 1 commits from infnite-fix into trunk 2021-06-04 17:52:29 +00:00
Conversation 0 Commits 1 Files Changed 2 +10 -9
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
storage/message_store.go
View File

@ -72,7 +72,15 @@ func (s SqliteMessageStore) FetchMessagesFrom(signature []byte) []*groups.Encryp
return nil
}
defer rows.Close()
return s.compileRows(rows)
messages := s.compileRows(rows)
// if we don't have *any* messages then either the signature next existed
// or the server purged it...either way treat this as a full sync...
if len(messages) < 1 {
return s.FetchMessages()
}
return messages
}
func (s *SqliteMessageStore) compileRows(rows *sql.Rows) []*groups.EncryptedGroupMessage {
@ -92,13 +100,6 @@ func (s *SqliteMessageStore) compileRows(rows *sql.Rows) []*groups.EncryptedGrou
Ciphertext: rawCiphertext,
})
}
// if we don't have *any* messages then either the signature next existed
// or the server purged it...either way treat this as a full sync...
if len(messages) < 1 {
return s.FetchMessages()
}
return messages
}