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

Revert "Flatten error in QueryRestrictedJoinAllowed"

Browse source 
This reverts commit 1238b4184c.
This commit is contained in:
Neil Alexander 2022-08-17 16:01:49 +01:00
parent 1238b4184c
commit 59376e9b2c
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roomserver/internal/query/query.go
View file

@ -842,7 +842,7 @@ func (r *Queryer) QueryRestrictedJoinAllowed(ctx context.Context, req *api.Query
} }
var joinRules gomatrixserverlib.JoinRuleContent var joinRules gomatrixserverlib.JoinRuleContent
if err = json.Unmarshal(joinRulesEvent.Content(), &joinRules); err != nil { if err = json.Unmarshal(joinRulesEvent.Content(), &joinRules); err != nil {
return nil return fmt.Errorf("json.Unmarshal: %w (JSON content: %s)", err, joinRulesEvent.Content())
} }
// If the join rule isn't "restricted" then there's nothing more to do. // If the join rule isn't "restricted" then there's nothing more to do.
res.Restricted = joinRules.JoinRule == gomatrixserverlib.Restricted res.Restricted = joinRules.JoinRule == gomatrixserverlib.Restricted