Store the message map

database/database.go

@@ -16,9 +16,10 @@ type Database struct {
 	log     log.Logger
 	dialect string
 
-	User   *UserQuery
-	Portal *PortalQuery
-	Puppet *PuppetQuery
+	User    *UserQuery
+	Portal  *PortalQuery
+	Puppet  *PuppetQuery
+	Message *MessageQuery
 }
 
 func New(dbType, uri string, maxOpenConns, maxIdleConns int, baseLog log.Logger) (*Database, error) {
@@ -61,5 +62,10 @@ func New(dbType, uri string, maxOpenConns, maxIdleConns int, baseLog log.Logger)
 		log: db.log.Sub("Puppet"),
 	}
 
+	db.Message = &MessageQuery{
+		db:  db,
+		log: db.log.Sub("Message"),
+	}
+
 	return db, nil
 }

database/message.go

@@ -0,0 +1,66 @@
+package database
+
+import (
+	"database/sql"
+	"errors"
+	"time"
+
+	log "maunium.net/go/maulogger/v2"
+	"maunium.net/go/mautrix/id"
+)
+
+type Message struct {
+	db  *Database
+	log log.Logger
+
+	Channel PortalKey
+
+	DiscordID string
+	MatrixID  id.EventID
+
+	AuthorID  string
+	Timestamp time.Time
+}
+
+func (m *Message) Scan(row Scannable) *Message {
+	var ts int64
+
+	err := row.Scan(&m.Channel.ChannelID, &m.Channel.Receiver, &m.DiscordID, &m.MatrixID, &m.AuthorID, &ts)
+	if err != nil {
+		if !errors.Is(err, sql.ErrNoRows) {
+			m.log.Errorln("Database scan failed:", err)
+		}
+
+		return nil
+	}
+
+	if ts != 0 {
+		m.Timestamp = time.Unix(ts, 0)
+	}
+
+	return m
+}
+
+func (m *Message) Insert() {
+	query := "INSERT INTO message" +
+		" (channel_id, receiver, discord_message_id, matrix_message_id," +
+		" author_id, timestamp) VALUES ($1, $2, $3, $4, $5, $6)"
+
+	_, err := m.db.Exec(query, m.Channel.ChannelID, m.Channel.Receiver,
+		m.DiscordID, m.MatrixID, m.AuthorID, m.Timestamp.Unix())
+
+	if err != nil {
+		m.log.Warnfln("Failed to insert %s@%s: %v", m.Channel, m.DiscordID, err)
+	}
+}
+
+func (m *Message) UpdateMatrixID(mxid id.EventID) {
+	query := "UPDATE message SET matrix_message_id=$1 WHERE channel_id=$2" +
+		"AND receiver=$3 AND discord_message_id=$4"
+	m.MatrixID = mxid
+
+	_, err := m.db.Exec(query, m.MatrixID, m.Channel.ChannelID, m.Channel.Receiver, m.DiscordID)
+	if err != nil {
+		m.log.Warnfln("Failed to update %s@%s: %v", m.Channel, m.DiscordID, err)
+	}
+}

database/messagequery.go

@@ -0,0 +1,64 @@
+package database
+
+import (
+	log "maunium.net/go/maulogger/v2"
+	"maunium.net/go/mautrix/id"
+)
+
+type MessageQuery struct {
+	db  *Database
+	log log.Logger
+}
+
+const (
+	messageSelect = "SELECT channel_id, receiver, discord_message_id," +
+		" matrix_message_id, author_id, timestamp FROM message"
+)
+
+func (mq *MessageQuery) New() *Message {
+	return &Message{
+		db:  mq.db,
+		log: mq.log,
+	}
+}
+
+func (mq *MessageQuery) GetAll(key PortalKey) []*Message {
+	query := messageSelect + " WHERE channeld_id=$1 AND receiver=$2"
+
+	rows, err := mq.db.Query(query, key.ChannelID, key.Receiver)
+	if err != nil || rows == nil {
+		return nil
+	}
+
+	messages := []*Message{}
+	for rows.Next() {
+		messages = append(messages, mq.New().Scan(rows))
+	}
+
+	return messages
+}
+
+func (mq *MessageQuery) GetByDiscordID(key PortalKey, discordID string) *Message {
+	query := messageSelect + " WHERE channel_id=$1 AND receiver=$2 AND" +
+		" discord_message_id=$3"
+
+	row := mq.db.QueryRow(query, key.ChannelID, key.Receiver, discordID)
+	if row == nil {
+		mq.log.Debugfln("failed to find existing message for discord_id %s", discordID)
+		return nil
+	}
+
+	return mq.New().Scan(row)
+}
+
+func (mq *MessageQuery) GetByMatrixID(key PortalKey, matrixID id.EventID) *Message {
+	query := messageSelect + " WHERE channel_id=$1 AND receiver=$2 AND" +
+		" matrix_message_id=$3"
+
+	row := mq.db.QueryRow(query, key.ChannelID, key.Receiver, matrixID)
+	if row == nil {
+		return nil
+	}
+
+	return mq.New().Scan(row)
+}

database/migrations/01-initial.sql

@@ -33,6 +33,20 @@ CREATE TABLE user (
 	token TEXT
 );
 
+CREATE TABLE message (
+	channel_id TEXT NOT NULL,
+	receiver TEXT NOT NULL,
+
+	discord_message_id TEXT NOT NULL,
+	matrix_message_id TEXT NOT NULL UNIQUE,
+
+	author_id TEXT NOT NULL,
+	timestamp BIGINT NOT NULL,
+
+	PRIMARY KEY(discord_message_id, channel_id, receiver),
+	FOREIGN KEY(channel_id, receiver) REFERENCES portal(channel_id, receiver) ON DELETE CASCADE
+);
+
 CREATE TABLE mx_user_profile (
 	room_id     TEXT,
 	user_id     TEXT,

database/portal.go

@@ -20,6 +20,9 @@ type Portal struct {
 	Avatar    string
 	AvatarURL id.ContentURI
 
+	Type   int
+	DMUser string
+
 	FirstEventID id.EventID
 }