Implement attachments for Discord -> Matrix
This commit is contained in:
70
database/attachment.go
Normal file
70
database/attachment.go
Normal file
@@ -0,0 +1,70 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
|
||||
log "maunium.net/go/maulogger/v2"
|
||||
"maunium.net/go/mautrix/id"
|
||||
)
|
||||
|
||||
type Attachment struct {
|
||||
db *Database
|
||||
log log.Logger
|
||||
|
||||
Channel PortalKey
|
||||
|
||||
DiscordMessageID string
|
||||
DiscordAttachmentID string
|
||||
MatrixEventID id.EventID
|
||||
}
|
||||
|
||||
func (a *Attachment) Scan(row Scannable) *Attachment {
|
||||
err := row.Scan(
|
||||
&a.Channel.ChannelID, &a.Channel.Receiver,
|
||||
&a.DiscordMessageID, &a.DiscordAttachmentID,
|
||||
&a.MatrixEventID)
|
||||
|
||||
if err != nil {
|
||||
if !errors.Is(err, sql.ErrNoRows) {
|
||||
a.log.Errorln("Database scan failed:", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
return a
|
||||
}
|
||||
|
||||
func (a *Attachment) Insert() {
|
||||
query := "INSERT INTO attachment" +
|
||||
" (channel_id, receiver, discord_message_id, discord_attachment_id, " +
|
||||
" matrix_event_id) VALUES ($1, $2, $3, $4, $5);"
|
||||
|
||||
_, err := a.db.Exec(
|
||||
query,
|
||||
a.Channel.ChannelID, a.Channel.Receiver,
|
||||
a.DiscordMessageID, a.DiscordAttachmentID,
|
||||
a.MatrixEventID,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
a.log.Warnfln("Failed to insert attachment for %s@%s: %v", a.Channel, a.DiscordMessageID, err)
|
||||
}
|
||||
}
|
||||
|
||||
func (a *Attachment) Delete() {
|
||||
query := "DELETE FROM attachment WHERE" +
|
||||
" channel_id=$1 AND receiver=$2 AND discord_attachment_id=$3 AND" +
|
||||
" matrix_event_id=$4"
|
||||
|
||||
_, err := a.db.Exec(
|
||||
query,
|
||||
a.Channel.ChannelID, a.Channel.Receiver,
|
||||
a.DiscordAttachmentID, a.MatrixEventID,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
a.log.Warnfln("Failed to delete attachment for %s@%s: %v", a.Channel, a.DiscordAttachmentID, err)
|
||||
}
|
||||
}
|
||||
73
database/attachmentquery.go
Normal file
73
database/attachmentquery.go
Normal file
@@ -0,0 +1,73 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
log "maunium.net/go/maulogger/v2"
|
||||
"maunium.net/go/mautrix/id"
|
||||
)
|
||||
|
||||
type AttachmentQuery struct {
|
||||
db *Database
|
||||
log log.Logger
|
||||
}
|
||||
|
||||
const (
|
||||
attachmentSelect = "SELECT channel_id, receiver, discord_message_id," +
|
||||
" discord_attachment_id, matrix_event_id FROM attachment"
|
||||
)
|
||||
|
||||
func (aq *AttachmentQuery) New() *Attachment {
|
||||
return &Attachment{
|
||||
db: aq.db,
|
||||
log: aq.log,
|
||||
}
|
||||
}
|
||||
|
||||
func (aq *AttachmentQuery) GetAllByDiscordMessageID(key PortalKey, discordMessageID string) []*Attachment {
|
||||
query := attachmentSelect + " WHERE channel_id=$1 AND receiver=$2 AND" +
|
||||
" discord_message_id=$3"
|
||||
|
||||
return aq.getAll(query, key.ChannelID, key.Receiver, discordMessageID)
|
||||
}
|
||||
|
||||
func (aq *AttachmentQuery) getAll(query string, args ...interface{}) []*Attachment {
|
||||
rows, err := aq.db.Query(query, args...)
|
||||
if err != nil {
|
||||
aq.log.Debugfln("getAll failed: %v", err)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
if rows == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
attachments := []*Attachment{}
|
||||
for rows.Next() {
|
||||
attachments = append(attachments, aq.New().Scan(rows))
|
||||
}
|
||||
|
||||
return attachments
|
||||
}
|
||||
|
||||
func (aq *AttachmentQuery) GetByDiscordAttachmentID(key PortalKey, discordMessageID, discordID string) *Attachment {
|
||||
query := attachmentSelect + " WHERE channel_id=$1 AND receiver=$2" +
|
||||
" AND discord_message_id=$3 AND discord_id=$4"
|
||||
|
||||
return aq.get(query, key.ChannelID, key.Receiver, discordMessageID, discordID)
|
||||
}
|
||||
|
||||
func (aq *AttachmentQuery) GetByMatrixID(key PortalKey, matrixEventID id.EventID) *Attachment {
|
||||
query := attachmentSelect + " WHERE channel_id=$1 AND receiver=$2" +
|
||||
" AND matrix_event_id=$3"
|
||||
|
||||
return aq.get(query, key.ChannelID, key.Receiver, matrixEventID)
|
||||
}
|
||||
|
||||
func (aq *AttachmentQuery) get(query string, args ...interface{}) *Attachment {
|
||||
row := aq.db.QueryRow(query, args...)
|
||||
if row == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
return aq.New().Scan(row)
|
||||
}
|
||||
@@ -16,11 +16,12 @@ type Database struct {
|
||||
log log.Logger
|
||||
dialect string
|
||||
|
||||
User *UserQuery
|
||||
Portal *PortalQuery
|
||||
Puppet *PuppetQuery
|
||||
Message *MessageQuery
|
||||
Reaction *ReactionQuery
|
||||
User *UserQuery
|
||||
Portal *PortalQuery
|
||||
Puppet *PuppetQuery
|
||||
Message *MessageQuery
|
||||
Reaction *ReactionQuery
|
||||
Attachment *AttachmentQuery
|
||||
}
|
||||
|
||||
func New(dbType, uri string, maxOpenConns, maxIdleConns int, baseLog log.Logger) (*Database, error) {
|
||||
@@ -73,5 +74,10 @@ func New(dbType, uri string, maxOpenConns, maxIdleConns int, baseLog log.Logger)
|
||||
log: db.log.Sub("Reaction"),
|
||||
}
|
||||
|
||||
db.Attachment = &AttachmentQuery{
|
||||
db: db,
|
||||
log: db.log.Sub("Attachment"),
|
||||
}
|
||||
|
||||
return db, nil
|
||||
}
|
||||
|
||||
12
database/migrations/02-attachments.sql
Normal file
12
database/migrations/02-attachments.sql
Normal file
@@ -0,0 +1,12 @@
|
||||
CREATE TABLE attachment (
|
||||
channel_id TEXT NOT NULL,
|
||||
receiver TEXT NOT NULL,
|
||||
|
||||
discord_message_id TEXT NOT NULL,
|
||||
discord_attachment_id TEXT NOT NULL,
|
||||
|
||||
matrix_event_id TEXT NOT NULL UNIQUE,
|
||||
|
||||
PRIMARY KEY(discord_attachment_id, matrix_event_id),
|
||||
FOREIGN KEY(channel_id, receiver) REFERENCES portal(channel_id, receiver) ON DELETE CASCADE
|
||||
);
|
||||
@@ -40,6 +40,7 @@ func Run(db *sql.DB, baseLog log.Logger) error {
|
||||
migrator.WithLogger(logger),
|
||||
migrator.Migrations(
|
||||
migrationFromFile("01-initial.sql"),
|
||||
migrationFromFile("02-attachments.sql"),
|
||||
),
|
||||
)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user