Add basic Matrix puppeting support

May contain bugs.
EDUs from /sync are not yet handled.

database/puppet.go

@@ -56,6 +56,26 @@ func (pq *PuppetQuery) Get(jid types.WhatsAppID) *Puppet {
 	return pq.New().Scan(row)
 }
 
+func (pq *PuppetQuery) GetByCustomMXID(mxid types.MatrixUserID) *Puppet {
+	row := pq.db.QueryRow("SELECT * FROM puppet WHERE custom_mxid=$1", mxid)
+	if row == nil {
+		return nil
+	}
+	return pq.New().Scan(row)
+}
+
+func (pq *PuppetQuery) GetAllWithCustomMXID() (puppets []*Puppet) {
+	rows, err := pq.db.Query("SELECT * FROM puppet WHERE custom_mxid<>''")
+	if err != nil || rows == nil {
+		return nil
+	}
+	defer rows.Close()
+	for rows.Next() {
+		puppets = append(puppets, pq.New().Scan(rows))
+	}
+	return
+}
+
 type Puppet struct {
 	db  *Database
 	log log.Logger
@@ -64,12 +84,16 @@ type Puppet struct {
 	Avatar      string
 	Displayname string
 	NameQuality int8
+
+	CustomMXID  string
+	AccessToken string
+	NextBatch   string
 }
 
 func (puppet *Puppet) Scan(row Scannable) *Puppet {
-	var displayname, avatar sql.NullString
+	var displayname, avatar, customMXID, accessToken, nextBatch sql.NullString
 	var quality sql.NullInt64
-	err := row.Scan(&puppet.JID, &avatar, &displayname, &quality)
+	err := row.Scan(&puppet.JID, &avatar, &displayname, &quality, &customMXID, &accessToken, &nextBatch)
 	if err != nil {
 		if err != sql.ErrNoRows {
 			puppet.log.Errorln("Database scan failed:", err)
@@ -79,20 +103,23 @@ func (puppet *Puppet) Scan(row Scannable) *Puppet {
 	puppet.Displayname = displayname.String
 	puppet.Avatar = avatar.String
 	puppet.NameQuality = int8(quality.Int64)
+	puppet.CustomMXID = customMXID.String
+	puppet.AccessToken = accessToken.String
+	puppet.NextBatch = nextBatch.String
 	return puppet
 }
 
 func (puppet *Puppet) Insert() {
-	_, err := puppet.db.Exec("INSERT INTO puppet VALUES ($1, $2, $3, $4)",
-		puppet.JID, puppet.Avatar, puppet.Displayname, puppet.NameQuality)
+	_, err := puppet.db.Exec("INSERT INTO puppet VALUES ($1, $2, $3, $4, $5, $6, $7)",
+		puppet.JID, puppet.Avatar, puppet.Displayname, puppet.NameQuality, puppet.CustomMXID, puppet.AccessToken, puppet.NextBatch)
 	if err != nil {
 		puppet.log.Warnfln("Failed to insert %s: %v", puppet.JID, err)
 	}
 }
 
 func (puppet *Puppet) Update() {
-	_, err := puppet.db.Exec("UPDATE puppet SET displayname=$1, name_quality=$2, avatar=$3 WHERE jid=$4",
-		puppet.Displayname, puppet.NameQuality, puppet.Avatar, puppet.JID)
+	_, err := puppet.db.Exec("UPDATE puppet SET displayname=$1, name_quality=$2, avatar=$3, custom_mxid=$4, access_token=$5, next_batch=$6 WHERE jid=$7",
+		puppet.Displayname, puppet.NameQuality, puppet.Avatar, puppet.CustomMXID, puppet.AccessToken, puppet.NextBatch, puppet.JID)
 	if err != nil {
 		puppet.log.Warnfln("Failed to update %s->%s: %v", puppet.JID, err)
 	}

database/upgrades/2019-05-23-puppet-custom-mxid-columns.go

@@ -0,0 +1,23 @@
+package upgrades
+
+import (
+	"database/sql"
+)
+
+func init() {
+	upgrades[5] = upgrade{"Add columns to store custom puppet info", func(dialect Dialect, tx *sql.Tx, db *sql.DB) error {
+		_, err := tx.Exec(`ALTER TABLE puppet ADD COLUMN custom_mxid VARCHAR(255)`)
+		if err != nil {
+			return err
+		}
+		_, err = tx.Exec(`ALTER TABLE puppet ADD COLUMN access_token VARCHAR(1023)`)
+		if err != nil {
+			return err
+		}
+		_, err = tx.Exec(`ALTER TABLE puppet ADD COLUMN next_batch VARCHAR(255)`)
+		if err != nil {
+			return err
+		}
+		return nil
+	}}
+}

database/upgrades/upgrades.go

@@ -22,7 +22,9 @@ type upgrade struct {
 	fn upgradeFunc
 }
 
-var upgrades [5]upgrade
+const NumberOfUpgrades = 6
+
+var upgrades [NumberOfUpgrades]upgrade
 
 func getVersion(dialect Dialect, db *sql.DB) (int, error) {
 	_, err := db.Exec("CREATE TABLE IF NOT EXISTS version (version INTEGER)")
@@ -63,7 +65,7 @@ func Run(log log.Logger, dialectName string, db *sql.DB) error {
 		return err
 	}
 
-	log.Infofln("Database currently on v%d, latest: v%d", version, len(upgrades))
+	log.Infofln("Database currently on v%d, latest: v%d", version, NumberOfUpgrades)
 	for i, upgrade := range upgrades[version:] {
 		log.Infofln("Upgrading database to v%d: %s", version+i+1, upgrade.message)
 		tx, err := db.Begin()