mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2026-02-25 05:53:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Review comments

Browse source
This commit is contained in:
Kegan Dougal 2017-04-07 14:23:03 +01:00
parent edd06332e9
commit f531abed89
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/github.com/matrix-org/dendrite/clientapi/storage/output_room_events_table.go
View file

@ -86,7 +86,7 @@ func (s *outputRoomEventsStatements) Events(txn *sql.Tx, eventIDs []string) ([]g
result = append(result, ev) result = append(result, ev)
} }
if i != len(eventIDs) { if i != len(eventIDs) {
return nil, fmt.Errorf("failed to map all event IDs to events: (got %d, wanted, %d)", i, len(eventIDs)) return nil, fmt.Errorf("failed to map all event IDs to events: (got %d, wanted %d)", i, len(eventIDs))
} }
return result, nil return result, nil
} }

3
src/github.com/matrix-org/dendrite/clientapi/sync/requestpool.go
View file

@ -39,7 +39,8 @@ func (rp *RequestPool) OnIncomingSyncRequest(req *http.Request) util.JSONRespons
} }
since := req.URL.Query().Get("since") since := req.URL.Query().Get("since")
timeout := getTimeout(req.URL.Query().Get("timeout")) timeout := getTimeout(req.URL.Query().Get("timeout"))
wantFullState := req.URL.Query().Get("full_state") != "" fullState := req.URL.Query().Get("full_state")
wantFullState := fullState != "" && fullState != "false"
// TODO: Additional query params: set_presence, filter // TODO: Additional query params: set_presence, filter
syncReq := syncRequest{ syncReq := syncRequest{
userID: userID, userID: userID,