Add puppet and portal stuff and fix config stuff

This commit is contained in:
Tulir Asokan
2018-08-16 15:59:18 +03:00
parent fd3c1fb77c
commit 9c48eeb534
12 changed files with 474 additions and 30 deletions

View File

@ -28,7 +28,9 @@ type UserQuery struct {
func (uq *UserQuery) CreateTable() error {
_, err := uq.db.Exec(`CREATE TABLE IF NOT EXISTS user (
mxid VARCHAR(255) PRIMARY KEY,
mxid VARCHAR(255) PRIMARY KEY,
management_room VARCHAR(255),
client_id VARCHAR(255),
client_token VARCHAR(255),
@ -71,29 +73,43 @@ type User struct {
db *Database
log *log.Sublogger
UserID string
session whatsapp.Session
UserID string
ManagementRoom string
Session *whatsapp.Session
}
func (user *User) Scan(row Scannable) *User {
err := row.Scan(&user.UserID, &user.session.ClientId, &user.session.ClientToken, &user.session.ServerToken,
&user.session.EncKey, &user.session.MacKey, &user.session.Wid)
sess := whatsapp.Session{}
err := row.Scan(&user.UserID, &user.ManagementRoom, &sess.ClientId, &sess.ClientToken, &sess.ServerToken,
&sess.EncKey, &sess.MacKey, &sess.Wid)
if err != nil {
user.log.Fatalln("Database scan failed:", err)
}
if len(sess.ClientId) > 0 {
user.Session = &sess
} else {
user.Session = nil
}
return user
}
func (user *User) Insert() error {
_, err := user.db.Exec("INSERT INTO user VALUES (?, ?, ?, ?, ?, ?, ?)", user.UserID, user.session.ClientId,
user.session.ClientToken, user.session.ServerToken, user.session.EncKey, user.session.MacKey, user.session.Wid)
var sess whatsapp.Session
if user.Session != nil {
sess = *user.Session
}
_, err := user.db.Exec("INSERT INTO user VALUES (?, ?, ?, ?, ?, ?, ?, ?)", user.UserID, user.ManagementRoom,
sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey, sess.Wid)
return err
}
func (user *User) Update() error {
_, err := user.db.Exec("UPDATE user SET client_id=?, client_token=?, server_token=?, enc_key=?, mac_key=?, wid=? WHERE mxid=?",
user.session.ClientId, user.session.ClientToken, user.session.ServerToken, user.session.EncKey, user.session.MacKey,
user.session.Wid, user.UserID)
var sess whatsapp.Session
if user.Session != nil {
sess = *user.Session
}
_, err := user.db.Exec("UPDATE user SET management_room=?, client_id=?, client_token=?, server_token=?, enc_key=?, mac_key=?, wid=? WHERE mxid=?",
user.ManagementRoom,
sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey, sess.Wid, user.UserID)
return err
}