From fdd832324ab119a7b23408da15c800513f58ff9f Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 15 Aug 2022 15:16:34 +0100 Subject: [PATCH] Fix lint --- roomserver/internal/perform/perform_leave.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/roomserver/internal/perform/perform_leave.go b/roomserver/internal/perform/perform_leave.go index be5238c0d..c6411b1ed 100644 --- a/roomserver/internal/perform/perform_leave.go +++ b/roomserver/internal/perform/perform_leave.go @@ -79,7 +79,7 @@ func (r *Leaver) performLeaveRoomByID( ) ([]api.OutputEvent, error) { // If there's an invite outstanding for the room then respond to // that. - isInvitePending, senderUser, eventID, err := helpers.IsInvitePending(ctx, r.DB, req.RoomID, req.UserID) + isInvitePending, senderUser, _, err := helpers.IsInvitePending(ctx, r.DB, req.RoomID, req.UserID) if err == nil && isInvitePending { var host gomatrixserverlib.ServerName _, host, err = gomatrixserverlib.SplitID('@', senderUser) @@ -87,7 +87,7 @@ func (r *Leaver) performLeaveRoomByID( return nil, fmt.Errorf("sender %q is invalid", senderUser) } if host != r.Cfg.Matrix.ServerName { - return r.performFederatedRejectInvite(ctx, req, res, senderUser, eventID) + return r.performFederatedRejectInvite(ctx, req, res, senderUser) } // check that this is not a "server notice room" accData := &userapi.QueryAccountDataResponse{} @@ -200,7 +200,7 @@ func (r *Leaver) performFederatedRejectInvite( ctx context.Context, req *api.PerformLeaveRequest, res *api.PerformLeaveResponse, // nolint:unparam - senderUser, eventID string, + senderUser string, ) ([]api.OutputEvent, error) { _, domain, err := gomatrixserverlib.SplitID('@', senderUser) if err != nil {