From 398e5c5efaf5e6400e55e13fd5acd584ac71ca16 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Wed, 17 Aug 2022 17:03:12 +0100 Subject: [PATCH] Clean up --- roomserver/internal/query/query.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index 2079fa46f..cc5ec339b 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -103,7 +103,7 @@ func (r *Queryer) QueryStateAfterEvents( stateEvents, err := helpers.LoadStateEvents(ctx, r.DB, stateEntries) if err != nil { - return fmt.Errorf("helpers.LoadStateEvents: %w", err) + return err } if len(request.PrevEventIDs) > 1 && len(request.StateToFetch) == 0 { @@ -851,7 +851,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 fmt.Errorf("json.Unmarshal: %w", err) } // If the join rule isn't "restricted" then there's nothing more to do. res.Restricted = joinRules.JoinRule == gomatrixserverlib.Restricted