Fix infinite loop on fresh server
This commit is contained in:
parent
57ea60a4b1
commit
1aa4d13204
|
@ -109,7 +109,7 @@ func (ta *TokenboardServer) postMessageRequest(pr groups.PostRequest) {
|
|||
if err := ta.TokenService.SpendToken(pr.Token, append(pr.EGM.ToBytes(), ta.connection.ID().Hostname()...)); err == nil {
|
||||
|
||||
// ignore messages with no signatures
|
||||
if len(pr.EGM.Signature) == 0 {
|
||||
if len(pr.EGM.Signature) == 0 {
|
||||
return
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue