From 493e2ca3896aff13e74d1422863794b0613f8188 Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Fri, 11 Sep 2020 15:31:40 +0100
Subject: [PATCH] Linting

---
 roomserver/auth/{auth.go => history_visibility.go} | 12 ++++++++----
 roomserver/internal/perform/perform_backfill.go    |  6 ++----
 2 files changed, 10 insertions(+), 8 deletions(-)
 rename roomserver/auth/{auth.go => history_visibility.go} (94%)

diff --git a/roomserver/auth/auth.go b/roomserver/auth/history_visibility.go
similarity index 94%
rename from roomserver/auth/auth.go
rename to roomserver/auth/history_visibility.go
index 92246d56..badd5c50 100644
--- a/roomserver/auth/auth.go
+++ b/roomserver/auth/history_visibility.go
@@ -19,6 +19,10 @@ import (
 	"github.com/matrix-org/gomatrixserverlib"
 )
 
+const (
+	shared = "shared"
+)
+
 // TODO: This logic should live in gomatrixserverlib
 
 // IsServerAllowed returns true if the server is allowed to see events in the room
@@ -50,7 +54,7 @@ func IsServerAllowed(
 		return true
 	}
 	// 3. If history_visibility was set to shared, and the user joined the room at any point after the event was sent, allow.
-	if historyVisibility == "shared" && serverCurrentlyInRoom {
+	if historyVisibility == shared && serverCurrentlyInRoom {
 		return true
 	}
 	// 4. If the user's membership was invite, and the history_visibility was set to invited, allow.
@@ -67,10 +71,10 @@ func HistoryVisibilityForRoom(hisVisEvent *gomatrixserverlib.Event) (string, err
 	// https://matrix.org/docs/spec/client_server/r0.6.0#id87
 	// By default if no history_visibility is set, or if the value is not understood, the visibility is assumed to be shared.
 	if hisVisEvent == nil {
-		return "shared", nil
+		return shared, nil
 	}
-	visibility := "shared"
-	knownStates := []string{"invited", "joined", "shared", "world_readable"}
+	visibility := shared
+	knownStates := []string{"invited", "joined", shared, "world_readable"}
 	if hisVisEvent.Type() != gomatrixserverlib.MRoomHistoryVisibility {
 		return "", fmt.Errorf("HistoryVisibilityForRoom: passed a non history visibility event: %s", hisVisEvent.Type())
 	}
diff --git a/roomserver/internal/perform/perform_backfill.go b/roomserver/internal/perform/perform_backfill.go
index 681e417b..ef89d3c6 100644
--- a/roomserver/internal/perform/perform_backfill.go
+++ b/roomserver/internal/perform/perform_backfill.go
@@ -502,10 +502,8 @@ func joinEventsFromHistoryVisibility(
 		return nil, fmt.Errorf("failed to load history visibility event nid %d", historyVisibilityNID)
 	}
 	var hisVisEvent *gomatrixserverlib.Event
-	for i := range stateEvents {
-		if stateEvents[i].Type() == gomatrixserverlib.MRoomHistoryVisibility && stateEvents[i].StateKeyEquals("") {
-			hisVisEvent = &stateEvents[i].Event
-		}
+	if stateEvents[0].Type() == gomatrixserverlib.MRoomHistoryVisibility && stateEvents[0].StateKeyEquals("") {
+		hisVisEvent = &stateEvents[0].Event
 	}
 	visibility, err := auth.HistoryVisibilityForRoom(hisVisEvent)
 	if err != nil {