From 55ad2fe03e0c7921e334002050bbaa67e72ca398 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 19 Jan 2021 10:41:00 +0000 Subject: [PATCH] Use default filter as a template when retrieving from the database --- syncapi/storage/postgres/filter_table.go | 2 +- syncapi/storage/sqlite3/filter_table.go | 2 +- syncapi/sync/request.go | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/syncapi/storage/postgres/filter_table.go b/syncapi/storage/postgres/filter_table.go index beeb864ba..dfd3d6963 100644 --- a/syncapi/storage/postgres/filter_table.go +++ b/syncapi/storage/postgres/filter_table.go @@ -83,7 +83,7 @@ func (s *filterStatements) SelectFilter( } // Unmarshal JSON into Filter struct - var filter gomatrixserverlib.Filter + filter := gomatrixserverlib.DefaultFilter() if err = json.Unmarshal(filterData, &filter); err != nil { return nil, err } diff --git a/syncapi/storage/sqlite3/filter_table.go b/syncapi/storage/sqlite3/filter_table.go index 3092bcd7d..0cfebef2a 100644 --- a/syncapi/storage/sqlite3/filter_table.go +++ b/syncapi/storage/sqlite3/filter_table.go @@ -87,7 +87,7 @@ func (s *filterStatements) SelectFilter( } // Unmarshal JSON into Filter struct - var filter gomatrixserverlib.Filter + filter := gomatrixserverlib.DefaultFilter() if err = json.Unmarshal(filterData, &filter); err != nil { return nil, err } diff --git a/syncapi/sync/request.go b/syncapi/sync/request.go index 06224610c..fb8bcdb05 100644 --- a/syncapi/sync/request.go +++ b/syncapi/sync/request.go @@ -68,8 +68,7 @@ func newSyncRequest(req *http.Request, device userapi.Device, syncDB storage.Dat util.GetLogger(req.Context()).WithError(err).Error("gomatrixserverlib.SplitID failed") return nil, err } - f, err := syncDB.GetFilter(req.Context(), localpart, filterQuery) - if err == nil { + if f, err := syncDB.GetFilter(req.Context(), localpart, filterQuery); err == nil { filter = *f } }