From 1238b4184c30e0c31ffb0f364806fa1275aba483 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 17 Aug 2022 15:27:25 +0100 Subject: [PATCH] Flatten error in `QueryRestrictedJoinAllowed` --- roomserver/internal/query/query.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index fefa1eadf..df8be4b6c 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -842,7 +842,7 @@ func (r *Queryer) QueryRestrictedJoinAllowed(ctx context.Context, req *api.Query } var joinRules gomatrixserverlib.JoinRuleContent if err = json.Unmarshal(joinRulesEvent.Content(), &joinRules); err != nil { - return fmt.Errorf("json.Unmarshal: %w (JSON content: %s)", err, joinRulesEvent.Content()) + return nil } // If the join rule isn't "restricted" then there's nothing more to do. res.Restricted = joinRules.JoinRule == gomatrixserverlib.Restricted