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

Fix desegregation changes to make the bridge work again

Browse Source
This commit is contained in:
Tulir Asokan
2018-08-30 01:10:26 +03:00
parent 347854dc8c
commit 22cdf519f2
9 changed files with 89 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
database/message.go
View File

@ -30,12 +30,12 @@ type MessageQuery struct {
func (mq *MessageQuery) CreateTable() error {
_, err := mq.db.Exec(`CREATE TABLE IF NOT EXISTS message (
chat_jid VARCHAR(25) NOT NULL,
chat_receiver VARCHAR(25) NOT NULL,
jid VARCHAR(255) NOT NULL,
chat_jid VARCHAR(25),
chat_receiver VARCHAR(25),
jid VARCHAR(255),
mxid VARCHAR(255) NOT NULL UNIQUE,
PRIMARY KEY (chat_jid, jid),
PRIMARY KEY (chat_jid, chat_receiver, jid),
FOREIGN KEY (chat_jid, chat_receiver) REFERENCES portal(jid, receiver)
)`)
return err
@ -97,9 +97,9 @@ func (msg *Message) Scan(row Scannable) *Message {
}
func (msg *Message) Insert() error {
_, err := msg.db.Exec("INSERT INTO message VALUES (?, ?, ?)", msg.Chat.JID, msg.Chat.Receiver, msg.JID, msg.MXID)
_, err := msg.db.Exec("INSERT INTO message VALUES (?, ?, ?, ?)", msg.Chat.JID, msg.Chat.Receiver, msg.JID, msg.MXID)
if err != nil {
msg.log.Warnfln("Failed to update %s: %v", msg.Chat, msg.JID, err)
msg.log.Warnfln("Failed to insert %s: %v", msg.Chat, msg.JID, err)
}
return err
}

4
database/portal.go
View File

@ -122,13 +122,15 @@ type Portal struct {
}
func (portal *Portal) Scan(row Scannable) *Portal {
err := row.Scan(&portal.Key.JID, &portal.Key.Receiver, &portal.MXID, &portal.Name, &portal.Topic, &portal.Avatar)
var mxid sql.NullString
err := row.Scan(&portal.Key.JID, &portal.Key.Receiver, &mxid, &portal.Name, &portal.Topic, &portal.Avatar)
if err != nil {
if err != sql.ErrNoRows {
portal.log.Errorln("Database scan failed:", err)
}
return nil
}
portal.MXID = mxid.String
return portal
}

5
database/puppet.go
View File

@ -74,13 +74,16 @@ type Puppet struct {
}
func (puppet *Puppet) Scan(row Scannable) *Puppet {
err := row.Scan(&puppet.JID, &puppet.Displayname, &puppet.Avatar)
var displayname, avatar sql.NullString
err := row.Scan(&puppet.JID, &displayname, &avatar)
if err != nil {
if err != sql.ErrNoRows {
puppet.log.Errorln("Database scan failed:", err)
}
return nil
}
puppet.Displayname = displayname.String
puppet.Avatar = avatar.String
return puppet
}

50
database/user.go
View File

@ -18,10 +18,12 @@ package database
import (
"database/sql"
"strings"
"github.com/Rhymen/go-whatsapp"
log "maunium.net/go/maulogger"
"maunium.net/go/mautrix-whatsapp/types"
"maunium.net/go/mautrix-whatsapp/whatsapp-ext"
)
type UserQuery struct {
@ -40,8 +42,7 @@ func (uq *UserQuery) CreateTable() error {
client_token VARCHAR(255),
server_token VARCHAR(255),
enc_key BLOB,
mac_key BLOB,
wid VARCHAR(255)
mac_key BLOB
)`)
return err
}
@ -74,7 +75,7 @@ func (uq *UserQuery) GetByMXID(userID types.MatrixUserID) *User {
}
func (uq *UserQuery) GetByJID(userID types.WhatsAppID) *User {
row := uq.db.QueryRow("SELECT * FROM user WHERE jid=?", userID)
row := uq.db.QueryRow("SELECT * FROM user WHERE jid=?", stripSuffix(userID))
if row == nil {
return nil
}
@ -92,28 +93,42 @@ type User struct {
}
func (user *User) Scan(row Scannable) *User {
sess := whatsapp.Session{}
err := row.Scan(&user.MXID, &user.JID, &user.ManagementRoom, &sess.ClientId, &sess.ClientToken, &sess.ServerToken,
&sess.EncKey, &sess.MacKey, &sess.Wid)
var managementRoom, clientID, clientToken, serverToken, jid sql.NullString
var encKey, macKey []byte
err := row.Scan(&user.MXID, &jid, &managementRoom, &clientID, &clientToken, &serverToken, &encKey, &macKey)
if err != nil {
if err != sql.ErrNoRows {
user.log.Errorln("Database scan failed:", err)
}
return nil
}
if len(sess.ClientId) > 0 {
user.Session = &sess
if len(jid.String) > 0 && len(clientID.String) > 0 {
user.JID = jid.String + whatsappExt.NewUserSuffix
user.Session = &whatsapp.Session{
ClientId: clientID.String,
ClientToken: clientToken.String,
ServerToken: serverToken.String,
EncKey: encKey,
MacKey: macKey,
Wid: jid.String + whatsappExt.OldUserSuffix,
}
} else {
user.Session = nil
}
return user
}
func (user *User) jidPtr() *string {
if len(user.JID) > 0 {
return &user.JID
func stripSuffix(jid types.WhatsAppID) string {
if len(jid) == 0 {
return jid
}
return nil
index := strings.IndexRune(jid, '@')
if index < 0 {
return jid
}
return jid[:index]
}
func (user *User) sessionUnptr() (sess whatsapp.Session) {
@ -125,16 +140,17 @@ func (user *User) sessionUnptr() (sess whatsapp.Session) {
func (user *User) Insert() error {
sess := user.sessionUnptr()
_, err := user.db.Exec("INSERT INTO user VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)", user.MXID, user.jidPtr(), user.ManagementRoom,
sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey, sess.Wid)
_, err := user.db.Exec("INSERT INTO user VALUES (?, ?, ?, ?, ?, ?, ?, ?)", user.MXID, stripSuffix(user.JID),
user.ManagementRoom,
sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey)
return err
}
func (user *User) Update() error {
sess := user.sessionUnptr()
_, err := user.db.Exec("UPDATE user SET jid=?, management_room=?, client_id=?, client_token=?, server_token=?, enc_key=?, mac_key=?, wid=? WHERE mxid=?",
user.jidPtr(), user.ManagementRoom,
sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey, sess.Wid,
_, err := user.db.Exec("UPDATE user SET jid=?, management_room=?, client_id=?, client_token=?, server_token=?, enc_key=?, mac_key=? WHERE mxid=?",
stripSuffix(user.JID), user.ManagementRoom,
sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey,
user.MXID)
return err
}