watsonb8/groupme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add handling for group metadata changes and refactor things

Browse Source 
Group metadata temporarily broken until power level bridging is implemented
This commit is contained in:
Tulir Asokan
2018-08-26 01:55:21 +03:00
parent ccfa85e44a
commit d3a178ecf3
19 changed files with 247 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
database/message.go
View File

@ -87,7 +87,7 @@ func (msg *Message) Scan(row Scannable) *Message {
err := row.Scan(&msg.Owner, &msg.JID, &msg.MXID)
if err != nil {
if err != sql.ErrNoRows {
msg.log.Fatalln("Database scan failed:", err)
msg.log.Errorln("Database scan failed:", err)
}
return nil
}

8
database/portal.go
View File

@ -33,9 +33,9 @@ func (pq *PortalQuery) CreateTable() error {
owner VARCHAR(255),
mxid VARCHAR(255) UNIQUE,
name VARCHAR(255),
topic VARCHAR(255),
avatar VARCHAR(255),
name VARCHAR(255) NOT NULL,
topic VARCHAR(255) NOT NULL,
avatar VARCHAR(255) NOT NULL,
PRIMARY KEY (jid, owner),
FOREIGN KEY (owner) REFERENCES user(mxid)
@ -95,7 +95,7 @@ func (portal *Portal) Scan(row Scannable) *Portal {
err := row.Scan(&portal.JID, &portal.Owner, &portal.MXID, &portal.Name, &portal.Topic, &portal.Avatar)
if err != nil {
if err != sql.ErrNoRows {
portal.log.Fatalln("Database scan failed:", err)
portal.log.Errorln("Database scan failed:", err)
}
return nil
}

2
database/puppet.go
View File

@ -82,7 +82,7 @@ func (puppet *Puppet) Scan(row Scannable) *Puppet {
err := row.Scan(&puppet.JID, &puppet.Receiver, &puppet.Displayname, &puppet.Avatar)
if err != nil {
if err != sql.ErrNoRows {
puppet.log.Fatalln("Database scan failed:", err)
puppet.log.Errorln("Database scan failed:", err)
}
return nil
}

2
database/user.go
View File

@ -86,7 +86,7 @@ func (user *User) Scan(row Scannable) *User {
&sess.EncKey, &sess.MacKey, &sess.Wid)
if err != nil {
if err != sql.ErrNoRows {
user.log.Fatalln("Database scan failed:", err)
user.log.Errorln("Database scan failed:", err)
}
return nil
}