diff options
| author | Neil Alexander <neilalexander@users.noreply.github.com> | 2020-03-06 16:58:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-06 16:58:10 +0000 |
| commit | 6a1111c3d44cfa6b5301fed70045b1e555d39c65 (patch) | |
| tree | e7ecdd44491552fd4d1f96ea3927726d6334358b /clientapi | |
| parent | 87283e9de785f5153c5cf9b326d2640e202a36b3 (diff) | |
Try to recursively find auth events (to a point) if they are missing (#881)
* Try to recursively find auth events (to a point) if they are missing
* Remove recursion limit for now and other review fixes
* Simplify error handling for recursion
* Pass room version 1 only to MakeJoin until room version support comes later
Diffstat (limited to 'clientapi')
| -rw-r--r-- | clientapi/routing/joinroom.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clientapi/routing/joinroom.go b/clientapi/routing/joinroom.go index de9667e2..7643c41f 100644 --- a/clientapi/routing/joinroom.go +++ b/clientapi/routing/joinroom.go @@ -299,7 +299,7 @@ func (r joinRoomReq) joinRoomUsingServers( // server was invalid this returns an error. // Otherwise this returns a JSONResponse. func (r joinRoomReq) joinRoomUsingServer(roomID string, server gomatrixserverlib.ServerName) (*util.JSONResponse, error) { - respMakeJoin, err := r.federation.MakeJoin(r.req.Context(), server, roomID, r.userID) + respMakeJoin, err := r.federation.MakeJoin(r.req.Context(), server, roomID, r.userID, []int{1}) if err != nil { // TODO: Check if the user was not allowed to join the room. return nil, err |