From 6f6a1d32c3f79d5725912a71ac9ddea9aad5fe7a Mon Sep 17 00:00:00 2001
From: Till Faelligen <tfaelligen@gmail.com>
Date: Wed, 28 Jul 2021 17:13:55 +0200
Subject: [PATCH] Make lint and tests happy

---
 setup/mscs/msc2836/msc2836_test.go                  | 8 ++++++++
 setup/mscs/msc2946/msc2946_test.go                  | 8 ++++++++
 userapi/internal/api.go                             | 3 ++-
 userapi/storage/presence/postgres/presence_table.go | 1 -
 userapi/storage/presence/sqlite3/presence_table.go  | 1 -
 userapi/userapi_test.go                             | 5 +++++
 6 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/setup/mscs/msc2836/msc2836_test.go b/setup/mscs/msc2836/msc2836_test.go
index 1bbb485cf..dc09aaee8 100644
--- a/setup/mscs/msc2836/msc2836_test.go
+++ b/setup/mscs/msc2836/msc2836_test.go
@@ -500,6 +500,14 @@ type testUserAPI struct {
 	accessTokens map[string]userapi.Device
 }
 
+func (u *testUserAPI) InputPresenceData(ctx context.Context, req *userapi.InputPresenceRequest, res *userapi.InputPresenceResponse) error {
+	return nil
+}
+
+func (u *testUserAPI) QueryPresenceForUser(ctx context.Context, req *userapi.QueryPresenceForUserRequest, res *userapi.QueryPresenceForUserResponse) error {
+	return nil
+}
+
 func (u *testUserAPI) InputAccountData(ctx context.Context, req *userapi.InputAccountDataRequest, res *userapi.InputAccountDataResponse) error {
 	return nil
 }
diff --git a/setup/mscs/msc2946/msc2946_test.go b/setup/mscs/msc2946/msc2946_test.go
index 2c195d128..48ccc38bb 100644
--- a/setup/mscs/msc2946/msc2946_test.go
+++ b/setup/mscs/msc2946/msc2946_test.go
@@ -343,6 +343,14 @@ type testUserAPI struct {
 	accessTokens map[string]userapi.Device
 }
 
+func (u *testUserAPI) InputPresenceData(ctx context.Context, req *userapi.InputPresenceRequest, res *userapi.InputPresenceResponse) error {
+	return nil
+}
+
+func (u *testUserAPI) QueryPresenceForUser(ctx context.Context, req *userapi.QueryPresenceForUserRequest, res *userapi.QueryPresenceForUserResponse) error {
+	return nil
+}
+
 func (u *testUserAPI) InputAccountData(ctx context.Context, req *userapi.InputAccountDataRequest, res *userapi.InputAccountDataResponse) error {
 	return nil
 }
diff --git a/userapi/internal/api.go b/userapi/internal/api.go
index dc57c22fd..adc30b0b9 100644
--- a/userapi/internal/api.go
+++ b/userapi/internal/api.go
@@ -459,7 +459,8 @@ func (a *UserInternalAPI) QueryPresenceForUser(ctx context.Context, req *api.Que
 	var maxLastSeen int64
 	// If it's a local user, we can check the devices for possible updated timestamps
 	if domain == a.ServerName {
-		devs, err := a.DeviceDB.GetDevicesByLocalpart(ctx, local)
+		var devs []api.Device
+		devs, err = a.DeviceDB.GetDevicesByLocalpart(ctx, local)
 		if err != nil {
 			return err
 		}
diff --git a/userapi/storage/presence/postgres/presence_table.go b/userapi/storage/presence/postgres/presence_table.go
index d3218f48a..00a398324 100644
--- a/userapi/storage/presence/postgres/presence_table.go
+++ b/userapi/storage/presence/postgres/presence_table.go
@@ -58,7 +58,6 @@ const selectPresenceForUserSQL = "" +
 	" WHERE user_id = $1 LIMIT 1"
 
 type presenceStatements struct {
-	db                         *sql.DB
 	upsertPresenceStmt         *sql.Stmt
 	selectPresenceForUsersStmt *sql.Stmt
 }
diff --git a/userapi/storage/presence/sqlite3/presence_table.go b/userapi/storage/presence/sqlite3/presence_table.go
index 606b07bed..253eada9f 100644
--- a/userapi/storage/presence/sqlite3/presence_table.go
+++ b/userapi/storage/presence/sqlite3/presence_table.go
@@ -57,7 +57,6 @@ const selectPresenceForUserSQL = "" +
 	" WHERE user_id = $1 LIMIT 1"
 
 type presenceStatements struct {
-	db                         *sql.DB
 	upsertPresenceStmt         *sql.Stmt
 	selectPresenceForUsersStmt *sql.Stmt
 }
diff --git a/userapi/userapi_test.go b/userapi/userapi_test.go
index 0141258e6..f30376776 100644
--- a/userapi/userapi_test.go
+++ b/userapi/userapi_test.go
@@ -36,6 +36,11 @@ func MustMakeInternalAPI(t *testing.T) (api.UserInternalAPI, accounts.Database)
 			MaxOpenConnections: 1,
 			MaxIdleConnections: 1,
 		},
+		PresenceDatabase: config.DatabaseOptions{
+			ConnectionString:   "file::memory:",
+			MaxOpenConnections: 1,
+			MaxIdleConnections: 1,
+		},
 		Matrix: &config.Global{
 			ServerName: serverName,
 		},