Add support for custom emoji in reactions.
This seems to be working correctly, but element-desktop isn't rendering them, not sure if that's expected or not. Closes #4
This commit is contained in:
@@ -22,6 +22,7 @@ type Database struct {
|
||||
Message *MessageQuery
|
||||
Reaction *ReactionQuery
|
||||
Attachment *AttachmentQuery
|
||||
Emoji *EmojiQuery
|
||||
}
|
||||
|
||||
func New(dbType, uri string, maxOpenConns, maxIdleConns int, baseLog log.Logger) (*Database, error) {
|
||||
@@ -79,5 +80,10 @@ func New(dbType, uri string, maxOpenConns, maxIdleConns int, baseLog log.Logger)
|
||||
log: db.log.Sub("Attachment"),
|
||||
}
|
||||
|
||||
db.Emoji = &EmojiQuery{
|
||||
db: db,
|
||||
log: db.log.Sub("Emoji"),
|
||||
}
|
||||
|
||||
return db, nil
|
||||
}
|
||||
|
||||
70
database/emoji.go
Normal file
70
database/emoji.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 Emoji struct {
|
||||
db *Database
|
||||
log log.Logger
|
||||
|
||||
DiscordID string
|
||||
DiscordName string
|
||||
|
||||
MatrixURL id.ContentURI
|
||||
}
|
||||
|
||||
func (e *Emoji) Scan(row Scannable) *Emoji {
|
||||
var matrixURL sql.NullString
|
||||
err := row.Scan(&e.DiscordID, &e.DiscordName, &matrixURL)
|
||||
|
||||
if err != nil {
|
||||
if !errors.Is(err, sql.ErrNoRows) {
|
||||
e.log.Errorln("Database scan failed:", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
e.MatrixURL, _ = id.ParseContentURI(matrixURL.String)
|
||||
|
||||
return e
|
||||
}
|
||||
|
||||
func (e *Emoji) Insert() {
|
||||
query := "INSERT INTO emoji" +
|
||||
" (discord_id, discord_name, matrix_url)" +
|
||||
" VALUES ($1, $2, $3);"
|
||||
|
||||
_, err := e.db.Exec(query, e.DiscordID, e.DiscordName, e.MatrixURL.String())
|
||||
|
||||
if err != nil {
|
||||
e.log.Warnfln("Failed to insert emoji %s: %v", e.DiscordID, err)
|
||||
}
|
||||
}
|
||||
|
||||
func (e *Emoji) Delete() {
|
||||
query := "DELETE FROM emoji WHERE discord_id=$1"
|
||||
|
||||
_, err := e.db.Exec(query, e.DiscordID)
|
||||
if err != nil {
|
||||
e.log.Warnfln("Failed to delete emoji %s: %v", e.DiscordID, err)
|
||||
}
|
||||
}
|
||||
|
||||
func (e *Emoji) APIName() string {
|
||||
if e.DiscordID != "" && e.DiscordName != "" {
|
||||
return e.DiscordName + ":" + e.DiscordID
|
||||
}
|
||||
|
||||
if e.DiscordName != "" {
|
||||
return e.DiscordName
|
||||
}
|
||||
|
||||
return e.DiscordID
|
||||
}
|
||||
44
database/emojiquery.go
Normal file
44
database/emojiquery.go
Normal file
@@ -0,0 +1,44 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
log "maunium.net/go/maulogger/v2"
|
||||
|
||||
"maunium.net/go/mautrix/id"
|
||||
)
|
||||
|
||||
type EmojiQuery struct {
|
||||
db *Database
|
||||
log log.Logger
|
||||
}
|
||||
|
||||
const (
|
||||
emojiSelect = "SELECT discord_id, discord_name, matrix_url FROM emoji"
|
||||
)
|
||||
|
||||
func (eq *EmojiQuery) New() *Emoji {
|
||||
return &Emoji{
|
||||
db: eq.db,
|
||||
log: eq.log,
|
||||
}
|
||||
}
|
||||
|
||||
func (eq *EmojiQuery) GetByDiscordID(discordID string) *Emoji {
|
||||
query := emojiSelect + " WHERE discord_id=$1"
|
||||
|
||||
return eq.get(query, discordID)
|
||||
}
|
||||
|
||||
func (eq *EmojiQuery) GetByMatrixURL(matrixURL id.ContentURI) *Emoji {
|
||||
query := emojiSelect + " WHERE matrix_url=$1"
|
||||
|
||||
return eq.get(query, matrixURL.String())
|
||||
}
|
||||
|
||||
func (eq *EmojiQuery) get(query string, args ...interface{}) *Emoji {
|
||||
row := eq.db.QueryRow(query, args...)
|
||||
if row == nil {
|
||||
return nil
|
||||
}
|
||||
|
||||
return eq.New().Scan(row)
|
||||
}
|
||||
5
database/migrations/03-emoji.sql
Normal file
5
database/migrations/03-emoji.sql
Normal file
@@ -0,0 +1,5 @@
|
||||
CREATE TABLE emoji (
|
||||
discord_id TEXT NOT NULL PRIMARY KEY,
|
||||
discord_name TEXT,
|
||||
matrix_url TEXT
|
||||
);
|
||||
@@ -41,6 +41,7 @@ func Run(db *sql.DB, baseLog log.Logger) error {
|
||||
migrator.Migrations(
|
||||
migrationFromFile("01-initial.sql"),
|
||||
migrationFromFile("02-attachments.sql"),
|
||||
migrationFromFile("03-emoji.sql"),
|
||||
),
|
||||
)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user