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

Tons of works on dm's.

Browse Source 
They mostly work including display names and avatars. However that's about all
they do right now.
This commit is contained in:
Gary Kramlich
2022-01-31 04:53:21 -06:00
parent f20d204dd7
commit c1bb55d3cf
11 changed files with 329 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
database/migrations/01-initial.sql
View File

@@ -1,6 +1,6 @@
CREATE TABLE portal (
id TEXT,
channel_id TEXT,
receiver TEXT,
mxid TEXT UNIQUE,
name TEXT NOT NULL,
@@ -11,7 +11,7 @@ CREATE TABLE portal (
first_event_id TEXT,
PRIMARY KEY (id, channel_id)
PRIMARY KEY (channel_id, receiver)
);
CREATE TABLE puppet (

12
database/portal.go
View File

@@ -26,7 +26,7 @@ type Portal struct {
func (p *Portal) Scan(row Scannable) *Portal {
var mxid, avatarURL, firstEventID sql.NullString
err := row.Scan(&p.Key.ID, &p.Key.ChannelID, &mxid, &p.Name, &p.Topic, &p.Avatar, &avatarURL, &firstEventID)
err := row.Scan(&p.Key.ChannelID, &p.Key.Receiver, &mxid, &p.Name, &p.Topic, &p.Avatar, &avatarURL, &firstEventID)
if err != nil {
if err != sql.ErrNoRows {
p.log.Errorln("Database scan failed:", err)
@@ -44,10 +44,10 @@ func (p *Portal) Scan(row Scannable) *Portal {
func (p *Portal) Insert() {
query := "INSERT INTO portal" +
" (id, mxid, channel_id, name, topic, avatar, avatar_url, first_event_id)" +
" (channel_id, receiver, mxid, name, topic, avatar, avatar_url, first_event_id)" +
" VALUES ($1, $2, $3, $4, $5, $6, $7, $8)"
_, err := p.db.Exec(query, p.Key.ID, p.MXID, p.Key.ChannelID,
_, err := p.db.Exec(query, p.Key.ChannelID, p.Key.Receiver, p.MXID,
p.Name, p.Topic, p.Avatar, p.AvatarURL.String(), p.FirstEventID.String())
if err != nil {
@@ -58,11 +58,11 @@ func (p *Portal) Insert() {
func (p *Portal) Update() {
query := "UPDATE portal SET" +
" mxid=$1, name=$2, topic=$3, avatar=$4, avatar_url=$5, first_event_id=$6" +
" WHERE id=$7 AND channel_id=$8"
" WHERE channel_id=$7 AND receiver=$8"
_, err := p.db.Exec(query, p.MXID, p.Name, p.Topic, p.Avatar,
p.AvatarURL.String(), p.FirstEventID.String(), p.Key.ID,
p.Key.ChannelID)
p.AvatarURL.String(), p.FirstEventID.String(), p.Key.ChannelID,
p.Key.Receiver)
if err != nil {
p.log.Warnfln("Failed to update %s: %v", p.Key, err)

12
database/portalkey.go
View File

@@ -1,20 +1,20 @@
package database
type PortalKey struct {
ID string
ChannelID string
Receiver string
}
func NewPortalKey(id, channelID string) PortalKey {
func NewPortalKey(channelID, receiver string) PortalKey {
return PortalKey{
ID: id,
ChannelID: channelID,
Receiver: receiver,
}
}
func (key PortalKey) String() string {
if key.ChannelID == key.ID {
return key.ID
if key.ChannelID == key.Receiver {
return key.Receiver
}
return key.ID + "-" + key.ChannelID
return key.ChannelID + "-" + key.Receiver
}

6
database/portalquery.go
View File

@@ -22,15 +22,15 @@ func (pq *PortalQuery) GetAll() []*Portal {
}
func (pq *PortalQuery) GetByID(key PortalKey) *Portal {
return pq.get("SELECT * FROM portal WHERE id=$1 AND channel_id=$2", key.ID, key.ChannelID)
return pq.get("SELECT * FROM portal WHERE channel_id=$1 AND receiver=$2", key.ChannelID, key.Receiver)
}
func (pq *PortalQuery) GetByMXID(mxid id.RoomID) *Portal {
return pq.get("SELECT * FROM portal WHERE mxid=$1", mxid)
}
func (pq *PortalQuery) GetAllByDID(did string) []*Portal {
return pq.getAll("SELECT * FROM portal WHERE id=$1", did)
func (pq *PortalQuery) GetAllByID(id string) []*Portal {
return pq.getAll("SELECT * FROM portal WHERE receiver=$1", id)
}
func (pq *PortalQuery) getAll(query string, args ...interface{}) []*Portal {

13
database/userquery.go
View File

@@ -18,7 +18,18 @@ func (uq *UserQuery) New() *User {
}
func (uq *UserQuery) GetByMXID(userID id.UserID) *User {
row := uq.db.QueryRow("SELECT mxid, id, management_room, token FROM user where mxid=$1", userID)
query := "SELECT mxid, id, management_room, token FROM user WHERE mxid=$1"
row := uq.db.QueryRow(query, userID)
if row == nil {
return nil
}
return uq.New().Scan(row)
}
func (uq *UserQuery) GetByID(id string) *User {
query := "SELECT mxid, id, management_room, token FROM user WHERE id=$1"
row := uq.db.QueryRow(query, id)
if row == nil {
return nil
}