Merge branch 'develop' into webv2

core/chat/chatclient.go

@@ -3,6 +3,7 @@ package chat
 import (
 	"bytes"
 	"encoding/json"
+	"net/http"
 	"sync"
 	"time"
 
@@ -60,6 +61,12 @@ const (
 var upgrader = websocket.Upgrader{
 	ReadBufferSize:  1024,
 	WriteBufferSize: 1024,
+
+	// Override default origin check to allow all clients, even those that
+	// do not match our server.
+	CheckOrigin: func(r *http.Request) bool {
+		return true
+	},
 }
 
 var (

core/data/data.go

@@ -17,7 +17,7 @@ import (
 )
 
 const (
-	schemaVersion = 5
+	schemaVersion = 6
 )
 
 var (

core/data/messages.go

@@ -13,30 +13,26 @@ import (
 func CreateMessagesTable(db *sql.DB) {
 	createTableSQL := `CREATE TABLE IF NOT EXISTS messages (
 		"id" string NOT NULL,
-		"user_id" INTEGER,
+		"user_id" TEXT,
 		"body" TEXT,
 		"eventType" TEXT,
 		"hidden_at" DATETIME,
 		"timestamp" DATETIME,
-    "title" TEXT,
-    "subtitle" TEXT,
-    "image" TEXT,
-    "link" TEXT,
+		"title" TEXT,
+		"subtitle" TEXT,
+		"image" TEXT,
+		"link" TEXT,
 		PRIMARY KEY (id)
-	);CREATE INDEX index ON messages (id, user_id, hidden_at, timestamp);
-	CREATE INDEX id ON messages (id);
-	CREATE INDEX user_id ON messages (user_id);
-	CREATE INDEX hidden_at ON messages (hidden_at);
-	CREATE INDEX timestamp ON messages (timestamp);`
+	);`
+	MustExec(createTableSQL, db)
 
-	stmt, err := db.Prepare(createTableSQL)
-	if err != nil {
-		log.Fatal("error creating chat messages table", err)
-	}
-	defer stmt.Close()
-	if _, err := stmt.Exec(); err != nil {
-		log.Fatal("error creating chat messages table", err)
-	}
+	// Create indexes
+	MustExec(`CREATE INDEX IF NOT EXISTS user_id_hidden_at_timestamp ON messages (id, user_id, hidden_at, timestamp);`, db)
+	MustExec(`CREATE INDEX IF NOT EXISTS idx_id ON messages (id);`, db)
+	MustExec(`CREATE INDEX IF NOT EXISTS idx_user_id ON messages (user_id);`, db)
+	MustExec(`CREATE INDEX IF NOT EXISTS idx_hidden_at ON messages (hidden_at);`, db)
+	MustExec(`CREATE INDEX IF NOT EXISTS idx_timestamp ON messages (timestamp);`, db)
+	MustExec(`CREATE INDEX IF NOT EXISTS idx_messages_hidden_at_timestamp on messages(hidden_at, timestamp);`, db)
 }
 
 // GetMessagesCount will return the number of messages in the database.

core/data/migrations.go

@@ -29,6 +29,8 @@ func migrateDatabaseSchema(db *sql.DB, from, to int) error {
 			migrateToSchema4(db)
 		case 4:
 			migrateToSchema5(db)
+		case 5:
+			migrateToSchema6(db)
 		default:
 			log.Fatalln("missing database migration step")
 		}
@@ -42,6 +44,16 @@ func migrateDatabaseSchema(db *sql.DB, from, to int) error {
 	return nil
 }
 
+func migrateToSchema6(db *sql.DB) {
+	// Fix chat messages table schema. Since chat is ephemeral we can drop
+	// the table and recreate it.
+	// Drop the old messages table
+	MustExec(`DROP TABLE messages`, db)
+
+	// Recreate it
+	CreateMessagesTable(db)
+}
+
 // nolint:cyclop
 func migrateToSchema5(db *sql.DB) {
 	// Create the access tokens table.

core/data/persistence.go

@@ -118,18 +118,9 @@ func (ds *Datastore) Setup() {
 		"key" string NOT NULL PRIMARY KEY,
 		"value" BLOB,
 		"timestamp" DATE DEFAULT CURRENT_TIMESTAMP NOT NULL
-	);CREATE INDEX IF NOT EXISTS messages_timestamp_index ON messages(timestamp);`
+	);`
 
-	stmt, err := ds.DB.Prepare(createTableSQL)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer stmt.Close()
-
-	_, err = stmt.Exec()
-	if err != nil {
-		log.Fatalln(err)
-	}
+	ds.MustExec(createTableSQL)
 
 	if !HasPopulatedDefaults() {
 		PopulateDefaults()
@@ -173,3 +164,16 @@ func (ds *Datastore) Reset() {
 func GetDatastore() *Datastore {
 	return _datastore
 }
+
+// MustExec will execute a SQL statement on a provided database instance.
+func (ds *Datastore) MustExec(s string) {
+	stmt, err := ds.DB.Prepare(s)
+	if err != nil {
+		log.Panic(err)
+	}
+	defer stmt.Close()
+	_, err = stmt.Exec()
+	if err != nil {
+		log.Warnln(err)
+	}
+}

core/data/users.go

@@ -41,20 +41,12 @@ func createUsersTable(db *sql.DB) {
 		"type" TEXT DEFAULT 'STANDARD',
 		"last_used" DATETIME DEFAULT CURRENT_TIMESTAMP,
 		PRIMARY KEY (id)
-	);CREATE INDEX user_id_disabled_at_index ON users (id, disabled_at);
-	CREATE INDEX user_id_index ON users (id);
-  CREATE INDEX user_id_disabled_index ON users (id, disabled_at);
-	CREATE INDEX user_disabled_at_index ON USERS (disabled_at);`
+	);`
 
-	stmt, err := db.Prepare(createTableSQL)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer stmt.Close()
-	_, err = stmt.Exec()
-	if err != nil {
-		log.Warnln(err)
-	}
+	MustExec(createTableSQL, db)
+	MustExec(`CREATE INDEX IF NOT EXISTS idx_user_id ON users (id);`, db)
+	MustExec(`CREATE INDEX IF NOT EXISTS idx_user_id_disabled ON users (id, disabled_at);`, db)
+	MustExec(`CREATE INDEX IF NOT EXISTS idx_user_disabled_at ON users (disabled_at);`, db)
 }
 
 // GetUsersCount will return the number of users in the database.

core/data/utils.go

@@ -0,0 +1,20 @@
+package data
+
+import (
+	"database/sql"
+
+	log "github.com/sirupsen/logrus"
+)
+
+// MustExec will execute a SQL statement on a provided database instance.
+func MustExec(s string, db *sql.DB) {
+	stmt, err := db.Prepare(s)
+	if err != nil {
+		log.Panic(err)
+	}
+	defer stmt.Close()
+	_, err = stmt.Exec()
+	if err != nil {
+		log.Warnln(err)
+	}
+}