From 6b7fd96dfdbb91b0a2663bcf482eebf884ab0d93 Mon Sep 17 00:00:00 2001
From: Till Faelligen <2353100+S7evinK@users.noreply.github.com>
Date: Tue, 25 Apr 2023 10:19:28 +0200
Subject: [PATCH] Linter fixes

---
 clientapi/routing/createroom.go              |  3 ++-
 federationapi/routing/invite.go              |  2 +-
 roomserver/internal/perform/perform_admin.go | 13 +++++++++----
 userapi/internal/user_api.go                 |  4 ++--
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/clientapi/routing/createroom.go b/clientapi/routing/createroom.go
index 4408dbfb1..619e48ce8 100644
--- a/clientapi/routing/createroom.go
+++ b/clientapi/routing/createroom.go
@@ -542,9 +542,10 @@ func createRoom(
 		}
 
 		// Process the invites.
+		var inviteEvent *gomatrixserverlib.HeaderedEvent
 		for _, invitee := range r.Invite {
 			// Build the invite event.
-			inviteEvent, err := buildMembershipEvent(
+			inviteEvent, err = buildMembershipEvent(
 				ctx, invitee, "", profileAPI, device, spec.Invite,
 				roomID, r.IsDirect, cfg, evTime, rsAPI, asAPI,
 			)
diff --git a/federationapi/routing/invite.go b/federationapi/routing/invite.go
index 421c5b2e4..5e41f337d 100644
--- a/federationapi/routing/invite.go
+++ b/federationapi/routing/invite.go
@@ -206,7 +206,7 @@ func processInvite(
 		TransactionID:   nil,
 	}
 
-	if err := rsAPI.PerformInvite(ctx, request); err != nil {
+	if err = rsAPI.PerformInvite(ctx, request); err != nil {
 		util.GetLogger(ctx).WithError(err).Error("PerformInvite failed")
 		return util.JSONResponse{
 			Code: http.StatusInternalServerError,
diff --git a/roomserver/internal/perform/perform_admin.go b/roomserver/internal/perform/perform_admin.go
index 889568cce..101f99d4c 100644
--- a/roomserver/internal/perform/perform_admin.go
+++ b/roomserver/internal/perform/perform_admin.go
@@ -28,6 +28,7 @@ import (
 	"github.com/matrix-org/dendrite/roomserver/storage"
 	"github.com/matrix-org/dendrite/setup/config"
 	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/fclient"
 	"github.com/matrix-org/gomatrixserverlib/spec"
 	"github.com/sirupsen/logrus"
 )
@@ -74,6 +75,10 @@ func (r *Admin) PerformAdminEvacuateRoom(
 	}
 
 	prevEvents := latestRes.LatestEvents
+	var senderDomain spec.ServerName
+	var eventsNeeded gomatrixserverlib.StateNeeded
+	var identity *fclient.SigningIdentity
+	var event *gomatrixserverlib.HeaderedEvent
 	for _, memberEvent := range memberEvents {
 		if memberEvent.StateKey() == nil {
 			continue
@@ -94,7 +99,7 @@ func (r *Admin) PerformAdminEvacuateRoom(
 			PrevEvents: prevEvents,
 		}
 
-		_, senderDomain, err := gomatrixserverlib.SplitID('@', fledglingEvent.Sender)
+		_, senderDomain, err = gomatrixserverlib.SplitID('@', fledglingEvent.Sender)
 		if err != nil {
 			continue
 		}
@@ -103,17 +108,17 @@ func (r *Admin) PerformAdminEvacuateRoom(
 			return nil, err
 		}
 
-		eventsNeeded, err := gomatrixserverlib.StateNeededForEventBuilder(fledglingEvent)
+		eventsNeeded, err = gomatrixserverlib.StateNeededForEventBuilder(fledglingEvent)
 		if err != nil {
 			return nil, err
 		}
 
-		identity, err := r.Cfg.Matrix.SigningIdentityFor(senderDomain)
+		identity, err = r.Cfg.Matrix.SigningIdentityFor(senderDomain)
 		if err != nil {
 			continue
 		}
 
-		event, err := eventutil.BuildEvent(ctx, fledglingEvent, r.Cfg.Matrix, identity, time.Now(), &eventsNeeded, latestRes)
+		event, err = eventutil.BuildEvent(ctx, fledglingEvent, r.Cfg.Matrix, identity, time.Now(), &eventsNeeded, latestRes)
 		if err != nil {
 			return nil, err
 		}
diff --git a/userapi/internal/user_api.go b/userapi/internal/user_api.go
index a656becb7..cdd083448 100644
--- a/userapi/internal/user_api.go
+++ b/userapi/internal/user_api.go
@@ -634,14 +634,14 @@ func (a *UserInternalAPI) PerformAccountDeactivation(ctx context.Context, req *a
 		UserID: fmt.Sprintf("@%s:%s", req.Localpart, serverName),
 	}
 	deviceRes := &api.PerformDeviceDeletionResponse{}
-	if err := a.PerformDeviceDeletion(ctx, deviceReq, deviceRes); err != nil {
+	if err = a.PerformDeviceDeletion(ctx, deviceReq, deviceRes); err != nil {
 		return err
 	}
 
 	pusherReq := &api.PerformPusherDeletionRequest{
 		Localpart: req.Localpart,
 	}
-	if err := a.PerformPusherDeletion(ctx, pusherReq, &struct{}{}); err != nil {
+	if err = a.PerformPusherDeletion(ctx, pusherReq, &struct{}{}); err != nil {
 		return err
 	}