Make lint and tests happy

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
 }

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
 }

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
 		}

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
 }

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
 }

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,
 		},