hoernschen/dendrite
1
0
Fork 0
mirror of https://github.com/hoernschen/dendrite.git synced 2024-12-27 07:28:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix return codes

Browse source
This commit is contained in:
Neil Alexander 2021-11-09 11:05:44 +00:00
parent 831f3b9307
commit 35bc2e98e6
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
clientapi/routing/joinroom.go
View file

@ -81,7 +81,6 @@ func JoinRoomByIDOrAlias(
defer close(done) defer close(done)
rsAPI.PerformJoin(req.Context(), &joinReq, &joinRes) rsAPI.PerformJoin(req.Context(), &joinReq, &joinRes)
if joinRes.Error != nil { if joinRes.Error != nil {
joinRes.Error.RemoteCode = http.StatusForbidden
done <- joinRes.Error.JSONResponse() done <- joinRes.Error.JSONResponse()
} else { } else {
done <- util.JSONResponse{ done <- util.JSONResponse{

4
federationapi/routing/join.go
View file

@ -322,8 +322,8 @@ func attemptMakeJoinForRestrictedMembership(
logger.Error("No room matching join rule memberships found") logger.Error("No room matching join rule memberships found")
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusBadRequest, Code: http.StatusForbidden,
JSON: jsonerror.UnableToAuthoriseJoin("You are not joined to any allowed rooms"), JSON: jsonerror.Forbidden("You are not joined to any allowed rooms"),
} }
} }