MirrorHub/dendrite
0
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-11-07 16:39:02 +01:00
Code Issues Releases Wiki Activity

Use default sync filter if specified filter is not found (should fix #2350) (#2351)

Browse source
This commit is contained in:
Neil Alexander 2022-04-13 16:41:22 +01:00 committed by GitHub
parent 1140f39993
commit 3a5e9a0f28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
syncapi/sync/request.go
View file

@ -15,6 +15,7 @@
package sync
import (
"database/sql"
"encoding/json"
"fmt"
"net/http"
@ -60,10 +61,10 @@ func newSyncRequest(req *http.Request, device userapi.Device, syncDB storage.Dat
util.GetLogger(req.Context()).WithError(err).Error("gomatrixserverlib.SplitID failed")
return nil, fmt.Errorf("gomatrixserverlib.SplitID: %w", err)
}
if f, err := syncDB.GetFilter(req.Context(), localpart, filterQuery); err != nil {
if f, err := syncDB.GetFilter(req.Context(), localpart, filterQuery); err != nil && err != sql.ErrNoRows {
util.GetLogger(req.Context()).WithError(err).Error("syncDB.GetFilter failed")
return nil, fmt.Errorf("syncDB.GetFilter: %w", err)
} else {
} else if f != nil {
filter = *f
}
}