From f442abfa0c0c178557ebe55817f83bea827d4122 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 24 May 2022 16:47:45 +0100 Subject: [PATCH] Placate the almighty linter One day I will nuke `gocyclo` from orbit and everything in the world will be much better for it. --- roomserver/internal/perform/perform_join.go | 1 + roomserver/internal/query/query.go | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/roomserver/internal/perform/perform_join.go b/roomserver/internal/perform/perform_join.go index 55f65c432..c9e839198 100644 --- a/roomserver/internal/perform/perform_join.go +++ b/roomserver/internal/perform/perform_join.go @@ -161,6 +161,7 @@ func (r *Joiner) performJoinRoomByAlias( } // TODO: Break this function up a bit +// nolint:gocyclo func (r *Joiner) performJoinRoomByID( ctx context.Context, req *rsAPI.PerformJoinRequest, diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go index 1e321d016..f176476aa 100644 --- a/roomserver/internal/query/query.go +++ b/roomserver/internal/query/query.go @@ -799,7 +799,8 @@ func (r *Queryer) QueryRestrictedJoinAllowed(ctx context.Context, req *api.Query // If the user is already invited to the room then the join is allowed // but we don't specify an authorised via user, since the event auth // will allow the join anyway. - if pending, _, _, err := helpers.IsInvitePending(ctx, r.DB, req.RoomID, req.UserID); err != nil { + var pending bool + if pending, _, _, err = helpers.IsInvitePending(ctx, r.DB, req.RoomID, req.UserID); err != nil { return fmt.Errorf("helpers.IsInvitePending: %w", err) } else if pending { res.Allowed = true