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

Add DM rooms to space

Browse Source
This commit is contained in:
Tulir Asokan
2022-05-28 23:41:34 +03:00
parent 91dbc83b5d
commit d797541cdc
7 changed files with 247 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
database/upgrades/00-latest-revision.sql
View File

@@ -28,6 +28,7 @@ CREATE TABLE portal (
name TEXT NOT NULL,
name_set BOOLEAN NOT NULL,
topic TEXT NOT NULL,
topic_set BOOLEAN NOT NULL,
avatar TEXT NOT NULL,
avatar_url TEXT NOT NULL,
avatar_set BOOLEAN NOT NULL,
@@ -72,18 +73,19 @@ CREATE TABLE "user" (
discord_token TEXT,
management_room TEXT,
space_room TEXT
space_room TEXT,
dm_space_room TEXT
);
CREATE TABLE user_guild (
guild_id TEXT,
user_mxid TEXT,
in_space BOOLEAN NOT NULL,
timestamp BIGINT NOT NULL,
CREATE TABLE user_portal (
discord_id TEXT,
user_mxid TEXT,
type TEXT NOT NULL,
in_space BOOLEAN NOT NULL,
timestamp BIGINT NOT NULL,
PRIMARY KEY (guild_id, user_mxid),
CONSTRAINT ug_guild_fkey FOREIGN KEY (guild_id) REFERENCES guild (dcid) ON DELETE CASCADE,
CONSTRAINT ug_user_fkey FOREIGN KEY (user_mxid) REFERENCES "user" (mxid) ON DELETE CASCADE
PRIMARY KEY (discord_id, user_mxid),
CONSTRAINT up_user_fkey FOREIGN KEY (user_mxid) REFERENCES "user" (mxid) ON DELETE CASCADE
);
CREATE TABLE message (

17
database/upgrades/03-spaces.sql
View File

@@ -13,15 +13,15 @@ CREATE TABLE guild (
auto_bridge_channels BOOLEAN NOT NULL
);
CREATE TABLE user_guild (
guild_id TEXT,
user_mxid TEXT,
in_space BOOLEAN NOT NULL,
timestamp BIGINT NOT NULL,
CREATE TABLE user_portal (
discord_id TEXT,
user_mxid TEXT,
type TEXT NOT NULL,
in_space BOOLEAN NOT NULL,
timestamp BIGINT NOT NULL,
PRIMARY KEY (guild_id, user_mxid),
CONSTRAINT ug_guild_fkey FOREIGN KEY (guild_id) REFERENCES guild (dcid) ON DELETE CASCADE,
CONSTRAINT ug_user_fkey FOREIGN KEY (user_mxid) REFERENCES "user" (mxid) ON DELETE CASCADE
PRIMARY KEY (discord_id, user_mxid),
CONSTRAINT up_user_fkey FOREIGN KEY (user_mxid) REFERENCES "user" (mxid) ON DELETE CASCADE
);
ALTER TABLE portal ADD COLUMN dc_guild_id TEXT;
@@ -52,6 +52,7 @@ ALTER TABLE puppet ALTER COLUMN name_set DROP DEFAULT;
ALTER TABLE puppet ALTER COLUMN avatar_set DROP DEFAULT;
ALTER TABLE "user" ADD COLUMN space_room TEXT;
ALTER TABLE "user" ADD COLUMN dm_space_room TEXT;
ALTER TABLE "user" RENAME COLUMN token TO discord_token;
UPDATE message SET timestamp=timestamp*1000;

92
database/user.go
View File

@@ -2,8 +2,6 @@ package database
import (
"database/sql"
"errors"
"time"
log "maunium.net/go/maulogger/v2"
@@ -24,18 +22,18 @@ func (uq *UserQuery) New() *User {
}
func (uq *UserQuery) GetByMXID(userID id.UserID) *User {
query := `SELECT mxid, dcid, discord_token, management_room, space_room FROM "user" WHERE mxid=$1`
query := `SELECT mxid, dcid, discord_token, management_room, space_room, dm_space_room FROM "user" WHERE mxid=$1`
return uq.New().Scan(uq.db.QueryRow(query, userID))
}
func (uq *UserQuery) GetByID(id string) *User {
query := `SELECT mxid, dcid, discord_token, management_room, space_room FROM "user" WHERE dcid=$1`
query := `SELECT mxid, dcid, discord_token, management_room, space_room, dm_space_room FROM "user" WHERE dcid=$1`
return uq.New().Scan(uq.db.QueryRow(query, id))
}
func (uq *UserQuery) GetAllWithToken() []*User {
query := `
SELECT mxid, dcid, discord_token, management_room, space_room
SELECT mxid, dcid, discord_token, management_room, space_room, dm_space_room
FROM "user" WHERE discord_token IS NOT NULL
`
rows, err := uq.db.Query(query)
@@ -62,81 +60,12 @@ type User struct {
DiscordToken string
ManagementRoom id.RoomID
SpaceRoom id.RoomID
}
type UserGuild struct {
GuildID string
Timestamp time.Time
InSpace bool
}
func (u *User) GetGuilds() []UserGuild {
res, err := u.db.Query("SELECT guild_id, timestamp, in_space FROM user_guild WHERE user_mxid=$1", u.MXID)
if err != nil {
u.log.Errorln("Failed to get guilds:", err)
panic(err)
return nil
}
var guilds []UserGuild
for res.Next() {
var guild UserGuild
var ts int64
err = res.Scan(&guild.GuildID, &ts, &guild.InSpace)
if err != nil {
u.log.Errorln("Error scanning user guild:", err)
panic(err)
} else {
guild.Timestamp = time.UnixMilli(ts)
guilds = append(guilds, guild)
}
}
return guilds
}
func (u *User) IsInSpace(guildID string) (isIn bool) {
query := `SELECT in_space FROM user_guild WHERE user_mxid=$1 AND guild_id=$2`
err := u.db.QueryRow(query, u.MXID, guildID).Scan(&isIn)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
u.log.Warnfln("Failed to scan in_space for %s/%s: %v", u.MXID, guildID, err)
panic(err)
}
return
}
func (u *User) MarkInGuild(guild UserGuild) {
query := `
INSERT INTO user_guild (guild_id, user_mxid, timestamp, in_space)
VALUES ($1, $2, $3, $4)
ON CONFLICT (guild_id, user_mxid) DO UPDATE
SET timestamp=excluded.timestamp, in_space=excluded.in_space
`
_, err := u.db.Exec(query, guild.GuildID, u.MXID, guild.Timestamp.UnixMilli(), guild.InSpace)
if err != nil {
u.log.Errorfln("Failed to insert user guild %s/%s: %v", u.MXID, guild.GuildID, err)
panic(err)
}
}
func (u *User) MarkNotInGuild(guildID string) {
query := `DELETE FROM user_guild WHERE user_mxid=$1 AND guild_id=$2`
_, err := u.db.Exec(query, u.MXID, guildID)
if err != nil {
u.log.Errorfln("Failed to remove user guild %s/%s: %v", u.MXID, guildID, err)
panic(err)
}
}
func (u *User) PruneGuildList(beforeTS time.Time) {
_, err := u.db.Exec("DELETE FROM user_guild WHERE user_mxid=$1 AND timestamp<$2", u.MXID, beforeTS.UnixMilli())
if err != nil {
u.log.Errorln("Failed to prune user guild list:", err)
panic(err)
}
DMSpaceRoom id.RoomID
}
func (u *User) Scan(row dbutil.Scannable) *User {
var discordID, managementRoom, spaceRoom, discordToken sql.NullString
err := row.Scan(&u.MXID, &discordID, &discordToken, &managementRoom, &spaceRoom)
var discordID, managementRoom, spaceRoom, dmSpaceRoom, discordToken sql.NullString
err := row.Scan(&u.MXID, &discordID, &discordToken, &managementRoom, &spaceRoom, &dmSpaceRoom)
if err != nil {
if err != sql.ErrNoRows {
u.log.Errorln("Database scan failed:", err)
@@ -148,12 +77,13 @@ func (u *User) Scan(row dbutil.Scannable) *User {
u.DiscordToken = discordToken.String
u.ManagementRoom = id.RoomID(managementRoom.String)
u.SpaceRoom = id.RoomID(spaceRoom.String)
u.DMSpaceRoom = id.RoomID(dmSpaceRoom.String)
return u
}
func (u *User) Insert() {
query := `INSERT INTO "user" (mxid, dcid, discord_token, management_room, space_room) VALUES ($1, $2, $3, $4, $5)`
_, err := u.db.Exec(query, u.MXID, strPtr(u.DiscordID), strPtr(u.DiscordToken), strPtr(string(u.ManagementRoom)), strPtr(string(u.SpaceRoom)))
query := `INSERT INTO "user" (mxid, dcid, discord_token, management_room, space_room, dm_space_room) VALUES ($1, $2, $3, $4, $5, $6)`
_, err := u.db.Exec(query, u.MXID, strPtr(u.DiscordID), strPtr(u.DiscordToken), strPtr(string(u.ManagementRoom)), strPtr(string(u.SpaceRoom)), strPtr(string(u.DMSpaceRoom)))
if err != nil {
u.log.Warnfln("Failed to insert %s: %v", u.MXID, err)
panic(err)
@@ -161,8 +91,8 @@ func (u *User) Insert() {
}
func (u *User) Update() {
query := `UPDATE "user" SET dcid=$1, discord_token=$2, management_room=$3, space_room=$4 WHERE mxid=$5`
_, err := u.db.Exec(query, strPtr(u.DiscordID), strPtr(u.DiscordToken), strPtr(string(u.ManagementRoom)), strPtr(string(u.SpaceRoom)), u.MXID)
query := `UPDATE "user" SET dcid=$1, discord_token=$2, management_room=$3, space_room=$4, dm_space_room=$5 WHERE mxid=$6`
_, err := u.db.Exec(query, strPtr(u.DiscordID), strPtr(u.DiscordToken), strPtr(string(u.ManagementRoom)), strPtr(string(u.SpaceRoom)), strPtr(string(u.DMSpaceRoom)), u.MXID)
if err != nil {
u.log.Warnfln("Failed to update %q: %v", u.MXID, err)
panic(err)

102
database/userportal.go Normal file
View File

@@ -0,0 +1,102 @@
package database
import (
"database/sql"
"errors"
"time"
log "maunium.net/go/maulogger/v2"
"maunium.net/go/mautrix/util/dbutil"
)
const (
UserPortalTypeDM = "dm"
UserPortalTypeGuild = "guild"
)
type UserPortal struct {
DiscordID string
Type string
Timestamp time.Time
InSpace bool
}
func (up UserPortal) Scan(l log.Logger, row dbutil.Scannable) *UserPortal {
var ts int64
err := row.Scan(&up.DiscordID, &up.Type, &ts, &up.InSpace)
if err != nil {
l.Errorln("Error scanning user portal:", err)
panic(err)
return nil
}
up.Timestamp = time.UnixMilli(ts)
return &up
}
func (u *User) scanUserPortals(rows *sql.Rows) []UserPortal {
var ups []UserPortal
for rows.Next() {
up := UserPortal{}.Scan(u.log, rows)
if up != nil {
ups = append(ups, *up)
}
}
return ups
}
func (u *User) GetPortals() []UserPortal {
rows, err := u.db.Query("SELECT discord_id, type, timestamp, in_space FROM user_portal WHERE user_mxid=$1", u.MXID)
if err != nil {
u.log.Errorln("Failed to get portals:", err)
panic(err)
return nil
}
return u.scanUserPortals(rows)
}
func (u *User) IsInSpace(discordID string) (isIn bool) {
query := `SELECT in_space FROM user_portal WHERE user_mxid=$1 AND discord_id=$2`
err := u.db.QueryRow(query, u.MXID, discordID).Scan(&isIn)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
u.log.Warnfln("Failed to scan in_space for %s/%s: %v", u.MXID, discordID, err)
panic(err)
}
return
}
func (u *User) MarkInPortal(portal UserPortal) {
query := `
INSERT INTO user_portal (discord_id, type, user_mxid, timestamp, in_space)
VALUES ($1, $2, $3, $4, $5)
ON CONFLICT (discord_id, user_mxid) DO UPDATE
SET timestamp=excluded.timestamp, in_space=excluded.in_space
`
_, err := u.db.Exec(query, portal.DiscordID, portal.Type, u.MXID, portal.Timestamp.UnixMilli(), portal.InSpace)
if err != nil {
u.log.Errorfln("Failed to insert user portal %s/%s: %v", u.MXID, portal.DiscordID, err)
panic(err)
}
}
func (u *User) MarkNotInPortal(discordID string) {
query := `DELETE FROM user_portal WHERE user_mxid=$1 AND discord_id=$2`
_, err := u.db.Exec(query, u.MXID, discordID)
if err != nil {
u.log.Errorfln("Failed to remove user portal %s/%s: %v", u.MXID, discordID, err)
panic(err)
}
}
func (u *User) PrunePortalList(beforeTS time.Time) []UserPortal {
query := `
DELETE FROM user_portal
WHERE user_mxid=$1 AND timestamp<$2
RETURNING discord_id, type, timestamp, in_space
`
rows, err := u.db.Query(query, u.MXID, beforeTS.UnixMilli())
if err != nil {
u.log.Errorln("Failed to prune user guild list:", err)
panic(err)
}
return u.scanUserPortals(rows)
}