From d6cfce2e22c64f033857466f2b4ce1c551c8764e Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Wed, 28 Sep 2022 13:58:30 +0100
Subject: [PATCH] Lint

---
 syncapi/consumers/roomserver.go | 2 +-
 syncapi/notifier/notifier.go    | 4 ++--
 syncapi/routing/context.go      | 2 +-
 syncapi/routing/filter.go       | 2 +-
 syncapi/routing/messages.go     | 2 +-
 syncapi/routing/search.go       | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/syncapi/consumers/roomserver.go b/syncapi/consumers/roomserver.go
index a7f56e76c..e5e8fe293 100644
--- a/syncapi/consumers/roomserver.go
+++ b/syncapi/consumers/roomserver.go
@@ -454,7 +454,7 @@ func (s *OutputRoomEventConsumer) updateStateEvent(event *gomatrixserverlib.Head
 	if err != nil {
 		return nil, err
 	}
-	defer snapshot.Rollback() // nolint:err
+	defer snapshot.Rollback() // nolint:errcheck
 
 	prevEvent, err := snapshot.GetStateEvent(
 		s.ctx, event.RoomID(), event.Type(), stateKey,
diff --git a/syncapi/notifier/notifier.go b/syncapi/notifier/notifier.go
index 587c562eb..a8e5bf9ad 100644
--- a/syncapi/notifier/notifier.go
+++ b/syncapi/notifier/notifier.go
@@ -323,7 +323,7 @@ func (n *Notifier) Load(ctx context.Context, db storage.Database) error {
 	if err != nil {
 		return err
 	}
-	defer snapshot.Rollback() // nolint:err
+	defer snapshot.Rollback() // nolint:errcheck
 
 	roomToUsers, err := snapshot.AllJoinedUsersInRooms(ctx)
 	if err != nil {
@@ -349,7 +349,7 @@ func (n *Notifier) LoadRooms(ctx context.Context, db storage.Database, roomIDs [
 	if err != nil {
 		return err
 	}
-	defer snapshot.Rollback() // nolint:err
+	defer snapshot.Rollback() // nolint:errcheck
 
 	roomToUsers, err := snapshot.AllJoinedUsersInRoom(ctx, roomIDs)
 	if err != nil {
diff --git a/syncapi/routing/context.go b/syncapi/routing/context.go
index 8a72a899d..6bb978eac 100644
--- a/syncapi/routing/context.go
+++ b/syncapi/routing/context.go
@@ -55,7 +55,7 @@ func Context(
 	if err != nil {
 		return jsonerror.InternalServerError()
 	}
-	defer snapshot.Rollback() // nolint:err
+	defer snapshot.Rollback() // nolint:errcheck
 
 	filter, err := parseRoomEventFilter(req)
 	if err != nil {
diff --git a/syncapi/routing/filter.go b/syncapi/routing/filter.go
index ce8d6fdc2..bb506ec39 100644
--- a/syncapi/routing/filter.go
+++ b/syncapi/routing/filter.go
@@ -49,7 +49,7 @@ func GetFilter(
 	if err != nil {
 		return jsonerror.InternalServerError()
 	}
-	defer snapshot.Rollback() // nolint:err
+	defer snapshot.Rollback() // nolint:errcheck
 
 	filter := gomatrixserverlib.DefaultFilter()
 	if err := snapshot.GetFilter(req.Context(), &filter, localpart, filterID); err != nil {
diff --git a/syncapi/routing/messages.go b/syncapi/routing/messages.go
index 16080d381..e2b03b369 100644
--- a/syncapi/routing/messages.go
+++ b/syncapi/routing/messages.go
@@ -75,7 +75,7 @@ func OnIncomingMessagesRequest(
 	if err != nil {
 		return jsonerror.InternalServerError()
 	}
-	defer snapshot.Rollback() // nolint:err
+	defer snapshot.Rollback() // nolint:errcheck
 
 	// check if the user has already forgotten about this room
 	isForgotten, roomExists, err := checkIsRoomForgotten(req.Context(), roomID, device.UserID, rsAPI)
diff --git a/syncapi/routing/search.go b/syncapi/routing/search.go
index c26aa4bfa..0696acbb1 100644
--- a/syncapi/routing/search.go
+++ b/syncapi/routing/search.go
@@ -65,7 +65,7 @@ func Search(req *http.Request, device *api.Device, syncDB storage.Database, fts
 	if err != nil {
 		return jsonerror.InternalServerError()
 	}
-	defer snapshot.Rollback() // nolint:err
+	defer snapshot.Rollback() // nolint:errcheck
 
 	// only search rooms the user is actually joined to
 	joinedRooms, err := snapshot.RoomIDsWithMembership(ctx, device.UserID, "join")