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

POST /join/{roomId}: Allow joining even when not invited #663

Browse source 
Signed-off-by: Alex Chen <minecnly@gmail.com>
This commit is contained in:
Cnly 2019-01-10 11:08:42 +08:00
parent 170264404e
commit efa98b35ee
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/github.com/matrix-org/dendrite/clientapi/routing/joinroom.go
View file

@ -119,16 +119,14 @@ func (r joinRoomReq) joinRoomByID(roomID string) util.JSONResponse {
return httputil.LogThenError(r.req, err) return httputil.LogThenError(r.req, err)
} }
if len(queryRes.InviteSenderUserIDs) == 0 { if len(queryRes.InviteSenderUserIDs) == 0 {
// TODO: We might need to support clients which erroneously try to join // Support clients erroneously trying to join without an invite
// the room by ID even when they are not invited. _, domain, err := gomatrixserverlib.SplitID('!', roomID)
// This can be done by removing this check and falling through to if err != nil {
// joinRoomUsingServers passing an empty list since joinRoomUserServers return httputil.LogThenError(r.req, err)
// will check if we are already in the room first.
return util.JSONResponse{
Code: http.StatusForbidden,
JSON: jsonerror.Forbidden("You are not invited to the room"),
} }
return r.joinRoomUsingServers(roomID, []gomatrixserverlib.ServerName{domain})
} }
servers := []gomatrixserverlib.ServerName{} servers := []gomatrixserverlib.ServerName{}
seenBefore := map[gomatrixserverlib.ServerName]bool{} seenBefore := map[gomatrixserverlib.ServerName]bool{}
for _, userID := range queryRes.InviteSenderUserIDs { for _, userID := range queryRes.InviteSenderUserIDs {