Switch startup, config, commands and db migrations to mautrix-go systems

database/user.go

@@ -4,7 +4,9 @@ import (
 	"database/sql"
 
 	log "maunium.net/go/maulogger/v2"
+
 	"maunium.net/go/mautrix/id"
+	"maunium.net/go/mautrix/util/dbutil"
 )
 
 type User struct {
@@ -19,10 +21,11 @@ type User struct {
 	Token string
 }
 
-func (u *User) Scan(row Scannable) *User {
+func (u *User) Scan(row dbutil.Scannable) *User {
 	var token sql.NullString
+	var discordID sql.NullString
 
-	err := row.Scan(&u.MXID, &u.ID, &u.ManagementRoom, &token)
+	err := row.Scan(&u.MXID, &discordID, &u.ManagementRoom, &token)
 	if err != nil {
 		if err != sql.ErrNoRows {
 			u.log.Errorln("Database scan failed:", err)
@@ -35,6 +38,10 @@ func (u *User) Scan(row Scannable) *User {
 		u.Token = token.String
 	}
 
+	if discordID.Valid {
+		u.ID = discordID.String
+	}
+
 	return u
 }
 
@@ -44,13 +51,19 @@ func (u *User) Insert() {
 		" VALUES ($1, $2, $3, $4);"
 
 	var token sql.NullString
+	var discordID sql.NullString
 
 	if u.Token != "" {
 		token.String = u.Token
 		token.Valid = true
 	}
 
-	_, err := u.db.Exec(query, u.MXID, u.ID, u.ManagementRoom, token)
+	if u.ID != "" {
+		discordID.String = u.ID
+		discordID.Valid = true
+	}
+
+	_, err := u.db.Exec(query, u.MXID, discordID, u.ManagementRoom, token)
 
 	if err != nil {
 		u.log.Warnfln("Failed to insert %s: %v", u.MXID, err)
@@ -63,13 +76,19 @@ func (u *User) Update() {
 		" WHERE mxid=$4;"
 
 	var token sql.NullString
+	var discordID sql.NullString
 
 	if u.Token != "" {
 		token.String = u.Token
 		token.Valid = true
 	}
 
-	_, err := u.db.Exec(query, u.ID, u.ManagementRoom, token, u.MXID)
+	if u.ID != "" {
+		discordID.String = u.ID
+		discordID.Valid = true
+	}
+
+	_, err := u.db.Exec(query, discordID, u.ManagementRoom, token, u.MXID)
 
 	if err != nil {
 		u.log.Warnfln("Failed to update %q: %v", u.MXID, err)