Add avatars, room topics and message deduplication

database/database.go

@@ -26,9 +26,10 @@ type Database struct {
 	*sql.DB
 	log log.Logger
 
-	User   *UserQuery
-	Portal *PortalQuery
-	Puppet *PuppetQuery
+	User    *UserQuery
+	Portal  *PortalQuery
+	Puppet  *PuppetQuery
+	Message *MessageQuery
 }
 
 func New(file string) (*Database, error) {
@@ -53,6 +54,10 @@ func New(file string) (*Database, error) {
 		db:  db,
 		log: db.log.Sub("Puppet"),
 	}
+	db.Message = &MessageQuery{
+		db:  db,
+		log: db.log.Sub("Message"),
+	}
 	return db, nil
 }
 
@@ -69,6 +74,10 @@ func (db *Database) CreateTables() error {
 	if err != nil {
 		return err
 	}
+	err = db.Message.CreateTable()
+	if err != nil {
+		return err
+	}
 	return nil
 }
 

database/message.go

@@ -0,0 +1,111 @@
+// 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"
+	"maunium.net/go/mautrix-whatsapp/types"
+	"database/sql"
+)
+
+type MessageQuery struct {
+	db  *Database
+	log log.Logger
+}
+
+func (mq *MessageQuery) CreateTable() error {
+	_, err := mq.db.Exec(`CREATE TABLE IF NOT EXISTS message (
+		owner VARCHAR(255),
+		jid   VARCHAR(255),
+		mxid  VARCHAR(255) NOT NULL UNIQUE,
+
+		PRIMARY KEY (owner, jid),
+		FOREIGN KEY (owner) REFERENCES user(mxid)
+	)`)
+	return err
+}
+
+func (mq *MessageQuery) New() *Message {
+	return &Message{
+		db:  mq.db,
+		log: mq.log,
+	}
+}
+
+func (mq *MessageQuery) GetAll(owner types.MatrixUserID) (messages []*Message) {
+	rows, err := mq.db.Query("SELECT * FROM message WHERE owner=?", owner)
+	if err != nil || rows == nil {
+		return nil
+	}
+	defer rows.Close()
+	for rows.Next() {
+		messages = append(messages, mq.New().Scan(rows))
+	}
+	return
+}
+
+func (mq *MessageQuery) GetByJID(owner types.MatrixUserID, jid types.WhatsAppMessageID) *Message {
+	return mq.get("SELECT * FROM message WHERE jid=?", jid)
+}
+
+func (mq *MessageQuery) GetByMXID(mxid types.MatrixEventID) *Message {
+	return mq.get("SELECT * FROM message WHERE mxid=?", mxid)
+}
+
+func (mq *MessageQuery) get(query string, args ...interface{}) *Message {
+	row := mq.db.QueryRow(query, args...)
+	if row == nil {
+		return nil
+	}
+	return mq.New().Scan(row)
+}
+
+type Message struct {
+	db  *Database
+	log log.Logger
+
+	Owner types.MatrixUserID
+	JID   types.WhatsAppMessageID
+	MXID  types.MatrixEventID
+}
+
+func (msg *Message) Scan(row Scannable) *Message {
+	err := row.Scan(&msg.Owner, &msg.JID, &msg.MXID)
+	if err != nil {
+		if err != sql.ErrNoRows {
+			msg.log.Fatalln("Database scan failed:", err)
+		}
+		return nil
+	}
+	return msg
+}
+
+func (msg *Message) Insert() error {
+	_, err := msg.db.Exec("INSERT INTO message VALUES (?, ?, ?)", msg.Owner, msg.JID, msg.MXID)
+	if err != nil {
+		msg.log.Warnfln("Failed to update %s->%s: %v", msg.Owner, msg.JID, err)
+	}
+	return err
+}
+
+func (msg *Message) Update() error {
+	_, err := msg.db.Exec("UPDATE portal SET mxid=? WHERE owner=? AND jid=?", msg.MXID, msg.Owner, msg.JID)
+	if err != nil {
+		msg.log.Warnfln("Failed to update %s->%s: %v", msg.Owner, msg.JID, err)
+	}
+	return err
+}

database/portal.go

@@ -31,7 +31,11 @@ func (pq *PortalQuery) CreateTable() error {
 	_, err := pq.db.Exec(`CREATE TABLE IF NOT EXISTS portal (
 		jid   VARCHAR(255),
 		owner VARCHAR(255),
-		mxid  VARCHAR(255) NOT NULL UNIQUE,
+		mxid  VARCHAR(255) UNIQUE,
+
+		name   VARCHAR(255),
+		topic  VARCHAR(255),
+		avatar VARCHAR(255),
 
 		PRIMARY KEY (jid, owner),
 		FOREIGN KEY (owner) REFERENCES user(mxid)
@@ -83,11 +87,12 @@ type Portal struct {
 	Owner types.MatrixUserID
 
 	Name   string
+	Topic  string
 	Avatar string
 }
 
 func (portal *Portal) Scan(row Scannable) *Portal {
-	err := row.Scan(&portal.JID, &portal.Owner, &portal.MXID)
+	err := row.Scan(&portal.JID, &portal.Owner, &portal.MXID, &portal.Name, &portal.Topic, &portal.Avatar)
 	if err != nil {
 		if err != sql.ErrNoRows {
 			portal.log.Fatalln("Database scan failed:", err)
@@ -98,15 +103,25 @@ func (portal *Portal) Scan(row Scannable) *Portal {
 }
 
 func (portal *Portal) Insert() error {
-	_, err := portal.db.Exec("INSERT INTO portal VALUES (?, ?, ?)", portal.JID, portal.Owner, portal.MXID)
+	var mxid *string
+	if len(portal.MXID) > 0 {
+		mxid = &portal.MXID
+	}
+	_, err := portal.db.Exec("INSERT INTO portal VALUES (?, ?, ?, ?, ?, ?)",
+		portal.JID, portal.Owner, mxid, portal.Name, portal.Topic, portal.Avatar)
 	if err != nil {
-		portal.log.Warnfln("Failed to update %s->%s: %v", portal.JID, portal.Owner, err)
+		portal.log.Warnfln("Failed to insert %s->%s: %v", portal.JID, portal.Owner, err)
 	}
 	return err
 }
 
 func (portal *Portal) Update() error {
-	_, err := portal.db.Exec("UPDATE portal SET mxid=? WHERE jid=? AND owner=?", portal.MXID, portal.JID, portal.Owner)
+	var mxid *string
+	if len(portal.MXID) > 0 {
+		mxid = &portal.MXID
+	}
+	_, err := portal.db.Exec("UPDATE portal SET mxid=?, name=?, topic=?, avatar=? WHERE jid=? AND owner=?",
+		mxid, portal.Name, portal.Topic, portal.Avatar, portal.JID, portal.Owner)
 	if err != nil {
 		portal.log.Warnfln("Failed to update %s->%s: %v", portal.JID, portal.Owner, err)
 	}