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

Filter retrieval from db

Browse source 
Signed-off-by: Thibaut CHARLES cromfr@gmail.com
This commit is contained in:
Crom (Thibaut CHARLES) 2018-01-12 18:27:24 +01:00
parent 7b80e6d51b
commit 350e6cbfed
No known key found for this signature in database
GPG key ID: 45A3D5F880B9E6D0
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/github.com/matrix-org/dendrite/syncapi/sync/request.go
View file

@ -17,13 +17,14 @@ package sync
import (
"context"
"encoding/json"
"errors"
"net/http"
"strconv"
"time"
"github.com/matrix-org/dendrite/clientapi/auth/authtypes"
"github.com/matrix-org/dendrite/clientapi/auth/storage/accounts"
"github.com/matrix-org/gomatrix"
"github.com/matrix-org/gomatrixserverlib"
"github.com/matrix-org/dendrite/syncapi/types"
"github.com/matrix-org/util"
@ -43,7 +44,7 @@ type syncRequest struct {
filter gomatrix.Filter
}
func newSyncRequest(req *http.Request, device authtypes.Device) (*syncRequest, error) {
func newSyncRequest(req *http.Request, device authtypes.Device, accountDB *accounts.Database) (*syncRequest, error) {
timeout := getTimeout(req.URL.Query().Get("timeout"))
fullState := req.URL.Query().Get("full_state")
wantFullState := fullState != "" && fullState != "false"
@ -68,8 +69,19 @@ func newSyncRequest(req *http.Request, device authtypes.Device) (*syncRequest, e
}
} else {
// Filter ID
// TODO retrieve filter from DB
return nil, errors.New("Filter ID retrieval not implemented")
filterID, err := strconv.Atoi(filterStr)
if err != nil {
return nil, err
}
localpart, _, err := gomatrixserverlib.SplitID('@', device.UserID)
if err != nil {
return nil, err
}
recvFilter, err := accountDB.GetFilter(req.Context(), localpart, strconv.Itoa(filterID)) //TODO GetFilter should receive filterID as an int
if err != nil {
return nil, err
}
filter = *recvFilter
}
}

2
src/github.com/matrix-org/dendrite/syncapi/sync/requestpool.go
View file

@ -48,7 +48,7 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request, device *authtype
// Extract values from request
logger := util.GetLogger(req.Context())
userID := device.UserID
syncReq, err := newSyncRequest(req, *device)
syncReq, err := newSyncRequest(req, *device, rp.accountDB)
if err != nil {
return util.JSONResponse{
Code: 400,