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

Tweak join rule unmarshalling

Browse source
This commit is contained in:
Neil Alexander 2021-11-10 11:55:58 +00:00
parent 84c7205b54
commit e9bee83b03
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
federationapi/routing/join.go
View file

@ -144,17 +144,22 @@ func MakeJoin(
provider := gomatrixserverlib.NewAuthEvents(stateEvents) provider := gomatrixserverlib.NewAuthEvents(stateEvents)
// Check the join rules. If it's a restricted join then there are special rules. // Check the join rules. If it's a restricted join then there are special rules.
var joinRuleEvent *gomatrixserverlib.Event joinRules := gomatrixserverlib.JoinRuleContent{
var joinRules gomatrixserverlib.JoinRuleContent JoinRule: gomatrixserverlib.Public, // Default join rule if not specified.
if joinRuleEvent, err = provider.JoinRules(); err != nil { }
joinRuleEvent, err := provider.JoinRules()
if err != nil {
return util.JSONResponse{ return util.JSONResponse{
Code: http.StatusNotFound, Code: http.StatusNotFound,
JSON: jsonerror.NotFound("Room join rules do not exist"), JSON: jsonerror.NotFound("Failed to retrieve join rules"),
} }
} else if err = json.Unmarshal(joinRuleEvent.Content(), &joinRules); err != nil { }
return util.JSONResponse{ if joinRuleEvent != nil {
Code: http.StatusBadRequest, if err = json.Unmarshal(joinRuleEvent.Content(), &joinRules); err != nil {
JSON: jsonerror.Unknown("Failed to unmarshal room join rules"), return util.JSONResponse{
Code: http.StatusBadRequest,
JSON: jsonerror.Unknown("Failed to unmarshal room join rules"),
}
} }
} }