Add puppet and portal stuff and fix config stuff

database/database.go

@@ -26,7 +26,9 @@ type Database struct {
 	*sql.DB
 	log *log.Sublogger
 
-	User *UserQuery
+	User   *UserQuery
+	Portal *PortalQuery
+	Puppet *PuppetQuery
 }
 
 func New(file string) (*Database, error) {
@@ -43,6 +45,14 @@ func New(file string) (*Database, error) {
 		db:  db,
 		log: log.CreateSublogger("Database/User", log.LevelDebug),
 	}
+	db.Portal = &PortalQuery{
+		db:  db,
+		log: log.CreateSublogger("Database/Portal", log.LevelDebug),
+	}
+	db.Puppet = &PuppetQuery{
+		db:  db,
+		log: log.CreateSublogger("Database/Puppet", log.LevelDebug),
+	}
 	return db, nil
 }
 

database/portal.go

@@ -44,8 +44,8 @@ func (pq *PortalQuery) New() *Portal {
 	}
 }
 
-func (pq *PortalQuery) GetAll() (portals []*Portal) {
-	rows, err := pq.db.Query("SELECT * FROM portal")
+func (pq *PortalQuery) GetAll(owner string) (portals []*Portal) {
+	rows, err := pq.db.Query("SELECT * FROM portal WHERE owner=?", owner)
 	if err != nil || rows == nil {
 		return nil
 	}

database/puppet.go

@@ -0,0 +1,98 @@
+// mautrix-whatsapp - A Matrix-WhatsApp puppeting bridge.
+// Copyright (C) 2018 Tulir Asokan
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package database
+
+import (
+	log "maunium.net/go/maulogger"
+)
+
+type PuppetQuery struct {
+	db  *Database
+	log *log.Sublogger
+}
+
+func (pq *PuppetQuery) CreateTable() error {
+	_, err := pq.db.Exec(`CREATE TABLE IF NOT EXISTS puppet (
+		jid      VARCHAR(255),
+		receiver VARCHAR(255),
+
+		displayname VARCHAR(255),
+		avatar      VARCHAR(255),
+
+		PRIMARY KEY(jid, receiver)
+	)`)
+	return err
+}
+
+func (pq *PuppetQuery) New() *Puppet {
+	return &Puppet{
+		db:  pq.db,
+		log: pq.log,
+	}
+}
+
+func (pq *PuppetQuery) GetAll() (puppets []*Puppet) {
+	rows, err := pq.db.Query("SELECT * FROM puppet")
+	if err != nil || rows == nil {
+		return nil
+	}
+	defer rows.Close()
+	for rows.Next() {
+		puppets = append(puppets, pq.New().Scan(rows))
+	}
+	return
+}
+
+func (pq *PuppetQuery) Get(jid, receiver string) *Puppet {
+	row := pq.db.QueryRow("SELECT * FROM user WHERE jid=? AND receiver=?", jid, receiver)
+	if row == nil {
+		return nil
+	}
+	return pq.New().Scan(row)
+}
+
+type Puppet struct {
+	db  *Database
+	log *log.Sublogger
+
+	JID      string
+	Receiver string
+
+	Displayname string
+	Avatar      string
+}
+
+func (puppet *Puppet) Scan(row Scannable) *Puppet {
+	err := row.Scan(&puppet.JID, &puppet.Receiver, &puppet.Displayname, &puppet.Avatar)
+	if err != nil {
+		puppet.log.Fatalln("Database scan failed:", err)
+	}
+	return puppet
+}
+
+func (puppet *Puppet) Insert() error {
+	_, err := puppet.db.Exec("INSERT INTO puppet VALUES (?, ?, ?, ?)",
+		puppet.JID, puppet.Receiver, puppet.Displayname, puppet.Avatar)
+	return err
+}
+
+func (puppet *Puppet) Update() error {
+	_, err := puppet.db.Exec("UPDATE puppet SET displayname=?, avatar=? WHERE jid=? AND receiver=?",
+		puppet.Displayname, puppet.Avatar,
+		puppet.JID, puppet.Receiver)
+	return err
+}

database/user.go

@@ -28,7 +28,9 @@ type UserQuery struct {
 
 func (uq *UserQuery) CreateTable() error {
 	_, err := uq.db.Exec(`CREATE TABLE IF NOT EXISTS user (
-		mxid  VARCHAR(255) PRIMARY KEY,
+		mxid VARCHAR(255) PRIMARY KEY,
+
+		management_room VARCHAR(255),
 
 		client_id    VARCHAR(255),
 		client_token VARCHAR(255),
@@ -71,29 +73,43 @@ type User struct {
 	db  *Database
 	log *log.Sublogger
 
-	UserID string
-
-	session whatsapp.Session
+	UserID         string
+	ManagementRoom string
+	Session        *whatsapp.Session
 }
 
 func (user *User) Scan(row Scannable) *User {
-	err := row.Scan(&user.UserID, &user.session.ClientId, &user.session.ClientToken, &user.session.ServerToken,
-		&user.session.EncKey, &user.session.MacKey, &user.session.Wid)
+	sess := whatsapp.Session{}
+	err := row.Scan(&user.UserID, &user.ManagementRoom, &sess.ClientId, &sess.ClientToken, &sess.ServerToken,
+		&sess.EncKey, &sess.MacKey, &sess.Wid)
 	if err != nil {
 		user.log.Fatalln("Database scan failed:", err)
 	}
+	if len(sess.ClientId) > 0 {
+		user.Session = &sess
+	} else {
+		user.Session = nil
+	}
 	return user
 }
 
 func (user *User) Insert() error {
-	_, err := user.db.Exec("INSERT INTO user VALUES (?, ?, ?, ?, ?, ?, ?)", user.UserID, user.session.ClientId,
-		user.session.ClientToken, user.session.ServerToken, user.session.EncKey, user.session.MacKey, user.session.Wid)
+	var sess whatsapp.Session
+	if user.Session != nil {
+		sess = *user.Session
+	}
+	_, err := user.db.Exec("INSERT INTO user VALUES (?, ?, ?, ?, ?, ?, ?, ?)", user.UserID, user.ManagementRoom,
+		sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey, sess.Wid)
 	return err
 }
 
 func (user *User) Update() error {
-	_, err := user.db.Exec("UPDATE user SET client_id=?, client_token=?, server_token=?, enc_key=?, mac_key=?, wid=? WHERE mxid=?",
-		user.session.ClientId, user.session.ClientToken, user.session.ServerToken, user.session.EncKey, user.session.MacKey,
-		user.session.Wid, user.UserID)
+	var sess whatsapp.Session
+	if user.Session != nil {
+		sess = *user.Session
+	}
+	_, err := user.db.Exec("UPDATE user SET management_room=?, client_id=?, client_token=?, server_token=?, enc_key=?, mac_key=?, wid=? WHERE mxid=?",
+		user.ManagementRoom,
+		sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey, sess.Wid, user.UserID)
 	return err
 }