Merge branch 'master' into query-key-backup

internal/eventutil/events.go

@@ -28,7 +28,7 @@ import (
 
 // ErrRoomNoExists is returned when trying to lookup the state of a room that
 // doesn't exist
-var ErrRoomNoExists = errors.New("Room does not exist")
+var ErrRoomNoExists = errors.New("room does not exist")
 
 // QueryAndBuildEvent builds a Matrix event using the event builder and roomserver query
 // API client provided. If also fills roomserver query API response (if provided)

internal/httputil/http.go

@@ -77,9 +77,9 @@ func PostJSON(
 			return nil
 		}
 		if msgerr := json.NewDecoder(res.Body).Decode(&errorBody); msgerr == nil {
-			return fmt.Errorf("Internal API: %d from %s: %s", res.StatusCode, apiURL, errorBody.Message)
+			return fmt.Errorf("internal API: %d from %s: %s", res.StatusCode, apiURL, errorBody.Message)
 		}
-		return fmt.Errorf("Internal API: %d from %s", res.StatusCode, apiURL)
+		return fmt.Errorf("internal API: %d from %s", res.StatusCode, apiURL)
 	}
 	return json.NewDecoder(res.Body).Decode(response)
 }

internal/httputil/paths.go

@@ -19,5 +19,6 @@ const (
 	PublicFederationPathPrefix = "/_matrix/federation/"
 	PublicKeyPathPrefix        = "/_matrix/key/"
 	PublicMediaPathPrefix      = "/_matrix/media/"
+	PublicWellKnownPrefix      = "/.well-known/matrix/"
 	InternalPathPrefix         = "/api/"
 )

internal/sqlutil/migrate.go

@@ -46,7 +46,7 @@ func (m *Migrations) RunDeltas(db *sql.DB, props *config.DatabaseOptions) error
 	minVer := int64(0)
 	migrations, err := m.collect(minVer, maxVer)
 	if err != nil {
-		return fmt.Errorf("RunDeltas: Failed to collect migrations: %w", err)
+		return fmt.Errorf("runDeltas: Failed to collect migrations: %w", err)
 	}
 	if props.ConnectionString.IsPostgres() {
 		if err = goose.SetDialect("postgres"); err != nil {
@@ -57,12 +57,12 @@ func (m *Migrations) RunDeltas(db *sql.DB, props *config.DatabaseOptions) error
 			return err
 		}
 	} else {
-		return fmt.Errorf("Unknown connection string: %s", props.ConnectionString)
+		return fmt.Errorf("unknown connection string: %s", props.ConnectionString)
 	}
 	for {
 		current, err := goose.EnsureDBVersion(db)
 		if err != nil {
-			return fmt.Errorf("RunDeltas: Failed to EnsureDBVersion: %w", err)
+			return fmt.Errorf("runDeltas: Failed to EnsureDBVersion: %w", err)
 		}
 
 		next, err := migrations.Next(current)
@@ -71,11 +71,11 @@ func (m *Migrations) RunDeltas(db *sql.DB, props *config.DatabaseOptions) error
 				return nil
 			}
 
-			return fmt.Errorf("RunDeltas: Failed to load next migration to %+v : %w", next, err)
+			return fmt.Errorf("runDeltas: Failed to load next migration to %+v : %w", next, err)
 		}
 
 		if err = next.Up(db); err != nil {
-			return fmt.Errorf("RunDeltas: Failed run migration: %w", err)
+			return fmt.Errorf("runDeltas: Failed run migration: %w", err)
 		}
 	}
 }

internal/sqlutil/sql.go

@@ -25,7 +25,7 @@ import (
 )
 
 // ErrUserExists is returned if a username already exists in the database.
-var ErrUserExists = errors.New("Username already exists")
+var ErrUserExists = errors.New("username already exists")
 
 // A Transaction is something that can be committed or rolledback.
 type Transaction interface {