From 0330e6b1705fe4abd4530864695b9f38c8003391 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 6 Mar 2020 09:44:36 +0000
Subject: [PATCH] Linting

---
 syncapi/storage/sqlite3/filtering.go          | 36 -------------------
 .../sqlite3/output_room_events_table.go       | 30 +++++++++-------
 2 files changed, 18 insertions(+), 48 deletions(-)
 delete mode 100644 syncapi/storage/sqlite3/filtering.go

diff --git a/syncapi/storage/sqlite3/filtering.go b/syncapi/storage/sqlite3/filtering.go
deleted file mode 100644
index c4a2f4bf9..000000000
--- a/syncapi/storage/sqlite3/filtering.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 Thibaut CHARLES
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package sqlite3
-
-import (
-	"strings"
-)
-
-// filterConvertWildcardToSQL converts wildcards as defined in
-// https://matrix.org/docs/spec/client_server/r0.3.0.html#post-matrix-client-r0-user-userid-filter
-// to SQL wildcards that can be used with LIKE()
-func filterConvertTypeWildcardToSQL(values []string) []string {
-	if values == nil {
-		// Return nil instead of []string{} so IS NULL can work correctly when
-		// the return value is passed into SQL queries
-		return nil
-	}
-
-	ret := make([]string, len(values))
-	for i := range values {
-		ret[i] = strings.Replace(values[i], "*", "%", -1)
-	}
-	return ret
-}
diff --git a/syncapi/storage/sqlite3/output_room_events_table.go b/syncapi/storage/sqlite3/output_room_events_table.go
index a1cb9d2dc..be8937435 100644
--- a/syncapi/storage/sqlite3/output_room_events_table.go
+++ b/syncapi/storage/sqlite3/output_room_events_table.go
@@ -182,19 +182,11 @@ func (s *outputRoomEventsStatements) selectStateInRange(
 			return nil, nil, err
 		}
 
-		var addIDs []string
-		var delIDs []string
+		addIDs, delIDs, err := unmarshalStateIDs(addIDsJSON, delIDsJSON)
+		if err != nil {
+			return nil, nil, err
+		}
 
-		if len(addIDsJSON) > 0 {
-			if err := json.Unmarshal([]byte(addIDsJSON), &addIDs); err != nil {
-				return nil, nil, err
-			}
-		}
-		if len(delIDsJSON) > 0 {
-			if err := json.Unmarshal([]byte(delIDsJSON), &delIDs); err != nil {
-				return nil, nil, err
-			}
-		}
 		// Sanity check for deleted state and whine if we see it. We don't need to do anything
 		// since it'll just mark the event as not being needed.
 		if len(addIDs) < len(delIDs) {
@@ -420,3 +412,17 @@ func rowsToStreamEvents(rows *sql.Rows) ([]types.StreamEvent, error) {
 	}
 	return result, nil
 }
+
+func unmarshalStateIDs(addIDsJSON, delIDsJSON string) (addIDs []string, delIDs []string, err error) {
+	if len(addIDsJSON) > 0 {
+		if err = json.Unmarshal([]byte(addIDsJSON), &addIDs); err != nil {
+			return
+		}
+	}
+	if len(delIDsJSON) > 0 {
+		if err = json.Unmarshal([]byte(delIDsJSON), &delIDs); err != nil {
+			return
+		}
+	}
+	return
+}