mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-26 08:13:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use default filter as a template when retrieving from the database

Browse source
This commit is contained in:
Neil Alexander 2021-01-19 10:41:00 +00:00
parent a86c9f7a0c
commit 55ad2fe03e
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
3 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
syncapi/storage/postgres/filter_table.go
View file

@ -83,7 +83,7 @@ func (s *filterStatements) SelectFilter(
} }
// Unmarshal JSON into Filter struct // Unmarshal JSON into Filter struct
var filter gomatrixserverlib.Filter filter := gomatrixserverlib.DefaultFilter()
if err = json.Unmarshal(filterData, &filter); err != nil { if err = json.Unmarshal(filterData, &filter); err != nil {
return nil, err return nil, err
} }

2
syncapi/storage/sqlite3/filter_table.go
View file

@ -87,7 +87,7 @@ func (s *filterStatements) SelectFilter(
} }
// Unmarshal JSON into Filter struct // Unmarshal JSON into Filter struct
var filter gomatrixserverlib.Filter filter := gomatrixserverlib.DefaultFilter()
if err = json.Unmarshal(filterData, &filter); err != nil { if err = json.Unmarshal(filterData, &filter); err != nil {
return nil, err return nil, err
} }

3
syncapi/sync/request.go
View file

@ -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") util.GetLogger(req.Context()).WithError(err).Error("gomatrixserverlib.SplitID failed")
return nil, err return nil, err
} }
f, err := syncDB.GetFilter(req.Context(), localpart, filterQuery) if f, err := syncDB.GetFilter(req.Context(), localpart, filterQuery); err == nil {
if err == nil {
filter = *f filter = *f
} }
} }