Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Double puppet support

Browse Source
This commit is contained in:
Gary Kramlich
2022-02-18 03:52:07 -06:00
parent c6be694106
commit dc3bdc2cec
15 changed files with 728 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/migrations/05-additional-puppet-fields.sql Normal file
View File

@@ -0,0 +1,2 @@
ALTER TABLE puppet ADD COLUMN next_batch TEXT;
ALTER TABLE puppet ADD COLUMN enable_receipts BOOLEAN NOT NULL DEFAULT true;

1
database/migrations/migrations.go
View File

@@ -43,6 +43,7 @@ func Run(db *sql.DB, baseLog log.Logger) error {
migrationFromFile("02-attachments.sql"),
migrationFromFile("03-emoji.sql"),
migrationFromFile("04-custom-puppet.sql"),
migrationFromFile("05-additional-puppet-fields.sql"),
),
)
if err != nil {

7
database/portalquery.go
View File

@@ -1,6 +1,7 @@
package database
import (
"github.com/bwmarrin/discordgo"
log "maunium.net/go/maulogger/v2"
"maunium.net/go/mautrix/id"
)
@@ -33,6 +34,12 @@ func (pq *PortalQuery) GetAllByID(id string) []*Portal {
return pq.getAll("SELECT * FROM portal WHERE receiver=$1", id)
}
func (pq *PortalQuery) FindPrivateChats(receiver string) []*Portal {
query := "SELECT * FROM portal WHERE receiver=$1 AND type=$2;"
return pq.getAll(query, receiver, discordgo.ChannelTypeDM)
}
func (pq *PortalQuery) getAll(query string, args ...interface{}) []*Portal {
rows, err := pq.db.Query(query, args...)
if err != nil || rows == nil {

37
database/puppet.go
View File

@@ -8,8 +8,9 @@ import (
)
const (
puppetSelect = "SELECT id, display_name, avatar, avatar_url, " +
" enable_presence, custom_mxid, access_token" +
puppetSelect = "SELECT id, display_name, avatar, avatar_url," +
" enable_presence, custom_mxid, access_token, next_batch," +
" enable_receipts" +
" FROM puppet "
)
@@ -25,16 +26,22 @@ type Puppet struct {
EnablePresence bool
CustomMXID string
CustomMXID id.UserID
AccessToken string
NextBatch string
EnableReceipts bool
}
func (p *Puppet) Scan(row Scannable) *Puppet {
var did, displayName, avatar, avatarURL sql.NullString
var enablePresence sql.NullBool
var customMXID, accessToken sql.NullString
var customMXID, accessToken, nextBatch sql.NullString
err := row.Scan(&did, &displayName, &avatar, &avatarURL, &enablePresence,
&customMXID, &accessToken, &nextBatch, &p.EnableReceipts)
err := row.Scan(&did, &displayName, &avatar, &avatarURL, &enablePresence, &customMXID, &accessToken)
if err != nil {
if err != sql.ErrNoRows {
p.log.Errorln("Database scan failed:", err)
@@ -48,8 +55,9 @@ func (p *Puppet) Scan(row Scannable) *Puppet {
p.Avatar = avatar.String
p.AvatarURL, _ = id.ParseContentURI(avatarURL.String)
p.EnablePresence = enablePresence.Bool
p.CustomMXID = customMXID.String
p.CustomMXID = id.UserID(customMXID.String)
p.AccessToken = accessToken.String
p.NextBatch = nextBatch.String
return p
}
@@ -57,11 +65,12 @@ func (p *Puppet) Scan(row Scannable) *Puppet {
func (p *Puppet) Insert() {
query := "INSERT INTO puppet" +
" (id, display_name, avatar, avatar_url, enable_presence," +
" custom_mxid, access_token)" +
" VALUES ($1, $2, $3, $4, $5, $6, $7)"
" custom_mxid, access_token, next_batch, enable_receipts)" +
" VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)"
_, err := p.db.Exec(query, p.ID, p.DisplayName, p.Avatar,
p.AvatarURL.String(), p.EnablePresence, p.CustomMXID, p.AccessToken)
p.AvatarURL.String(), p.EnablePresence, p.CustomMXID, p.AccessToken,
p.NextBatch, p.EnableReceipts)
if err != nil {
p.log.Warnfln("Failed to insert %s: %v", p.ID, err)
@@ -70,12 +79,14 @@ func (p *Puppet) Insert() {
func (p *Puppet) Update() {
query := "UPDATE puppet" +
" SET display_name=$1, avatar=$2, avatar_url=$3, enable_presence=$4" +
" custom_mxid=$5, access_token=$6" +
" WHERE id=$7"
" SET display_name=$1, avatar=$2, avatar_url=$3, enable_presence=$4," +
" custom_mxid=$5, access_token=$6, next_batch=$7," +
" enable_receipts=$8" +
" WHERE id=$9"
_, err := p.db.Exec(query, p.DisplayName, p.Avatar, p.AvatarURL.String(),
p.EnablePresence, p.CustomMXID, p.AccessToken, p.ID)
p.EnablePresence, p.CustomMXID, p.AccessToken, p.NextBatch,
p.EnableReceipts, p.ID)
if err != nil {
p.log.Warnfln("Failed to update %s: %v", p.ID, err)