BIG ASS COMMIT
This commit is contained in:
Karmanyaah Malhotra
@ -36,8 +36,9 @@ type SQLCryptoStore struct {
|
||||
var _ crypto.Store = (*SQLCryptoStore)(nil)
|
||||
|
||||
func NewSQLCryptoStore(db *Database, userID id.UserID, ghostIDFormat string) *SQLCryptoStore {
|
||||
raw, _ := db.DB.DB()
|
||||
return &SQLCryptoStore{
|
||||
SQLCryptoStore: crypto.NewSQLCryptoStore(db.DB, db.dialect, "", "",
|
||||
SQLCryptoStore: crypto.NewSQLCryptoStore(raw, db.dialect, "", "",
|
||||
[]byte("maunium.net/go/mautrix-whatsapp"),
|
||||
&cryptoLogger{db.log.Sub("CryptoStore")}),
|
||||
UserID: userID,
|
||||
|
||||
@ -17,18 +17,19 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
_ "github.com/lib/pq"
|
||||
_ "github.com/mattn/go-sqlite3"
|
||||
|
||||
log "maunium.net/go/maulogger/v2"
|
||||
|
||||
"maunium.net/go/mautrix-whatsapp/database/upgrades"
|
||||
|
||||
"gorm.io/driver/postgres"
|
||||
"gorm.io/driver/sqlite"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
type Database struct {
|
||||
*sql.DB
|
||||
*gorm.DB
|
||||
log log.Logger
|
||||
dialect string
|
||||
|
||||
@ -39,17 +40,24 @@ type Database struct {
|
||||
}
|
||||
|
||||
func New(dbType string, uri string, baseLog log.Logger) (*Database, error) {
|
||||
conn, err := sql.Open(dbType, uri)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var conn gorm.Dialector
|
||||
|
||||
if dbType == "sqlite3" {
|
||||
_, _ = conn.Exec("PRAGMA foreign_keys = ON")
|
||||
//_, _ = conn.Exec("PRAGMA foreign_keys = ON")
|
||||
conn = sqlite.Open(uri)
|
||||
} else {
|
||||
conn = postgres.Open(uri)
|
||||
}
|
||||
print("no")
|
||||
gdb, err := gorm.Open(conn, &gorm.Config{
|
||||
// Logger: baseLog,
|
||||
})
|
||||
if err != nil {
|
||||
panic("failed to connect database")
|
||||
}
|
||||
|
||||
db := &Database{
|
||||
DB: conn,
|
||||
DB: gdb,
|
||||
log: baseLog.Sub("Database"),
|
||||
dialect: dbType,
|
||||
}
|
||||
@ -73,6 +81,29 @@ func New(dbType string, uri string, baseLog log.Logger) (*Database, error) {
|
||||
}
|
||||
|
||||
func (db *Database) Init() error {
|
||||
err := db.AutoMigrate(&Portal{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = db.AutoMigrate(&Puppet{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = db.AutoMigrate(&Message{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = db.AutoMigrate(&mxRegistered{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
err = db.AutoMigrate(&mxUserProfile{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return upgrades.Run(db.log.Sub("Upgrade"), db.dialect, db.DB)
|
||||
}
|
||||
|
||||
|
||||
@ -17,12 +17,7 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
|
||||
waProto "github.com/Rhymen/go-whatsapp/binary/proto"
|
||||
|
||||
"github.com/karmanyaahm/groupme"
|
||||
log "maunium.net/go/maulogger/v2"
|
||||
|
||||
"maunium.net/go/mautrix-whatsapp/types"
|
||||
@ -42,104 +37,100 @@ func (mq *MessageQuery) New() *Message {
|
||||
}
|
||||
|
||||
func (mq *MessageQuery) GetAll(chat PortalKey) (messages []*Message) {
|
||||
rows, err := mq.db.Query("SELECT chat_jid, chat_receiver, jid, mxid, sender, timestamp, content FROM message WHERE chat_jid=$1 AND chat_receiver=$2", chat.JID, chat.Receiver)
|
||||
if err != nil || rows == nil {
|
||||
ans := mq.db.Where("chat_jid = ? AND chat_receiver = ?", chat.JID, chat.Receiver).Find(&messages)
|
||||
if ans.Error != nil || len(messages) == 0 {
|
||||
return nil
|
||||
}
|
||||
defer rows.Close()
|
||||
for rows.Next() {
|
||||
messages = append(messages, mq.New().Scan(rows))
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
func (mq *MessageQuery) GetByJID(chat PortalKey, jid types.WhatsAppMessageID) *Message {
|
||||
return mq.get("SELECT chat_jid, chat_receiver, jid, mxid, sender, timestamp, content " +
|
||||
"FROM message WHERE chat_jid=$1 AND chat_receiver=$2 AND jid=$3", chat.JID, chat.Receiver, jid)
|
||||
var message Message
|
||||
ans := mq.db.Where("chat_jid = ? AND chat_receiver = ? AND jid = ?", chat.JID, chat.Receiver, jid).Take(&message)
|
||||
if ans.Error != nil {
|
||||
return nil
|
||||
}
|
||||
return &message
|
||||
}
|
||||
|
||||
func (mq *MessageQuery) GetByMXID(mxid id.EventID) *Message {
|
||||
return mq.get("SELECT chat_jid, chat_receiver, jid, mxid, sender, timestamp, content " +
|
||||
"FROM message WHERE mxid=$1", mxid)
|
||||
var message Message
|
||||
ans := mq.db.Where("mxid = ?", mxid).Take(&message)
|
||||
if ans.Error != nil {
|
||||
return nil
|
||||
}
|
||||
return &message
|
||||
}
|
||||
|
||||
func (mq *MessageQuery) GetLastInChat(chat PortalKey) *Message {
|
||||
msg := mq.get("SELECT chat_jid, chat_receiver, jid, mxid, sender, timestamp, content " +
|
||||
"FROM message WHERE chat_jid=$1 AND chat_receiver=$2 ORDER BY timestamp DESC LIMIT 1", chat.JID, chat.Receiver)
|
||||
if msg == nil || msg.Timestamp == 0 {
|
||||
// Old db, we don't know what the last message is.
|
||||
var message Message
|
||||
ans := mq.db.Where("chat_jid = ? AND chat_receiver = ?", chat.JID, chat.Receiver).Order("timestamp desc").First(&message)
|
||||
if ans.Error != nil {
|
||||
return nil
|
||||
}
|
||||
return msg
|
||||
}
|
||||
return &message
|
||||
|
||||
func (mq *MessageQuery) get(query string, args ...interface{}) *Message {
|
||||
row := mq.db.QueryRow(query, args...)
|
||||
if row == nil {
|
||||
return nil
|
||||
}
|
||||
return mq.New().Scan(row)
|
||||
}
|
||||
|
||||
type Message struct {
|
||||
db *Database
|
||||
log log.Logger
|
||||
|
||||
Chat PortalKey
|
||||
JID types.WhatsAppMessageID
|
||||
MXID id.EventID
|
||||
Sender types.WhatsAppID
|
||||
Timestamp uint64
|
||||
Content *waProto.Message
|
||||
Chat PortalKey `gorm:"primaryKey;embedded;embeddedPrefix:chat_"`
|
||||
JID types.WhatsAppMessageID `gorm:"primaryKey"`
|
||||
MXID id.EventID `gorm:"unique;notNull"`
|
||||
Sender types.GroupMeID `gorm:"notNull"`
|
||||
Timestamp uint64 `gorm:"notNull;default:0"`
|
||||
Content *groupme.Message `gorm:"type:TEXT;notNull"`
|
||||
|
||||
// Portal Portal `gorm:"foreignKey:JID;"` //`gorm:"foreignKey:Chat.Receiver,Chat.JID;references:jid,receiver;constraint:onDelete:CASCADE;"`TODO
|
||||
}
|
||||
|
||||
func (msg *Message) Scan(row Scannable) *Message {
|
||||
var content []byte
|
||||
err := row.Scan(&msg.Chat.JID, &msg.Chat.Receiver, &msg.JID, &msg.MXID, &msg.Sender, &msg.Timestamp, &content)
|
||||
if err != nil {
|
||||
if err != sql.ErrNoRows {
|
||||
msg.log.Errorln("Database scan failed:", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
// func (msg *Message) Scan(row Scannable) *Message {
|
||||
// var content []byte
|
||||
// err := row.Scan(&msg.Chat.JID, &msg.Chat.Receiver, &msg.JID, &msg.MXID, &msg.Sender, &msg.Timestamp, &content)
|
||||
// if err != nil {
|
||||
// if err != sql.ErrNoRows {
|
||||
// msg.log.Errorln("Database scan failed:", err)
|
||||
// }
|
||||
// return nil
|
||||
// }
|
||||
|
||||
msg.decodeBinaryContent(content)
|
||||
// msg.decodeBinaryContent(content)
|
||||
|
||||
return msg
|
||||
}
|
||||
// return msg
|
||||
// }
|
||||
|
||||
func (msg *Message) decodeBinaryContent(content []byte) {
|
||||
msg.Content = &waProto.Message{}
|
||||
reader := bytes.NewReader(content)
|
||||
dec := json.NewDecoder(reader)
|
||||
err := dec.Decode(msg.Content)
|
||||
if err != nil {
|
||||
msg.log.Warnln("Failed to decode message content:", err)
|
||||
}
|
||||
}
|
||||
// func (msg *Message) decodeBinaryContent(content []byte) {
|
||||
// msg.Content = &waProto.Message{}
|
||||
// reader := bytes.NewReader(content)
|
||||
// dec := json.NewDecoder(reader)
|
||||
// err := dec.Decode(msg.Content)
|
||||
// if err != nil {
|
||||
// msg.log.Warnln("Failed to decode message content:", err)
|
||||
// }
|
||||
// }
|
||||
|
||||
func (msg *Message) encodeBinaryContent() []byte {
|
||||
var buf bytes.Buffer
|
||||
enc := json.NewEncoder(&buf)
|
||||
err := enc.Encode(msg.Content)
|
||||
if err != nil {
|
||||
msg.log.Warnln("Failed to encode message content:", err)
|
||||
}
|
||||
return buf.Bytes()
|
||||
}
|
||||
// func (msg *Message) encodeBinaryContent() []byte {
|
||||
// var buf bytes.Buffer
|
||||
// enc := json.NewEncoder(&buf)
|
||||
// err := enc.Encode(msg.Content)
|
||||
// if err != nil {
|
||||
// msg.log.Warnln("Failed to encode message content:", err)
|
||||
// }
|
||||
// return buf.Bytes()
|
||||
// }
|
||||
|
||||
func (msg *Message) Insert() {
|
||||
_, err := msg.db.Exec("INSERT INTO message (chat_jid, chat_receiver, jid, mxid, sender, timestamp, content) " +
|
||||
"VALUES ($1, $2, $3, $4, $5, $6, $7)",
|
||||
msg.Chat.JID, msg.Chat.Receiver, msg.JID, msg.MXID, msg.Sender, msg.Timestamp, msg.encodeBinaryContent())
|
||||
if err != nil {
|
||||
msg.log.Warnfln("Failed to insert %s@%s: %v", msg.Chat, msg.JID, err)
|
||||
ans := msg.db.Create(&msg)
|
||||
if ans.Error != nil {
|
||||
// msg.log.Warnfln("Failed to insert %s@%s: %v", msg.Chat, msg.JID, ans.Error)
|
||||
}
|
||||
}
|
||||
|
||||
func (msg *Message) Delete() {
|
||||
_, err := msg.db.Exec("DELETE FROM message WHERE chat_jid=$1 AND chat_receiver=$2 AND jid=$3", msg.Chat.JID, msg.Chat.Receiver, msg.JID)
|
||||
if err != nil {
|
||||
msg.log.Warnfln("Failed to delete %s@%s: %v", msg.Chat, msg.JID, err)
|
||||
ans := msg.db.Delete(&msg)
|
||||
if ans.Error != nil {
|
||||
// msg.log.Warnfln("Failed to delete %s@%s: %v", msg.Chat, msg.JID, ans.Error)
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,155 +1,157 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"math"
|
||||
"strings"
|
||||
)
|
||||
// import (
|
||||
// "fmt"
|
||||
// "math"
|
||||
// "strings"
|
||||
// )
|
||||
|
||||
func countRows(db *Database, table string) (int, error) {
|
||||
countRow := db.QueryRow(fmt.Sprintf("SELECT COUNT(*) FROM %s", table))
|
||||
var count int
|
||||
err := countRow.Scan(&count)
|
||||
return count, err
|
||||
}
|
||||
// // func countRows(db *Database, table string) (int, error) {
|
||||
// // countRow := db.QueryRow(fmt.Sprintf("SELECT COUNT(*) FROM %s", table))
|
||||
// // var count int
|
||||
// // err := countRow.Scan(&count)
|
||||
// // return count, err
|
||||
// // }
|
||||
|
||||
const VariableCountLimit = 512
|
||||
// const VariableCountLimit = 512
|
||||
|
||||
func migrateTable(old *Database, new *Database, table string, columns ...string) error {
|
||||
columnNames := strings.Join(columns, ",")
|
||||
fmt.Printf("Migrating %s: ", table)
|
||||
rowCount, err := countRows(old, table)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Print("found ", rowCount, " rows of data, ")
|
||||
rows, err := old.Query(fmt.Sprintf("SELECT %s FROM \"%s\"", columnNames, table))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
serverColNames, err := rows.Columns()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
colCount := len(serverColNames)
|
||||
valueStringFormat := strings.Repeat("$%d, ", colCount)
|
||||
valueStringFormat = fmt.Sprintf("(%s)", valueStringFormat[:len(valueStringFormat)-2])
|
||||
cols := make([]interface{}, colCount)
|
||||
colPtrs := make([]interface{}, colCount)
|
||||
for i := 0; i < colCount; i++ {
|
||||
colPtrs[i] = &cols[i]
|
||||
}
|
||||
batchSize := VariableCountLimit / colCount
|
||||
values := make([]interface{}, batchSize*colCount)
|
||||
valueStrings := make([]string, batchSize)
|
||||
var inserted int64
|
||||
batchCount := int(math.Ceil(float64(rowCount) / float64(batchSize)))
|
||||
tx, err := new.Begin()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Printf("migrating in %d batches: ", batchCount)
|
||||
for rowCount > 0 {
|
||||
var i int
|
||||
for ; rows.Next() && i < batchSize; i++ {
|
||||
colPtrs := make([]interface{}, colCount)
|
||||
valueStringArgs := make([]interface{}, colCount)
|
||||
for j := 0; j < colCount; j++ {
|
||||
pos := i*colCount + j
|
||||
colPtrs[j] = &values[pos]
|
||||
valueStringArgs[j] = pos + 1
|
||||
}
|
||||
valueStrings[i] = fmt.Sprintf(valueStringFormat, valueStringArgs...)
|
||||
err = rows.Scan(colPtrs...)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
}
|
||||
slicedValues := values
|
||||
slicedValueStrings := valueStrings
|
||||
if i < len(valueStrings) {
|
||||
slicedValueStrings = slicedValueStrings[:i]
|
||||
slicedValues = slicedValues[:i*colCount]
|
||||
}
|
||||
if len(slicedValues) == 0 {
|
||||
break
|
||||
}
|
||||
res, err := tx.Exec(fmt.Sprintf("INSERT INTO \"%s\" (%s) VALUES %s", table, columnNames, strings.Join(slicedValueStrings, ",")), slicedValues...)
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
count, _ := res.RowsAffected()
|
||||
inserted += count
|
||||
rowCount -= batchSize
|
||||
fmt.Print("#")
|
||||
}
|
||||
err = tx.Commit()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
fmt.Println(" -- done with", inserted, "rows inserted")
|
||||
return nil
|
||||
}
|
||||
// func migrateTable(old *Database, new *Database, table string, columns ...string) error {
|
||||
// columnNames := strings.Join(columns, ",")
|
||||
// fmt.Printf("Migrating %s: ", table)
|
||||
// rowCount, err := countRows(old, table)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
// fmt.Print("found ", rowCount, " rows of data, ")
|
||||
// rows, err := old.Query(fmt.Sprintf("SELECT %s FROM \"%s\"", columnNames, table))
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
// serverColNames, err := rows.Columns()
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
// colCount := len(serverColNames)
|
||||
// valueStringFormat := strings.Repeat("$%d, ", colCount)
|
||||
// valueStringFormat = fmt.Sprintf("(%s)", valueStringFormat[:len(valueStringFormat)-2])
|
||||
// cols := make([]interface{}, colCount)
|
||||
// colPtrs := make([]interface{}, colCount)
|
||||
// for i := 0; i < colCount; i++ {
|
||||
// colPtrs[i] = &cols[i]
|
||||
// }
|
||||
// batchSize := VariableCountLimit / colCount
|
||||
// values := make([]interface{}, batchSize*colCount)
|
||||
// valueStrings := make([]string, batchSize)
|
||||
// var inserted int64
|
||||
// batchCount := int(math.Ceil(float64(rowCount) / float64(batchSize)))
|
||||
// tx, err := new.Begin()
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
// fmt.Printf("migrating in %d batches: ", batchCount)
|
||||
// for rowCount > 0 {
|
||||
// var i int
|
||||
// for ; rows.Next() && i < batchSize; i++ {
|
||||
// colPtrs := make([]interface{}, colCount)
|
||||
// valueStringArgs := make([]interface{}, colCount)
|
||||
// for j := 0; j < colCount; j++ {
|
||||
// pos := i*colCount + j
|
||||
// colPtrs[j] = &values[pos]
|
||||
// valueStringArgs[j] = pos + 1
|
||||
// }
|
||||
// valueStrings[i] = fmt.Sprintf(valueStringFormat, valueStringArgs...)
|
||||
// err = rows.Scan(colPtrs...)
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// }
|
||||
// slicedValues := values
|
||||
// slicedValueStrings := valueStrings
|
||||
// if i < len(valueStrings) {
|
||||
// slicedValueStrings = slicedValueStrings[:i]
|
||||
// slicedValues = slicedValues[:i*colCount]
|
||||
// }
|
||||
// if len(slicedValues) == 0 {
|
||||
// break
|
||||
// }
|
||||
// res, err := tx.Exec(fmt.Sprintf("INSERT INTO \"%s\" (%s) VALUES %s", table, columnNames, strings.Join(slicedValueStrings, ",")), slicedValues...)
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// count, _ := res.RowsAffected()
|
||||
// inserted += count
|
||||
// rowCount -= batchSize
|
||||
// fmt.Print("#")
|
||||
// }
|
||||
// err = tx.Commit()
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
// fmt.Println(" -- done with", inserted, "rows inserted")
|
||||
// return nil
|
||||
// }
|
||||
|
||||
func Migrate(old *Database, new *Database) {
|
||||
err := migrateTable(old, new, "portal", "jid", "receiver", "mxid", "name", "topic", "avatar", "avatar_url", "encrypted")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "user", "mxid", "jid", "management_room", "client_id", "client_token", "server_token", "enc_key", "mac_key", "last_connection")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "puppet", "jid", "avatar", "displayname", "name_quality", "custom_mxid", "access_token", "next_batch", "avatar_url", "enable_presence", "enable_receipts")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "user_portal", "user_jid", "portal_jid", "portal_receiver", "in_community")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "message", "chat_jid", "chat_receiver", "jid", "mxid", "sender", "content", "timestamp")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "mx_registrations", "user_id")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "mx_user_profile", "room_id", "user_id", "membership")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "mx_room_state", "room_id", "power_levels")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "crypto_account", "account_id", "device_id", "shared", "sync_token", "account")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "crypto_message_index", "sender_key", "session_id", `"index"`, "event_id", "timestamp")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "crypto_tracked_user", "user_id")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "crypto_device", "user_id", "device_id", "identity_key", "signing_key", "trust", "deleted", "name")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "crypto_olm_session", "account_id", "session_id", "sender_key", "session", "created_at", "last_used")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "crypto_megolm_inbound_session", "account_id", "session_id", "sender_key", "signing_key", "room_id", "session", "forwarding_chains")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
err = migrateTable(old, new, "crypto_megolm_outbound_session", "account_id", "room_id", "session_id", "session", "shared", "max_messages", "message_count", "max_age", "created_at", "last_used")
|
||||
if err != nil {
|
||||
panic(err)
|
||||
}
|
||||
print("skipping migration because test")
|
||||
}
|
||||
// err := migrateTable(old, new, "portal", "jid", "receiver", "mxid", "name", "topic", "avatar", "avatar_url", "encrypted")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "user", "mxid", "jid", "management_room", "client_id", "client_token", "server_token", "enc_key", "mac_key", "last_connection")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "puppet", "jid", "avatar", "displayname", "name_quality", "custom_mxid", "access_token", "next_batch", "avatar_url", "enable_presence", "enable_receipts")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "user_portal", "user_jid", "portal_jid", "portal_receiver", "in_community")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "message", "chat_jid", "chat_receiver", "jid", "mxid", "sender", "content", "timestamp")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "mx_registrations", "user_id")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "mx_user_profile", "room_id", "user_id", "membership")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "mx_room_state", "room_id", "power_levels")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "crypto_account", "account_id", "device_id", "shared", "sync_token", "account")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "crypto_message_index", "sender_key", "session_id", `"index"`, "event_id", "timestamp")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "crypto_tracked_user", "user_id")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "crypto_device", "user_id", "device_id", "identity_key", "signing_key", "trust", "deleted", "name")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "crypto_olm_session", "account_id", "session_id", "sender_key", "session", "created_at", "last_used")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "crypto_megolm_inbound_session", "account_id", "session_id", "sender_key", "signing_key", "room_id", "session", "forwarding_chains")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// err = migrateTable(old, new, "crypto_megolm_outbound_session", "account_id", "room_id", "session_id", "session", "shared", "max_messages", "message_count", "max_age", "created_at", "last_used")
|
||||
// if err != nil {
|
||||
// panic(err)
|
||||
// }
|
||||
// }
|
||||
|
||||
@ -17,29 +17,28 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"strings"
|
||||
|
||||
"gorm.io/gorm"
|
||||
log "maunium.net/go/maulogger/v2"
|
||||
|
||||
"maunium.net/go/mautrix/id"
|
||||
|
||||
"maunium.net/go/mautrix-whatsapp/types"
|
||||
)
|
||||
|
||||
type PortalKey struct {
|
||||
JID types.WhatsAppID
|
||||
Receiver types.WhatsAppID
|
||||
JID types.GroupMeID
|
||||
Receiver types.GroupMeID
|
||||
}
|
||||
|
||||
func GroupPortalKey(jid types.WhatsAppID) PortalKey {
|
||||
func GroupPortalKey(jid types.GroupMeID) PortalKey {
|
||||
return PortalKey{
|
||||
JID: jid,
|
||||
Receiver: jid,
|
||||
}
|
||||
}
|
||||
|
||||
func NewPortalKey(jid, receiver types.WhatsAppID) PortalKey {
|
||||
func NewPortalKey(jid, receiver types.GroupMeID) PortalKey {
|
||||
if strings.HasSuffix(jid, "@g.us") {
|
||||
receiver = jid
|
||||
}
|
||||
@ -69,72 +68,75 @@ func (pq *PortalQuery) New() *Portal {
|
||||
}
|
||||
|
||||
func (pq *PortalQuery) GetAll() []*Portal {
|
||||
return pq.getAll("SELECT * FROM portal")
|
||||
return pq.getAll(pq.db.DB)
|
||||
|
||||
}
|
||||
|
||||
func (pq *PortalQuery) GetByJID(key PortalKey) *Portal {
|
||||
return pq.get("SELECT * FROM portal WHERE jid=$1 AND receiver=$2", key.JID, key.Receiver)
|
||||
return pq.get(pq.db.DB.Where("jit = ? AND receiver = ?", key.JID, key.Receiver))
|
||||
|
||||
}
|
||||
|
||||
func (pq *PortalQuery) GetByMXID(mxid id.RoomID) *Portal {
|
||||
return pq.get("SELECT * FROM portal WHERE mxid=$1", mxid)
|
||||
return pq.get(pq.db.DB.Where("mxid = ?", mxid))
|
||||
}
|
||||
|
||||
func (pq *PortalQuery) GetAllByJID(jid types.WhatsAppID) []*Portal {
|
||||
return pq.getAll("SELECT * FROM portal WHERE jid=$1", jid)
|
||||
func (pq *PortalQuery) GetAllByJID(jid types.GroupMeID) []*Portal {
|
||||
return pq.getAll(pq.db.DB.Where("jid = ?", jid))
|
||||
|
||||
}
|
||||
|
||||
func (pq *PortalQuery) FindPrivateChats(receiver types.WhatsAppID) []*Portal {
|
||||
return pq.getAll("SELECT * FROM portal WHERE receiver=$1 AND jid LIKE '%@s.whatsapp.net'", receiver)
|
||||
func (pq *PortalQuery) FindPrivateChats(receiver types.GroupMeID) []*Portal {
|
||||
print("aaaaaaaaaaaaaaaaaa wrong portal stuff")
|
||||
return pq.getAll(pq.db.DB.Where("receiver = ? AND jid LIKE '%@s.whatsapp.net'", receiver))
|
||||
|
||||
}
|
||||
|
||||
func (pq *PortalQuery) getAll(query string, args ...interface{}) (portals []*Portal) {
|
||||
rows, err := pq.db.Query(query, args...)
|
||||
if err != nil || rows == nil {
|
||||
func (pq *PortalQuery) getAll(db *gorm.DB) (portals []*Portal) {
|
||||
ans := db.Find(&portals)
|
||||
if ans.Error != nil || len(portals) == 0 {
|
||||
return nil
|
||||
}
|
||||
defer rows.Close()
|
||||
for rows.Next() {
|
||||
portals = append(portals, pq.New().Scan(rows))
|
||||
}
|
||||
return
|
||||
|
||||
}
|
||||
|
||||
func (pq *PortalQuery) get(query string, args ...interface{}) *Portal {
|
||||
row := pq.db.QueryRow(query, args...)
|
||||
if row == nil {
|
||||
func (pq *PortalQuery) get(db *gorm.DB) *Portal {
|
||||
var portal Portal
|
||||
ans := db.Take(&portal)
|
||||
if ans.Error != nil {
|
||||
return nil
|
||||
}
|
||||
return pq.New().Scan(row)
|
||||
return &portal
|
||||
}
|
||||
|
||||
type Portal struct {
|
||||
db *Database
|
||||
log log.Logger
|
||||
|
||||
Key PortalKey
|
||||
Key PortalKey `gorm:"primaryKey;embedded"`
|
||||
MXID id.RoomID
|
||||
|
||||
Name string
|
||||
Topic string
|
||||
Avatar string
|
||||
AvatarURL id.ContentURI
|
||||
Encrypted bool
|
||||
AvatarURL id.ContentURI //`gorm:"-"` //TODO:STORE AVATAR
|
||||
Encrypted bool `gorm:"notNull;default:false"`
|
||||
}
|
||||
|
||||
func (portal *Portal) Scan(row Scannable) *Portal {
|
||||
var mxid, avatarURL sql.NullString
|
||||
err := row.Scan(&portal.Key.JID, &portal.Key.Receiver, &mxid, &portal.Name, &portal.Topic, &portal.Avatar, &avatarURL, &portal.Encrypted)
|
||||
if err != nil {
|
||||
if err != sql.ErrNoRows {
|
||||
portal.log.Errorln("Database scan failed:", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
portal.MXID = id.RoomID(mxid.String)
|
||||
portal.AvatarURL, _ = id.ParseContentURI(avatarURL.String)
|
||||
return portal
|
||||
}
|
||||
// func (portal *Portal) Scan(row Scannable) *Portal {
|
||||
// var mxid, avatarURL sql.NullString
|
||||
// err := row.Scan(&portal.Key.JID, &portal.Key.Receiver, &mxid, &portal.Name, &portal.Topic, &portal.Avatar, &avatarURL, &portal.Encrypted)
|
||||
// if err != nil {
|
||||
// if err != sql.ErrNoRows {
|
||||
// portal.log.Errorln("Database scan failed:", err)
|
||||
// }
|
||||
// return nil
|
||||
// }
|
||||
// portal.MXID = id.RoomID(mxid.String)
|
||||
// portal.AvatarURL, _ = id.ParseContentURI(avatarURL.String)
|
||||
// return portal
|
||||
// }
|
||||
|
||||
func (portal *Portal) mxidPtr() *id.RoomID {
|
||||
if len(portal.MXID) > 0 {
|
||||
@ -144,38 +146,38 @@ func (portal *Portal) mxidPtr() *id.RoomID {
|
||||
}
|
||||
|
||||
func (portal *Portal) Insert() {
|
||||
_, err := portal.db.Exec("INSERT INTO portal (jid, receiver, mxid, name, topic, avatar, avatar_url, encrypted) VALUES ($1, $2, $3, $4, $5, $6, $7, $8)",
|
||||
portal.Key.JID, portal.Key.Receiver, portal.mxidPtr(), portal.Name, portal.Topic, portal.Avatar, portal.AvatarURL.String(), portal.Encrypted)
|
||||
if err != nil {
|
||||
portal.log.Warnfln("Failed to insert %s: %v", portal.Key, err)
|
||||
|
||||
ans := portal.db.Create(&portal)
|
||||
print("beware of types")
|
||||
if ans.Error != nil {
|
||||
portal.log.Warnfln("Failed to insert %s: %v", portal.Key, ans.Error)
|
||||
}
|
||||
}
|
||||
|
||||
func (portal *Portal) Update() {
|
||||
var mxid *id.RoomID
|
||||
if len(portal.MXID) > 0 {
|
||||
mxid = &portal.MXID
|
||||
}
|
||||
_, err := portal.db.Exec("UPDATE portal SET mxid=$1, name=$2, topic=$3, avatar=$4, avatar_url=$5, encrypted=$6 WHERE jid=$7 AND receiver=$8",
|
||||
mxid, portal.Name, portal.Topic, portal.Avatar, portal.AvatarURL.String(), portal.Encrypted, portal.Key.JID, portal.Key.Receiver)
|
||||
if err != nil {
|
||||
portal.log.Warnfln("Failed to update %s: %v", portal.Key, err)
|
||||
|
||||
ans := portal.db.Model(&portal).Updates(portal)
|
||||
print("check .model vs not")
|
||||
|
||||
if ans.Error != nil {
|
||||
portal.log.Warnfln("Failed to update %s: %v", portal.Key, ans.Error)
|
||||
}
|
||||
}
|
||||
|
||||
func (portal *Portal) Delete() {
|
||||
_, err := portal.db.Exec("DELETE FROM portal WHERE jid=$1 AND receiver=$2", portal.Key.JID, portal.Key.Receiver)
|
||||
if err != nil {
|
||||
portal.log.Warnfln("Failed to delete %s: %v", portal.Key, err)
|
||||
ans := portal.db.Delete(&portal)
|
||||
if ans.Error != nil {
|
||||
portal.log.Warnfln("Failed to delete %s: %v", portal.Key, ans.Error)
|
||||
}
|
||||
}
|
||||
|
||||
func (portal *Portal) GetUserIDs() []id.UserID {
|
||||
rows, err := portal.db.Query(`SELECT "user".mxid FROM "user", user_portal
|
||||
rows, err := portal.db.Raw(`SELECT "user".mxid FROM "user", user_portal
|
||||
WHERE "user".jid=user_portal.user_jid
|
||||
AND user_portal.portal_jid=$1
|
||||
AND user_portal.portal_receiver=$2`,
|
||||
portal.Key.JID, portal.Key.Receiver)
|
||||
portal.Key.JID, portal.Key.Receiver).Rows()
|
||||
print("maybe maybe sql 760476084")
|
||||
if err != nil {
|
||||
portal.log.Debugln("Failed to get portal user ids:", err)
|
||||
return nil
|
||||
|
||||
@ -17,8 +17,6 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
log "maunium.net/go/maulogger/v2"
|
||||
|
||||
"maunium.net/go/mautrix/id"
|
||||
@ -42,50 +40,54 @@ func (pq *PuppetQuery) New() *Puppet {
|
||||
}
|
||||
|
||||
func (pq *PuppetQuery) GetAll() (puppets []*Puppet) {
|
||||
rows, err := pq.db.Query("SELECT jid, avatar, avatar_url, displayname, name_quality, custom_mxid, access_token, next_batch, enable_presence, enable_receipts FROM puppet")
|
||||
if err != nil || rows == nil {
|
||||
ans := pq.db.Find(&puppets)
|
||||
if ans.Error != nil || len(puppets) == 0 {
|
||||
return nil
|
||||
}
|
||||
defer rows.Close()
|
||||
for rows.Next() {
|
||||
puppets = append(puppets, pq.New().Scan(rows))
|
||||
}
|
||||
// defer rows.Close()
|
||||
// for rows.Next() {
|
||||
// puppets = append(puppets, pq.New().Scan(rows))
|
||||
// }
|
||||
return
|
||||
}
|
||||
|
||||
func (pq *PuppetQuery) Get(jid types.WhatsAppID) *Puppet {
|
||||
row := pq.db.QueryRow("SELECT jid, avatar, avatar_url, displayname, name_quality, custom_mxid, access_token, next_batch, enable_presence, enable_receipts FROM puppet WHERE jid=$1", jid)
|
||||
if row == nil {
|
||||
func (pq *PuppetQuery) Get(jid types.GroupMeID) *Puppet {
|
||||
puppet := Puppet{}
|
||||
ans := pq.db.Where("jid = ?", jid).Take(puppet)
|
||||
if ans.Error != nil {
|
||||
return nil
|
||||
}
|
||||
return pq.New().Scan(row)
|
||||
return &puppet
|
||||
}
|
||||
|
||||
func (pq *PuppetQuery) GetByCustomMXID(mxid id.UserID) *Puppet {
|
||||
row := pq.db.QueryRow("SELECT jid, avatar, avatar_url, displayname, name_quality, custom_mxid, access_token, next_batch, enable_presence, enable_receipts FROM puppet WHERE custom_mxid=$1", mxid)
|
||||
if row == nil {
|
||||
puppet := Puppet{}
|
||||
ans := pq.db.Where("custom_mxid = ?", mxid).Take(puppet)
|
||||
if ans.Error != nil {
|
||||
return nil
|
||||
}
|
||||
return pq.New().Scan(row)
|
||||
return &puppet
|
||||
}
|
||||
|
||||
func (pq *PuppetQuery) GetAllWithCustomMXID() (puppets []*Puppet) {
|
||||
rows, err := pq.db.Query("SELECT jid, avatar, avatar_url, displayname, name_quality, custom_mxid, access_token, next_batch, enable_presence, enable_receipts FROM puppet WHERE custom_mxid<>''")
|
||||
if err != nil || rows == nil {
|
||||
|
||||
ans := pq.db.Find(&puppets, "custom_mxid <> ''")
|
||||
if ans.Error != nil || len(puppets) != 0 {
|
||||
return nil
|
||||
}
|
||||
defer rows.Close()
|
||||
for rows.Next() {
|
||||
puppets = append(puppets, pq.New().Scan(rows))
|
||||
}
|
||||
// defer rows.Close()
|
||||
// for rows.Next() {
|
||||
// puppets = append(puppets, pq.New().Scan(rows))
|
||||
// }
|
||||
return
|
||||
}
|
||||
|
||||
//Puppet is comment
|
||||
type Puppet struct {
|
||||
db *Database
|
||||
log log.Logger
|
||||
|
||||
JID types.WhatsAppID
|
||||
JID types.GroupMeID `gorm:"primaryKey"`
|
||||
Avatar string
|
||||
AvatarURL id.ContentURI
|
||||
Displayname string
|
||||
@ -94,45 +96,45 @@ type Puppet struct {
|
||||
CustomMXID id.UserID
|
||||
AccessToken string
|
||||
NextBatch string
|
||||
EnablePresence bool
|
||||
EnableReceipts bool
|
||||
EnablePresence bool `gorm:"notNull;default:true"`
|
||||
EnableReceipts bool `gorm:"notNull;default:true"`
|
||||
}
|
||||
|
||||
func (puppet *Puppet) Scan(row Scannable) *Puppet {
|
||||
var displayname, avatar, avatarURL, customMXID, accessToken, nextBatch sql.NullString
|
||||
var quality sql.NullInt64
|
||||
var enablePresence, enableReceipts sql.NullBool
|
||||
err := row.Scan(&puppet.JID, &avatar, &avatarURL, &displayname, &quality, &customMXID, &accessToken, &nextBatch, &enablePresence, &enableReceipts)
|
||||
if err != nil {
|
||||
if err != sql.ErrNoRows {
|
||||
puppet.log.Errorln("Database scan failed:", err)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
puppet.Displayname = displayname.String
|
||||
puppet.Avatar = avatar.String
|
||||
puppet.AvatarURL, _ = id.ParseContentURI(avatarURL.String)
|
||||
puppet.NameQuality = int8(quality.Int64)
|
||||
puppet.CustomMXID = id.UserID(customMXID.String)
|
||||
puppet.AccessToken = accessToken.String
|
||||
puppet.NextBatch = nextBatch.String
|
||||
puppet.EnablePresence = enablePresence.Bool
|
||||
puppet.EnableReceipts = enableReceipts.Bool
|
||||
return puppet
|
||||
}
|
||||
// func (puppet *Puppet) Scan(row Scannable) *Puppet {
|
||||
// var displayname, avatar, avatarURL, customMXID, accessToken, nextBatch sql.NullString
|
||||
// var quality sql.NullInt64
|
||||
// var enablePresence, enableReceipts sql.NullBool
|
||||
// err := row.Scan(&puppet.JID, &avatar, &avatarURL, &displayname, &quality, &customMXID, &accessToken, &nextBatch, &enablePresence, &enableReceipts)
|
||||
// if err != nil {
|
||||
// if err != sql.ErrNoRows {
|
||||
// puppet.log.Errorln("Database scan failed:", err)
|
||||
// }
|
||||
// return nil
|
||||
// }
|
||||
// puppet.Displayname = displayname.String
|
||||
// puppet.Avatar = avatar.String
|
||||
// puppet.AvatarURL, _ = id.ParseContentURI(avatarURL.String)
|
||||
// puppet.NameQuality = int8(quality.Int64)
|
||||
// puppet.CustomMXID = id.UserID(customMXID.String)
|
||||
// puppet.AccessToken = accessToken.String
|
||||
// puppet.NextBatch = nextBatch.String
|
||||
// puppet.EnablePresence = enablePresence.Bool
|
||||
// puppet.EnableReceipts = enableReceipts.Bool
|
||||
// return puppet
|
||||
// }
|
||||
|
||||
func (puppet *Puppet) Insert() {
|
||||
_, err := puppet.db.Exec("INSERT INTO puppet (jid, avatar, avatar_url, displayname, name_quality, custom_mxid, access_token, next_batch, enable_presence, enable_receipts) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)",
|
||||
puppet.JID, puppet.Avatar, puppet.AvatarURL.String(), puppet.Displayname, puppet.NameQuality, puppet.CustomMXID, puppet.AccessToken, puppet.NextBatch, puppet.EnablePresence, puppet.EnableReceipts)
|
||||
if err != nil {
|
||||
puppet.log.Warnfln("Failed to insert %s: %v", puppet.JID, err)
|
||||
// _, err := puppet.db.Exec("INSERT INTO puppet (jid, avatar, avatar_url, displayname, name_quality, custom_mxid, access_token, next_batch, enable_presence, enable_receipts) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)",
|
||||
// puppet.JID, puppet.Avatar, puppet.AvatarURL.String(), puppet.Displayname, puppet.NameQuality, puppet.CustomMXID, puppet.AccessToken, puppet.NextBatch, puppet.EnablePresence, puppet.EnableReceipts)
|
||||
ans := puppet.db.Create(&puppet)
|
||||
if ans.Error != nil {
|
||||
puppet.log.Warnfln("Failed to insert %s: %v", puppet.JID, ans.Error)
|
||||
}
|
||||
}
|
||||
|
||||
func (puppet *Puppet) Update() {
|
||||
_, err := puppet.db.Exec("UPDATE puppet SET displayname=$1, name_quality=$2, avatar=$3, avatar_url=$4, custom_mxid=$5, access_token=$6, next_batch=$7, enable_presence=$8, enable_receipts=$9 WHERE jid=$10",
|
||||
puppet.Displayname, puppet.NameQuality, puppet.Avatar, puppet.AvatarURL.String(), puppet.CustomMXID, puppet.AccessToken, puppet.NextBatch, puppet.EnablePresence, puppet.EnableReceipts, puppet.JID)
|
||||
if err != nil {
|
||||
puppet.log.Warnfln("Failed to update %s->%s: %v", puppet.JID, err)
|
||||
ans := puppet.db.Where("jid = ?", puppet.JID).Updates(&puppet)
|
||||
if ans.Error != nil {
|
||||
puppet.log.Warnfln("Failed to update %s->%s: %v", puppet.JID, ans.Error)
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,11 +17,11 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"errors"
|
||||
"sync"
|
||||
|
||||
"gorm.io/gorm"
|
||||
"gorm.io/gorm/clause"
|
||||
log "maunium.net/go/maulogger/v2"
|
||||
|
||||
"maunium.net/go/mautrix/appservice"
|
||||
@ -39,6 +39,10 @@ type SQLStateStore struct {
|
||||
typingLock sync.RWMutex
|
||||
}
|
||||
|
||||
type mxRegistered struct {
|
||||
UserID string `gorm:"primaryKey"`
|
||||
}
|
||||
|
||||
var _ appservice.StateStore = (*SQLStateStore)(nil)
|
||||
|
||||
func NewSQLStateStore(db *Database) *SQLStateStore {
|
||||
@ -50,55 +54,72 @@ func NewSQLStateStore(db *Database) *SQLStateStore {
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) IsRegistered(userID id.UserID) bool {
|
||||
row := store.db.QueryRow("SELECT EXISTS(SELECT 1 FROM mx_registrations WHERE user_id=$1)", userID)
|
||||
var isRegistered bool
|
||||
err := row.Scan(&isRegistered)
|
||||
if err != nil {
|
||||
store.log.Warnfln("Failed to scan registration existence for %s: %v", userID, err)
|
||||
v := mxRegistered{UserID: userID.String()}
|
||||
ans := store.db.First(&v)
|
||||
|
||||
if errors.Is(ans.Error, gorm.ErrRecordNotFound) {
|
||||
return false
|
||||
}
|
||||
return isRegistered
|
||||
if ans.Error != nil {
|
||||
store.log.Warnfln("Failed to scan registration existence for %s: %v", userID, ans.Error)
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) MarkRegistered(userID id.UserID) {
|
||||
var err error
|
||||
if store.db.dialect == "postgres" {
|
||||
_, err = store.db.Exec("INSERT INTO mx_registrations (user_id) VALUES ($1) ON CONFLICT (user_id) DO NOTHING", userID)
|
||||
} else if store.db.dialect == "sqlite3" {
|
||||
_, err = store.db.Exec("INSERT OR REPLACE INTO mx_registrations (user_id) VALUES ($1)", userID)
|
||||
} else {
|
||||
err = fmt.Errorf("unsupported dialect %s", store.db.dialect)
|
||||
}
|
||||
if err != nil {
|
||||
store.log.Warnfln("Failed to mark %s as registered: %v", userID, err)
|
||||
|
||||
ans := store.db.Create(mxRegistered{userID.String()})
|
||||
|
||||
if ans.Error != nil {
|
||||
store.log.Warnfln("Failed to mark %s as registered: %v", userID, ans.Error)
|
||||
}
|
||||
}
|
||||
|
||||
type mxUserProfile struct {
|
||||
RoomID string `gorm:"primaryKey"`
|
||||
UserID string `gorm:"primaryKey"`
|
||||
Membership string `gorm:"notNull"`
|
||||
|
||||
DisplayName string
|
||||
AvatarURL string
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) GetRoomMembers(roomID id.RoomID) map[id.UserID]*event.MemberEventContent {
|
||||
members := make(map[id.UserID]*event.MemberEventContent)
|
||||
rows, err := store.db.Query("SELECT user_id, membership, displayname, avatar_url FROM mx_user_profile WHERE room_id=$1", roomID)
|
||||
if err != nil {
|
||||
var users []mxUserProfile
|
||||
ans := store.db.Where("room_id = ?", roomID.String()).Find(&users)
|
||||
if ans.Error != nil {
|
||||
return members
|
||||
}
|
||||
|
||||
var userID id.UserID
|
||||
var member event.MemberEventContent
|
||||
for rows.Next() {
|
||||
err := rows.Scan(&userID, &member.Membership, &member.Displayname, &member.AvatarURL)
|
||||
if err != nil {
|
||||
store.log.Warnfln("Failed to scan member in %s: %v", roomID, err)
|
||||
} else {
|
||||
members[userID] = &member
|
||||
for _, user := range users {
|
||||
// if err != nil {
|
||||
// store.log.Warnfln("Failed to scan member in %s: %v", roomID, err)
|
||||
// continue
|
||||
// }
|
||||
userID = id.UserID(user.UserID)
|
||||
member = event.MemberEventContent{
|
||||
Membership: event.Membership(user.Membership),
|
||||
Displayname: user.DisplayName,
|
||||
AvatarURL: id.ContentURIString(user.AvatarURL),
|
||||
}
|
||||
|
||||
members[userID] = &member
|
||||
}
|
||||
return members
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) GetMembership(roomID id.RoomID, userID id.UserID) event.Membership {
|
||||
row := store.db.QueryRow("SELECT membership FROM mx_user_profile WHERE room_id=$1 AND user_id=$2", roomID, userID)
|
||||
var user mxUserProfile
|
||||
ans := store.db.Where("room_id = ? AND user_id = ?", roomID, userID).Take(&user)
|
||||
membership := event.MembershipLeave
|
||||
err := row.Scan(&membership)
|
||||
if err != nil && err != sql.ErrNoRows {
|
||||
store.log.Warnfln("Failed to scan membership of %s in %s: %v", userID, roomID, err)
|
||||
if ans.Error != nil && ans.Error != gorm.ErrRecordNotFound {
|
||||
store.log.Warnfln("Failed to scan membership of %s in %s: %v", userID, roomID, ans.Error)
|
||||
}
|
||||
membership = event.Membership(user.Membership)
|
||||
|
||||
return membership
|
||||
}
|
||||
|
||||
@ -111,25 +132,31 @@ func (store *SQLStateStore) GetMember(roomID id.RoomID, userID id.UserID) *event
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) TryGetMember(roomID id.RoomID, userID id.UserID) (*event.MemberEventContent, bool) {
|
||||
row := store.db.QueryRow("SELECT membership, displayname, avatar_url FROM mx_user_profile WHERE room_id=$1 AND user_id=$2", roomID, userID)
|
||||
var member event.MemberEventContent
|
||||
err := row.Scan(&member.Membership, &member.Displayname, &member.AvatarURL)
|
||||
if err != nil && err != sql.ErrNoRows {
|
||||
store.log.Warnfln("Failed to scan member info of %s in %s: %v", userID, roomID, err)
|
||||
var user mxUserProfile
|
||||
ans := store.db.Where("room_id = ? AND user_id = ?", roomID, userID).Take(&user)
|
||||
|
||||
if ans.Error != nil && ans.Error != gorm.ErrRecordNotFound {
|
||||
store.log.Warnfln("Failed to scan member info of %s in %s: %v", userID, roomID, ans.Error)
|
||||
}
|
||||
return &member, err == nil
|
||||
eventMember := event.MemberEventContent{
|
||||
Membership: event.Membership(user.Membership),
|
||||
Displayname: user.DisplayName,
|
||||
AvatarURL: id.ContentURIString(user.AvatarURL),
|
||||
}
|
||||
|
||||
return &eventMember, ans.Error != nil
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) FindSharedRooms(userID id.UserID) (rooms []id.RoomID) {
|
||||
rows, err := store.db.Query(`
|
||||
SELECT room_id FROM mx_user_profile
|
||||
LEFT JOIN portal ON portal.mxid=mx_user_profile.room_id
|
||||
WHERE user_id=$1 AND portal.encrypted=true
|
||||
`, userID)
|
||||
|
||||
rows, err := store.db.Table("mx_user_profile").Select("room_id").
|
||||
Joins("LEFT JOIN portal ON portal.mxid=mx_user_profile.room_id").
|
||||
Where("user_id = ? AND portal.encrypted=true", userID).Rows()
|
||||
if err != nil {
|
||||
store.log.Warnfln("Failed to query shared rooms with %s: %v", userID, err)
|
||||
return
|
||||
}
|
||||
print("running maybe maybe code f937060306")
|
||||
for rows.Next() {
|
||||
var roomID id.RoomID
|
||||
err := rows.Scan(&roomID)
|
||||
@ -162,141 +189,150 @@ func (store *SQLStateStore) IsMembership(roomID id.RoomID, userID id.UserID, all
|
||||
|
||||
func (store *SQLStateStore) SetMembership(roomID id.RoomID, userID id.UserID, membership event.Membership) {
|
||||
var err error
|
||||
if store.db.dialect == "postgres" {
|
||||
_, err = store.db.Exec(`INSERT INTO mx_user_profile (room_id, user_id, membership) VALUES ($1, $2, $3)
|
||||
ON CONFLICT (room_id, user_id) DO UPDATE SET membership=$3`, roomID, userID, membership)
|
||||
} else if store.db.dialect == "sqlite3" {
|
||||
_, err = store.db.Exec("INSERT OR REPLACE INTO mx_user_profile (room_id, user_id, membership) VALUES ($1, $2, $3)", roomID, userID, membership)
|
||||
} else {
|
||||
err = fmt.Errorf("unsupported dialect %s", store.db.dialect)
|
||||
user := mxUserProfile{
|
||||
RoomID: roomID.String(),
|
||||
UserID: userID.String(),
|
||||
Membership: string(membership),
|
||||
}
|
||||
if err != nil {
|
||||
print("weird thing 2 502650285")
|
||||
print(user.Membership)
|
||||
|
||||
ans := store.db.Select("roomID", "userID", "membership").Clauses(clause.OnConflict{
|
||||
Columns: []clause.Column{{Name: "roomID"}, {Name: "userID"}},
|
||||
DoUpdates: clause.AssignmentColumns([]string{"membership"}),
|
||||
}).Create(&user)
|
||||
|
||||
if ans.Error != nil {
|
||||
store.log.Warnfln("Failed to set membership of %s in %s to %s: %v", userID, roomID, membership, err)
|
||||
}
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) SetMember(roomID id.RoomID, userID id.UserID, member *event.MemberEventContent) {
|
||||
var err error
|
||||
if store.db.dialect == "postgres" {
|
||||
_, err = store.db.Exec(`INSERT INTO mx_user_profile (room_id, user_id, membership, displayname, avatar_url) VALUES ($1, $2, $3, $4, $5)
|
||||
ON CONFLICT (room_id, user_id) DO UPDATE SET membership=$3`, roomID, userID, member.Membership, member.Displayname, member.AvatarURL)
|
||||
} else if store.db.dialect == "sqlite3" {
|
||||
_, err = store.db.Exec("INSERT OR REPLACE INTO mx_user_profile (room_id, user_id, membership, displayname, avatar_url) VALUES ($1, $2, $3, $4, $5)",
|
||||
roomID, userID, member.Membership, member.Displayname, member.AvatarURL)
|
||||
} else {
|
||||
err = fmt.Errorf("unsupported dialect %s", store.db.dialect)
|
||||
|
||||
user := mxUserProfile{
|
||||
RoomID: roomID.String(),
|
||||
UserID: userID.String(),
|
||||
Membership: string(member.Membership),
|
||||
DisplayName: member.Displayname,
|
||||
AvatarURL: string(member.AvatarURL),
|
||||
}
|
||||
if err != nil {
|
||||
store.log.Warnfln("Failed to set membership of %s in %s to %s: %v", userID, roomID, member, err)
|
||||
ans := store.db.Clauses(clause.OnConflict{
|
||||
Columns: []clause.Column{{Name: "roomID"}, {Name: "userID"}},
|
||||
DoUpdates: clause.AssignmentColumns([]string{"membership"}),
|
||||
}).Create(&user)
|
||||
|
||||
if ans.Error != nil {
|
||||
store.log.Warnfln("Failed to set membership of %s in %s to %s: %v", userID, roomID, member, ans.Error)
|
||||
}
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) SetPowerLevels(roomID id.RoomID, levels *event.PowerLevelsEventContent) {
|
||||
levelsBytes, err := json.Marshal(levels)
|
||||
if err != nil {
|
||||
store.log.Errorfln("Failed to marshal power levels of %s: %v", roomID, err)
|
||||
return
|
||||
}
|
||||
if store.db.dialect == "postgres" {
|
||||
_, err = store.db.Exec(`INSERT INTO mx_room_state (room_id, power_levels) VALUES ($1, $2)
|
||||
ON CONFLICT (room_id) DO UPDATE SET power_levels=$2`, roomID, levelsBytes)
|
||||
} else if store.db.dialect == "sqlite3" {
|
||||
_, err = store.db.Exec("INSERT OR REPLACE INTO mx_room_state (room_id, power_levels) VALUES ($1, $2)", roomID, levelsBytes)
|
||||
} else {
|
||||
err = fmt.Errorf("unsupported dialect %s", store.db.dialect)
|
||||
}
|
||||
if err != nil {
|
||||
store.log.Warnfln("Failed to store power levels of %s: %v", roomID, err)
|
||||
}
|
||||
// levelsBytes, err := json.Marshal(levels)
|
||||
// if err != nil {
|
||||
// store.log.Errorfln("Failed to marshal power levels of %s: %v", roomID, err)
|
||||
// return
|
||||
// }
|
||||
// if store.db.dialect == "postgres" {
|
||||
// _, err = store.db.Exec(`INSERT INTO mx_room_state (room_id, power_levels) VALUES ($1, $2)
|
||||
// ON CONFLICT (room_id) DO UPDATE SET power_levels=$2`, roomID, levelsBytes)
|
||||
// } else if store.db.dialect == "sqlite3" {
|
||||
// _, err = store.db.Exec("INSERT OR REPLACE INTO mx_room_state (room_id, power_levels) VALUES ($1, $2)", roomID, levelsBytes)
|
||||
// } else {
|
||||
// err = fmt.Errorf("unsupported dialect %s", store.db.dialect)
|
||||
// }
|
||||
// if err != nil {
|
||||
// store.log.Warnfln("Failed to store power levels of %s: %v", roomID, err)
|
||||
// }
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) GetPowerLevels(roomID id.RoomID) (levels *event.PowerLevelsEventContent) {
|
||||
row := store.db.QueryRow("SELECT power_levels FROM mx_room_state WHERE room_id=$1", roomID)
|
||||
if row == nil {
|
||||
return
|
||||
}
|
||||
var data []byte
|
||||
err := row.Scan(&data)
|
||||
if err != nil {
|
||||
store.log.Errorln("Failed to scan power levels of %s: %v", roomID, err)
|
||||
return
|
||||
}
|
||||
levels = &event.PowerLevelsEventContent{}
|
||||
err = json.Unmarshal(data, levels)
|
||||
if err != nil {
|
||||
store.log.Errorln("Failed to parse power levels of %s: %v", roomID, err)
|
||||
return nil
|
||||
}
|
||||
// row := store.db.QueryRow("SELECT power_levels FROM mx_room_state WHERE room_id=$1", roomID)
|
||||
// if row == nil {
|
||||
// return
|
||||
// }
|
||||
// var data []byte
|
||||
// err := row.Scan(&data)
|
||||
// if err != nil {
|
||||
// store.log.Errorln("Failed to scan power levels of %s: %v", roomID, err)
|
||||
// return
|
||||
// }
|
||||
// levels = &event.PowerLevelsEventContent{}
|
||||
// err = json.Unmarshal(data, levels)
|
||||
// if err != nil {
|
||||
// store.log.Errorln("Failed to parse power levels of %s: %v", roomID, err)
|
||||
// return nil
|
||||
// }
|
||||
return
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) GetPowerLevel(roomID id.RoomID, userID id.UserID) int {
|
||||
if store.db.dialect == "postgres" {
|
||||
row := store.db.QueryRow(`SELECT
|
||||
COALESCE((power_levels->'users'->$2)::int, (power_levels->'users_default')::int, 0)
|
||||
FROM mx_room_state WHERE room_id=$1`, roomID, userID)
|
||||
if row == nil {
|
||||
// Power levels not in db
|
||||
return 0
|
||||
}
|
||||
var powerLevel int
|
||||
err := row.Scan(&powerLevel)
|
||||
if err != nil {
|
||||
store.log.Errorln("Failed to scan power level of %s in %s: %v", userID, roomID, err)
|
||||
}
|
||||
return powerLevel
|
||||
}
|
||||
// if store.db.dialect == "postgres" {
|
||||
// row := store.db.QueryRow(`SELECT
|
||||
// COALESCE((power_levels->'users'->$2)::int, (power_levels->'users_default')::int, 0)
|
||||
// FROM mx_room_state WHERE room_id=$1`, roomID, userID)
|
||||
// if row == nil {
|
||||
// // Power levels not in db
|
||||
// return 0
|
||||
// }
|
||||
// var powerLevel int
|
||||
// err := row.Scan(&powerLevel)
|
||||
// if err != nil {
|
||||
// store.log.Errorln("Failed to scan power level of %s in %s: %v", userID, roomID, err)
|
||||
// }
|
||||
// return powerLevel
|
||||
// }
|
||||
return store.GetPowerLevels(roomID).GetUserLevel(userID)
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) GetPowerLevelRequirement(roomID id.RoomID, eventType event.Type) int {
|
||||
if store.db.dialect == "postgres" {
|
||||
defaultType := "events_default"
|
||||
defaultValue := 0
|
||||
if eventType.IsState() {
|
||||
defaultType = "state_default"
|
||||
defaultValue = 50
|
||||
}
|
||||
row := store.db.QueryRow(`SELECT
|
||||
COALESCE((power_levels->'events'->$2)::int, (power_levels->'$3')::int, $4)
|
||||
FROM mx_room_state WHERE room_id=$1`, roomID, eventType.Type, defaultType, defaultValue)
|
||||
if row == nil {
|
||||
// Power levels not in db
|
||||
return defaultValue
|
||||
}
|
||||
var powerLevel int
|
||||
err := row.Scan(&powerLevel)
|
||||
if err != nil {
|
||||
store.log.Errorln("Failed to scan power level for %s in %s: %v", eventType, roomID, err)
|
||||
}
|
||||
return powerLevel
|
||||
}
|
||||
// if store.db.dialect == "postgres" {
|
||||
// defaultType := "events_default"
|
||||
// defaultValue := 0
|
||||
// if eventType.IsState() {
|
||||
// defaultType = "state_default"
|
||||
// defaultValue = 50
|
||||
// }
|
||||
// row := store.db.QueryRow(`SELECT
|
||||
// COALESCE((power_levels->'events'->$2)::int, (power_levels->'$3')::int, $4)
|
||||
// FROM mx_room_state WHERE room_id=$1`, roomID, eventType.Type, defaultType, defaultValue)
|
||||
// if row == nil {
|
||||
// // Power levels not in db
|
||||
// return defaultValue
|
||||
// }
|
||||
// var powerLevel int
|
||||
// err := row.Scan(&powerLevel)
|
||||
// if err != nil {
|
||||
// store.log.Errorln("Failed to scan power level for %s in %s: %v", eventType, roomID, err)
|
||||
// }
|
||||
// return powerLevel
|
||||
// }
|
||||
return store.GetPowerLevels(roomID).GetEventLevel(eventType)
|
||||
}
|
||||
|
||||
func (store *SQLStateStore) HasPowerLevel(roomID id.RoomID, userID id.UserID, eventType event.Type) bool {
|
||||
if store.db.dialect == "postgres" {
|
||||
defaultType := "events_default"
|
||||
defaultValue := 0
|
||||
if eventType.IsState() {
|
||||
defaultType = "state_default"
|
||||
defaultValue = 50
|
||||
}
|
||||
row := store.db.QueryRow(`SELECT
|
||||
COALESCE((power_levels->'users'->$2)::int, (power_levels->'users_default')::int, 0)
|
||||
>=
|
||||
COALESCE((power_levels->'events'->$3)::int, (power_levels->'$4')::int, $5)
|
||||
FROM mx_room_state WHERE room_id=$1`, roomID, userID, eventType.Type, defaultType, defaultValue)
|
||||
if row == nil {
|
||||
// Power levels not in db
|
||||
return defaultValue == 0
|
||||
}
|
||||
var hasPower bool
|
||||
err := row.Scan(&hasPower)
|
||||
if err != nil {
|
||||
store.log.Errorln("Failed to scan power level for %s in %s: %v", eventType, roomID, err)
|
||||
}
|
||||
return hasPower
|
||||
}
|
||||
return store.GetPowerLevel(roomID, userID) >= store.GetPowerLevelRequirement(roomID, eventType)
|
||||
// if store.db.dialect == "postgres" {
|
||||
// defaultType := "events_default"
|
||||
// defaultValue := 0
|
||||
// if eventType.IsState() {
|
||||
// defaultType = "state_default"
|
||||
// defaultValue = 50
|
||||
// }
|
||||
// row := store.db.QueryRow(`SELECT
|
||||
// COALESCE((power_levels->'users'->$2)::int, (power_levels->'users_default')::int, 0)
|
||||
// >=
|
||||
// COALESCE((power_levels->'events'->$3)::int, (power_levels->'$4')::int, $5)
|
||||
// FROM mx_room_state WHERE room_id=$1`, roomID, userID, eventType.Type, defaultType, defaultValue)
|
||||
// if row == nil {
|
||||
// // Power levels not in db
|
||||
// return defaultValue == 0
|
||||
// }
|
||||
// var hasPower bool
|
||||
// err := row.Scan(&hasPower)
|
||||
// if err != nil {
|
||||
// store.log.Errorln("Failed to scan power level for %s in %s: %v", eventType, roomID, err)
|
||||
// }
|
||||
// return hasPower
|
||||
// }
|
||||
// return store.GetPowerLevel(roomID, userID) >= store.GetPowerLevelRequirement(roomID, eventType)
|
||||
return false
|
||||
}
|
||||
|
||||
@ -1,66 +1,198 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[0] = upgrade{"Initial schema", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`CREATE TABLE IF NOT EXISTS portal (
|
||||
jid VARCHAR(255),
|
||||
receiver VARCHAR(255),
|
||||
mxid VARCHAR(255) UNIQUE,
|
||||
upgrades[0] = upgrade{"Initial schema", func(tx *gorm.DB, ctx context) error {
|
||||
// _, err := tx.Exec(`CREATE TABLE IF NOT EXISTS portal (
|
||||
// jid VARCHAR(255),
|
||||
// receiver VARCHAR(255),
|
||||
// mxid VARCHAR(255) UNIQUE,
|
||||
|
||||
name VARCHAR(255) NOT NULL,
|
||||
topic VARCHAR(255) NOT NULL,
|
||||
avatar VARCHAR(255) NOT NULL,
|
||||
// name VARCHAR(255) NOT NULL,
|
||||
// topic VARCHAR(512) NOT NULL,
|
||||
// avatar VARCHAR(255) NOT NULL,
|
||||
// avatar_url VARCHAR(255),
|
||||
// encrypted BOOLEAN NOT NULL DEFAULT false
|
||||
|
||||
PRIMARY KEY (jid, receiver)
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// PRIMARY KEY (jid, receiver)
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
_, err = tx.Exec(`CREATE TABLE IF NOT EXISTS puppet (
|
||||
jid VARCHAR(255) PRIMARY KEY,
|
||||
avatar VARCHAR(255),
|
||||
displayname VARCHAR(255),
|
||||
name_quality SMALLINT
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// _, err = tx.Exec(`CREATE TABLE IF NOT EXISTS puppet (
|
||||
// jid VARCHAR(255) PRIMARY KEY,
|
||||
// avatar VARCHAR(255),
|
||||
// displayname VARCHAR(255),
|
||||
// name_quality SMALLINT,
|
||||
// custom_mxid VARCHAR(255),
|
||||
// access_token VARCHAR(1023),
|
||||
// next_batch VARCHAR(255),
|
||||
// avatar_url VARCHAR(255),
|
||||
// enable_presence BOOLEAN NOT NULL DEFAULT true,
|
||||
// enable_receipts BOOLEAN NOT NULL DEFAULT true
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
_, err = tx.Exec(`CREATE TABLE IF NOT EXISTS "user" (
|
||||
mxid VARCHAR(255) PRIMARY KEY,
|
||||
jid VARCHAR(255) UNIQUE,
|
||||
// _, err = tx.Exec(`CREATE TABLE IF NOT EXISTS "user" (
|
||||
// mxid VARCHAR(255) PRIMARY KEY,
|
||||
// jid VARCHAR(255) UNIQUE,
|
||||
|
||||
management_room VARCHAR(255),
|
||||
// management_room VARCHAR(255),
|
||||
|
||||
client_id VARCHAR(255),
|
||||
client_token VARCHAR(255),
|
||||
server_token VARCHAR(255),
|
||||
enc_key bytea,
|
||||
mac_key bytea
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// client_id VARCHAR(255),
|
||||
// client_token VARCHAR(255),
|
||||
// server_token VARCHAR(255),
|
||||
// enc_key bytea,
|
||||
// mac_key bytea,
|
||||
// last_connection BIGINT NOT NULL DEFAULT 0
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
_, err = tx.Exec(`CREATE TABLE IF NOT EXISTS message (
|
||||
chat_jid VARCHAR(255),
|
||||
chat_receiver VARCHAR(255),
|
||||
jid VARCHAR(255),
|
||||
mxid VARCHAR(255) NOT NULL UNIQUE,
|
||||
sender VARCHAR(255) NOT NULL,
|
||||
content bytea NOT NULL,
|
||||
// _, err = tx.Exec(`CREATE TABLE IF NOT EXISTS "user_portal" (
|
||||
// user_jid VARCHAR(255),
|
||||
// portal_jid VARCHAR(255),
|
||||
// portal_receiver VARCHAR(255),
|
||||
// in_community BOOLEAN NOT NULL DEFAULT FALSE,
|
||||
|
||||
PRIMARY KEY (chat_jid, chat_receiver, jid),
|
||||
FOREIGN KEY (chat_jid, chat_receiver) REFERENCES portal(jid, receiver) ON DELETE CASCADE
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// PRIMARY KEY (user_jid, portal_jid, portal_receiver),
|
||||
|
||||
// FOREIGN KEY (user_jid) REFERENCES "user"(jid) ON DELETE CASCADE,
|
||||
// FOREIGN KEY (portal_jid, portal_receiver) REFERENCES portal(jid, receiver) ON DELETE CASCADE
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE IF NOT EXISTS message (
|
||||
// chat_jid VARCHAR(255),
|
||||
// chat_receiver VARCHAR(255),
|
||||
// jid VARCHAR(255),
|
||||
// mxid VARCHAR(255) NOT NULL UNIQUE,
|
||||
// sender VARCHAR(255) NOT NULL,
|
||||
// content bytea NOT NULL,
|
||||
// timestamp BIGINT NOT NULL DEFAULT 0,
|
||||
|
||||
// PRIMARY KEY (chat_jid, chat_receiver, jid),
|
||||
// FOREIGN KEY (chat_jid, chat_receiver) REFERENCES portal(jid, receiver) ON DELETE CASCADE
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE IF NOT EXISTS mx_registrations (
|
||||
// user_id VARCHAR(255) PRIMARY KEY
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE IF NOT EXISTS mx_room_state (
|
||||
// room_id VARCHAR(255) PRIMARY KEY,
|
||||
// power_levels TEXT
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE IF NOT EXISTS mx_user_profile (
|
||||
// room_id VARCHAR(255),
|
||||
// user_id VARCHAR(255),
|
||||
// membership VARCHAR(15) NOT NULL,
|
||||
// PRIMARY KEY (room_id, user_id),
|
||||
// displayname TEXT,
|
||||
// avatar_url VARCHAR(255)
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE IF NOT EXISTS crypto_olm_session (
|
||||
// session_id CHAR(43) PRIMARY KEY,
|
||||
// sender_key CHAR(43) NOT NULL,
|
||||
// session bytea NOT NULL,
|
||||
// created_at timestamp NOT NULL,
|
||||
// last_used timestamp NOT NULL
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE crypto_megolm_inbound_session (
|
||||
// session_id CHAR(43) PRIMARY KEY,
|
||||
// sender_key CHAR(43) NOT NULL,
|
||||
// signing_key CHAR(43) NOT NULL,
|
||||
// room_id VARCHAR(255) NOT NULL,
|
||||
// session bytea NOT NULL,
|
||||
// forwarding_chains bytea NOT NULL
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE crypto_device (
|
||||
// user_id VARCHAR(255),
|
||||
// device_id VARCHAR(255),
|
||||
// identity_key CHAR(43) NOT NULL,
|
||||
// signing_key CHAR(43) NOT NULL,
|
||||
// trust SMALLINT NOT NULL,
|
||||
// deleted BOOLEAN NOT NULL,
|
||||
// name VARCHAR(255) NOT NULL,
|
||||
|
||||
// PRIMARY KEY (user_id, device_id)
|
||||
// )`)
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE crypto_tracked_user (
|
||||
// user_id VARCHAR(255) PRIMARY KEY
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE crypto_message_index (
|
||||
// sender_key CHAR(43),
|
||||
// session_id CHAR(43),
|
||||
// "index" INTEGER,
|
||||
// event_id VARCHAR(255) NOT NULL,
|
||||
// timestamp BIGINT NOT NULL,
|
||||
|
||||
// PRIMARY KEY (sender_key, session_id, "index")
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE crypto_account (
|
||||
// device_id VARCHAR(255) PRIMARY KEY,
|
||||
// shared BOOLEAN NOT NULL,
|
||||
// sync_token TEXT NOT NULL,
|
||||
// account bytea NOT NULL
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
// _, err = tx.Exec(`CREATE TABLE crypto_megolm_outbound_session (
|
||||
// room_id VARCHAR(255) PRIMARY KEY,
|
||||
// session_id CHAR(43) NOT NULL UNIQUE,
|
||||
// session bytea NOT NULL,
|
||||
// shared BOOLEAN NOT NULL,
|
||||
// max_messages INTEGER NOT NULL,
|
||||
// message_count INTEGER NOT NULL,
|
||||
// max_age BIGINT NOT NULL,
|
||||
// created_at timestamp NOT NULL,
|
||||
// last_used timestamp NOT NULL
|
||||
// )`)
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
|
||||
return nil
|
||||
}}
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[1] = upgrade{"Add ON DELETE CASCADE to message table", func(tx *sql.Tx, ctx context) error {
|
||||
if ctx.dialect == SQLite {
|
||||
// SQLite doesn't support constraint updates, but it isn't that careful with constraints anyway.
|
||||
return nil
|
||||
}
|
||||
res, _ := ctx.db.Query(`SELECT EXISTS(SELECT constraint_name FROM information_schema.table_constraints
|
||||
WHERE table_name='message' AND constraint_name='message_chat_jid_fkey')`)
|
||||
var exists bool
|
||||
_ = res.Scan(&exists)
|
||||
if exists {
|
||||
_, err := tx.Exec("ALTER TABLE message DROP CONSTRAINT IF EXISTS message_chat_jid_fkey")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec(`ALTER TABLE message ADD CONSTRAINT message_chat_jid_fkey
|
||||
FOREIGN KEY (chat_jid, chat_receiver) REFERENCES portal(jid, receiver)
|
||||
ON DELETE CASCADE`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[2] = upgrade{"Add timestamp column to messages", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec("ALTER TABLE message ADD COLUMN timestamp BIGINT NOT NULL DEFAULT 0")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[3] = upgrade{"Add last_connection column to users", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`ALTER TABLE "user" ADD COLUMN last_connection BIGINT NOT NULL DEFAULT 0`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
}
|
||||
@ -1,61 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
)
|
||||
|
||||
func init() {
|
||||
var keys = []string{"imageMessage", "contactMessage", "locationMessage", "extendedTextMessage", "documentMessage", "audioMessage", "videoMessage"}
|
||||
upgrades[4] = upgrade{"Update message content to new protocol version. This may take a while.", func(tx *sql.Tx, ctx context) error {
|
||||
rows, err := ctx.db.Query("SELECT mxid, content FROM message")
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
for rows.Next() {
|
||||
var mxid string
|
||||
var rawContent []byte
|
||||
err = rows.Scan(&mxid, &rawContent)
|
||||
if err != nil {
|
||||
fmt.Println("Error scanning:", err)
|
||||
continue
|
||||
}
|
||||
var content map[string]interface{}
|
||||
err = json.Unmarshal(rawContent, &content)
|
||||
if err != nil {
|
||||
fmt.Printf("Error unmarshaling content of %s: %v\n", mxid, err)
|
||||
continue
|
||||
}
|
||||
|
||||
for _, key := range keys {
|
||||
val, ok := content[key].(map[string]interface{})
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
ci, ok := val["contextInfo"].(map[string]interface{})
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
qm, ok := ci["quotedMessage"].([]interface{})
|
||||
if !ok {
|
||||
continue
|
||||
}
|
||||
ci["quotedMessage"] = qm[0]
|
||||
goto save
|
||||
}
|
||||
continue
|
||||
|
||||
save:
|
||||
rawContent, err = json.Marshal(&content)
|
||||
if err != nil {
|
||||
fmt.Printf("Error marshaling updated content of %s: %v\n", mxid, err)
|
||||
}
|
||||
_, err = tx.Exec("UPDATE message SET content=$1 WHERE mxid=$2", rawContent, mxid)
|
||||
if err != nil {
|
||||
fmt.Printf("Error updating row of %s: %v\n", mxid, err)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[5] = upgrade{"Add columns to store custom puppet info", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`ALTER TABLE puppet ADD COLUMN custom_mxid VARCHAR(255)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec(`ALTER TABLE puppet ADD COLUMN access_token VARCHAR(1023)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec(`ALTER TABLE puppet ADD COLUMN next_batch VARCHAR(255)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[6] = upgrade{"Add user-portal mapping table", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`CREATE TABLE user_portal (
|
||||
user_jid VARCHAR(255),
|
||||
portal_jid VARCHAR(255),
|
||||
portal_receiver VARCHAR(255),
|
||||
PRIMARY KEY (user_jid, portal_jid, portal_receiver),
|
||||
FOREIGN KEY (user_jid) REFERENCES "user"(jid) ON DELETE CASCADE,
|
||||
FOREIGN KEY (portal_jid, portal_receiver) REFERENCES portal(jid, receiver) ON DELETE CASCADE
|
||||
)`)
|
||||
return err
|
||||
}}
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[7] = upgrade{"Add columns to store avatar MXC URIs", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`ALTER TABLE puppet ADD COLUMN avatar_url VARCHAR(255)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec(`ALTER TABLE portal ADD COLUMN avatar_url VARCHAR(255)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[8] = upgrade{"Add columns to store portal in filtering community meta", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`ALTER TABLE user_portal ADD COLUMN in_community BOOLEAN NOT NULL DEFAULT FALSE`)
|
||||
return err
|
||||
}}
|
||||
}
|
||||
@ -1,141 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io/ioutil"
|
||||
"os"
|
||||
"strings"
|
||||
|
||||
"maunium.net/go/mautrix/event"
|
||||
)
|
||||
|
||||
func init() {
|
||||
migrateRegistrations := func(tx *sql.Tx, registrations map[string]bool) error {
|
||||
if len(registrations) == 0 {
|
||||
return nil
|
||||
}
|
||||
|
||||
executeBatch := func(tx *sql.Tx, valueStrings []string, values ...interface{}) error {
|
||||
valueString := strings.Join(valueStrings, ",")
|
||||
_, err := tx.Exec("INSERT INTO mx_registrations (user_id) VALUES "+valueString, values...)
|
||||
return err
|
||||
}
|
||||
|
||||
batchSize := 100
|
||||
values := make([]interface{}, 0, batchSize)
|
||||
valueStrings := make([]string, 0, batchSize)
|
||||
i := 1
|
||||
for userID, registered := range registrations {
|
||||
if i == batchSize {
|
||||
err := executeBatch(tx, valueStrings, values...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
i = 1
|
||||
values = make([]interface{}, 0, batchSize)
|
||||
valueStrings = make([]string, 0, batchSize)
|
||||
}
|
||||
if registered {
|
||||
values = append(values, userID)
|
||||
valueStrings = append(valueStrings, fmt.Sprintf("($%d)", i))
|
||||
i++
|
||||
}
|
||||
}
|
||||
return executeBatch(tx, valueStrings, values...)
|
||||
}
|
||||
|
||||
migrateMemberships := func(tx *sql.Tx, rooms map[string]map[string]event.Membership) error {
|
||||
for roomID, members := range rooms {
|
||||
if len(members) == 0 {
|
||||
continue
|
||||
}
|
||||
var values []interface{}
|
||||
var valueStrings []string
|
||||
i := 1
|
||||
for userID, membership := range members {
|
||||
values = append(values, roomID, userID, membership)
|
||||
valueStrings = append(valueStrings, fmt.Sprintf("($%d, $%d, $%d)", i, i+1, i+2))
|
||||
i += 3
|
||||
}
|
||||
valueString := strings.Join(valueStrings, ",")
|
||||
_, err := tx.Exec("INSERT INTO mx_user_profile (room_id, user_id, membership) VALUES "+valueString, values...)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
migratePowerLevels := func(tx *sql.Tx, rooms map[string]*event.PowerLevelsEventContent) error {
|
||||
if len(rooms) == 0 {
|
||||
return nil
|
||||
}
|
||||
var values []interface{}
|
||||
var valueStrings []string
|
||||
i := 1
|
||||
for roomID, powerLevels := range rooms {
|
||||
powerLevelBytes, err := json.Marshal(powerLevels)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
values = append(values, roomID, powerLevelBytes)
|
||||
valueStrings = append(valueStrings, fmt.Sprintf("($%d, $%d)", i, i+1))
|
||||
i += 2
|
||||
}
|
||||
valueString := strings.Join(valueStrings, ",")
|
||||
_, err := tx.Exec("INSERT INTO mx_room_state (room_id, power_levels) VALUES "+valueString, values...)
|
||||
return err
|
||||
}
|
||||
|
||||
userProfileTable := `CREATE TABLE mx_user_profile (
|
||||
room_id VARCHAR(255),
|
||||
user_id VARCHAR(255),
|
||||
membership VARCHAR(15) NOT NULL,
|
||||
PRIMARY KEY (room_id, user_id)
|
||||
)`
|
||||
|
||||
roomStateTable := `CREATE TABLE mx_room_state (
|
||||
room_id VARCHAR(255) PRIMARY KEY,
|
||||
power_levels TEXT
|
||||
)`
|
||||
|
||||
registrationsTable := `CREATE TABLE mx_registrations (
|
||||
user_id VARCHAR(255) PRIMARY KEY
|
||||
)`
|
||||
|
||||
type TempStateStore struct {
|
||||
Registrations map[string]bool `json:"registrations"`
|
||||
Members map[string]map[string]event.Membership `json:"memberships"`
|
||||
PowerLevels map[string]*event.PowerLevelsEventContent `json:"power_levels"`
|
||||
}
|
||||
|
||||
upgrades[9] = upgrade{"Move state store to main DB", func(tx *sql.Tx, ctx context) error {
|
||||
if ctx.dialect == Postgres {
|
||||
roomStateTable = strings.Replace(roomStateTable, "TEXT", "JSONB", 1)
|
||||
}
|
||||
|
||||
var store TempStateStore
|
||||
if _, err := tx.Exec(userProfileTable); err != nil {
|
||||
return err
|
||||
} else if _, err = tx.Exec(roomStateTable); err != nil {
|
||||
return err
|
||||
} else if _, err = tx.Exec(registrationsTable); err != nil {
|
||||
return err
|
||||
} else if data, err := ioutil.ReadFile("mx-state.json"); err != nil {
|
||||
ctx.log.Debugln("mx-state.json not found, not migrating state store")
|
||||
} else if err = json.Unmarshal(data, &store); err != nil {
|
||||
return err
|
||||
} else if err = migrateRegistrations(tx, store.Registrations); err != nil {
|
||||
return err
|
||||
} else if err = migrateMemberships(tx, store.Members); err != nil {
|
||||
return err
|
||||
} else if err = migratePowerLevels(tx, store.PowerLevels); err != nil {
|
||||
return err
|
||||
} else if err = os.Rename("mx-state.json", "mx-state.json.bak"); err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[10] = upgrade{"Add columns to store full member info in state store", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`ALTER TABLE mx_user_profile ADD COLUMN displayname TEXT`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec(`ALTER TABLE mx_user_profile ADD COLUMN avatar_url VARCHAR(255)`)
|
||||
return err
|
||||
}}
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[11] = upgrade{"Adjust the length of column topic in portal", func(tx *sql.Tx, ctx context) error {
|
||||
if ctx.dialect == SQLite {
|
||||
// SQLite doesn't support constraint updates, but it isn't that careful with constraints anyway.
|
||||
return nil
|
||||
}
|
||||
_, err := tx.Exec(`ALTER TABLE portal ALTER COLUMN topic TYPE VARCHAR(512)`)
|
||||
return err
|
||||
}}
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[12] = upgrade{"Add encryption status to portal table", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`ALTER TABLE portal ADD COLUMN encrypted BOOLEAN NOT NULL DEFAULT false`)
|
||||
return err
|
||||
}}
|
||||
}
|
||||
@ -1,73 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[13] = upgrade{"Add crypto store to database", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`CREATE TABLE crypto_account (
|
||||
device_id VARCHAR(255) PRIMARY KEY,
|
||||
shared BOOLEAN NOT NULL,
|
||||
sync_token TEXT NOT NULL,
|
||||
account bytea NOT NULL
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec(`CREATE TABLE crypto_message_index (
|
||||
sender_key CHAR(43),
|
||||
session_id CHAR(43),
|
||||
"index" INTEGER,
|
||||
event_id VARCHAR(255) NOT NULL,
|
||||
timestamp BIGINT NOT NULL,
|
||||
|
||||
PRIMARY KEY (sender_key, session_id, "index")
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec(`CREATE TABLE crypto_tracked_user (
|
||||
user_id VARCHAR(255) PRIMARY KEY
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec(`CREATE TABLE crypto_device (
|
||||
user_id VARCHAR(255),
|
||||
device_id VARCHAR(255),
|
||||
identity_key CHAR(43) NOT NULL,
|
||||
signing_key CHAR(43) NOT NULL,
|
||||
trust SMALLINT NOT NULL,
|
||||
deleted BOOLEAN NOT NULL,
|
||||
name VARCHAR(255) NOT NULL,
|
||||
|
||||
PRIMARY KEY (user_id, device_id)
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec(`CREATE TABLE crypto_olm_session (
|
||||
session_id CHAR(43) PRIMARY KEY,
|
||||
sender_key CHAR(43) NOT NULL,
|
||||
session bytea NOT NULL,
|
||||
created_at timestamp NOT NULL,
|
||||
last_used timestamp NOT NULL
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec(`CREATE TABLE crypto_megolm_inbound_session (
|
||||
session_id CHAR(43) PRIMARY KEY,
|
||||
sender_key CHAR(43) NOT NULL,
|
||||
signing_key CHAR(43) NOT NULL,
|
||||
room_id VARCHAR(255) NOT NULL,
|
||||
session bytea NOT NULL,
|
||||
forwarding_chains bytea NOT NULL
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
}
|
||||
@ -1,25 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[14] = upgrade{"Add outbound group sessions to database", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`CREATE TABLE crypto_megolm_outbound_session (
|
||||
room_id VARCHAR(255) PRIMARY KEY,
|
||||
session_id CHAR(43) NOT NULL UNIQUE,
|
||||
session bytea NOT NULL,
|
||||
shared BOOLEAN NOT NULL,
|
||||
max_messages INTEGER NOT NULL,
|
||||
message_count INTEGER NOT NULL,
|
||||
max_age BIGINT NOT NULL,
|
||||
created_at timestamp NOT NULL,
|
||||
last_used timestamp NOT NULL
|
||||
)`)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
}}
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[15] = upgrade{"Add enable_presence column for puppets", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`ALTER TABLE puppet ADD COLUMN enable_presence BOOLEAN NOT NULL DEFAULT true`)
|
||||
return err
|
||||
}}
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"maunium.net/go/mautrix/crypto/sql_store_upgrade"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[16] = upgrade{"Add account_id to crypto store", func(tx *sql.Tx, c context) error {
|
||||
return sql_store_upgrade.Upgrades[1](tx, c.dialect.String())
|
||||
}}
|
||||
}
|
||||
@ -1,12 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[17] = upgrade{"Add enable_receipts column for puppets", func(tx *sql.Tx, ctx context) error {
|
||||
_, err := tx.Exec(`ALTER TABLE puppet ADD COLUMN enable_receipts BOOLEAN NOT NULL DEFAULT true`)
|
||||
return err
|
||||
}}
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"maunium.net/go/mautrix/crypto/sql_store_upgrade"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[18] = upgrade{"Add megolm withheld data to crypto store", func(tx *sql.Tx, c context) error {
|
||||
return sql_store_upgrade.Upgrades[2](tx, c.dialect.String())
|
||||
}}
|
||||
}
|
||||
@ -1,13 +0,0 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
|
||||
"maunium.net/go/mautrix/crypto/sql_store_upgrade"
|
||||
)
|
||||
|
||||
func init() {
|
||||
upgrades[19] = upgrade{"Add cross-signing keys to crypto store", func(tx *sql.Tx, c context) error {
|
||||
return sql_store_upgrade.Upgrades[3](tx, c.dialect.String())
|
||||
}}
|
||||
}
|
||||
@ -1,10 +1,11 @@
|
||||
package upgrades
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"gorm.io/gorm"
|
||||
log "maunium.net/go/maulogger/v2"
|
||||
)
|
||||
|
||||
@ -26,11 +27,11 @@ func (dialect Dialect) String() string {
|
||||
}
|
||||
}
|
||||
|
||||
type upgradeFunc func(*sql.Tx, context) error
|
||||
type upgradeFunc func(*gorm.DB, context) error
|
||||
|
||||
type context struct {
|
||||
dialect Dialect
|
||||
db *sql.DB
|
||||
db *gorm.DB
|
||||
log log.Logger
|
||||
}
|
||||
|
||||
@ -39,36 +40,45 @@ type upgrade struct {
|
||||
fn upgradeFunc
|
||||
}
|
||||
|
||||
const NumberOfUpgrades = 20
|
||||
type version struct {
|
||||
gorm.Model
|
||||
V int
|
||||
}
|
||||
|
||||
const NumberOfUpgrades = 1
|
||||
|
||||
var upgrades [NumberOfUpgrades]upgrade
|
||||
|
||||
var UnsupportedDatabaseVersion = fmt.Errorf("unsupported database version")
|
||||
|
||||
func GetVersion(db *sql.DB) (int, error) {
|
||||
_, err := db.Exec("CREATE TABLE IF NOT EXISTS version (version INTEGER)")
|
||||
if err != nil {
|
||||
return -1, err
|
||||
}
|
||||
func GetVersion(db *gorm.DB) (int, error) {
|
||||
var ver = version{V: 0}
|
||||
result := db.FirstOrCreate(&ver, &ver)
|
||||
if result.Error != nil {
|
||||
if errors.Is(result.Error, gorm.ErrRecordNotFound) ||
|
||||
errors.Is(result.Error, gorm.ErrInvalidField) {
|
||||
db.Create(&ver)
|
||||
print("create version")
|
||||
|
||||
version := 0
|
||||
row := db.QueryRow("SELECT version FROM version LIMIT 1")
|
||||
if row != nil {
|
||||
_ = row.Scan(&version)
|
||||
} else {
|
||||
return 0, result.Error
|
||||
}
|
||||
}
|
||||
return version, nil
|
||||
return int(ver.V), nil
|
||||
}
|
||||
|
||||
func SetVersion(tx *sql.Tx, version int) error {
|
||||
_, err := tx.Exec("DELETE FROM version")
|
||||
if err != nil {
|
||||
return err
|
||||
func SetVersion(tx *gorm.DB, newVersion int) error {
|
||||
err := tx.Where("v IS NOT NULL").Delete(&version{})
|
||||
if err.Error != nil {
|
||||
return err.Error
|
||||
}
|
||||
_, err = tx.Exec("INSERT INTO version (version) VALUES ($1)", version)
|
||||
return err
|
||||
|
||||
val := version{V: newVersion}
|
||||
tx = tx.Create(&val)
|
||||
return tx.Error
|
||||
}
|
||||
|
||||
func Run(log log.Logger, dialectName string, db *sql.DB) error {
|
||||
func Run(log log.Logger, dialectName string, db *gorm.DB) error {
|
||||
var dialect Dialect
|
||||
switch strings.ToLower(dialectName) {
|
||||
case "postgres":
|
||||
@ -79,7 +89,9 @@ func Run(log log.Logger, dialectName string, db *sql.DB) error {
|
||||
return fmt.Errorf("unknown dialect %s", dialectName)
|
||||
}
|
||||
|
||||
db.AutoMigrate(&version{})
|
||||
version, err := GetVersion(db)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@ -91,22 +103,21 @@ func Run(log log.Logger, dialectName string, db *sql.DB) error {
|
||||
log.Infofln("Database currently on v%d, latest: v%d", version, NumberOfUpgrades)
|
||||
for i, upgrade := range upgrades[version:] {
|
||||
log.Infofln("Upgrading database to v%d: %s", version+i+1, upgrade.message)
|
||||
tx, err := db.Begin()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = upgrade.fn(tx, context{dialect, db, log})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = SetVersion(tx, version+i+1)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = tx.Commit()
|
||||
err = db.Transaction(func(tx *gorm.DB) error {
|
||||
err = upgrade.fn(tx, context{dialect, db, log})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = SetVersion(tx, version+i+1)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return nil
|
||||
})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
257
database/user.go
257
database/user.go
@ -18,16 +18,14 @@ package database
|
||||
|
||||
import (
|
||||
"database/sql"
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/Rhymen/go-whatsapp"
|
||||
|
||||
log "maunium.net/go/maulogger/v2"
|
||||
|
||||
"maunium.net/go/mautrix-whatsapp/types"
|
||||
"maunium.net/go/mautrix-whatsapp/whatsapp-ext"
|
||||
whatsappExt "maunium.net/go/mautrix-whatsapp/whatsapp-ext"
|
||||
"maunium.net/go/mautrix/id"
|
||||
)
|
||||
|
||||
@ -44,31 +42,33 @@ func (uq *UserQuery) New() *User {
|
||||
}
|
||||
|
||||
func (uq *UserQuery) GetAll() (users []*User) {
|
||||
rows, err := uq.db.Query(`SELECT mxid, jid, management_room, last_connection, client_id, client_token, server_token, enc_key, mac_key FROM "user"`)
|
||||
if err != nil || rows == nil {
|
||||
return nil
|
||||
}
|
||||
defer rows.Close()
|
||||
for rows.Next() {
|
||||
users = append(users, uq.New().Scan(rows))
|
||||
}
|
||||
// rows, err := uq.db.Query(`SELECT mxid, jid, management_room, last_connection, client_id, client_token, server_token, enc_key, mac_key FROM "user"`)
|
||||
// if err != nil || rows == nil {
|
||||
// return nil
|
||||
// }
|
||||
// defer rows.Close()
|
||||
// for rows.Next() {
|
||||
// users = append(users, uq.New().Scan(rows))
|
||||
// }
|
||||
return
|
||||
}
|
||||
|
||||
func (uq *UserQuery) GetByMXID(userID id.UserID) *User {
|
||||
row := uq.db.QueryRow(`SELECT mxid, jid, management_room, last_connection, client_id, client_token, server_token, enc_key, mac_key FROM "user" WHERE mxid=$1`, userID)
|
||||
if row == nil {
|
||||
return nil
|
||||
}
|
||||
return uq.New().Scan(row)
|
||||
// row := uq.db.QueryRow(`SELECT mxid, jid, management_room, last_connection, client_id, client_token, server_token, enc_key, mac_key FROM "user" WHERE mxid=$1`, userID)
|
||||
// if row == nil {
|
||||
// return nil
|
||||
// }
|
||||
// return uq.New().Scan(row)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (uq *UserQuery) GetByJID(userID types.WhatsAppID) *User {
|
||||
row := uq.db.QueryRow(`SELECT mxid, jid, management_room, last_connection, client_id, client_token, server_token, enc_key, mac_key FROM "user" WHERE jid=$1`, stripSuffix(userID))
|
||||
if row == nil {
|
||||
return nil
|
||||
}
|
||||
return uq.New().Scan(row)
|
||||
func (uq *UserQuery) GetByJID(userID types.GroupMeID) *User {
|
||||
// row := uq.db.QueryRow(`SELECT mxid, jid, management_room, last_connection, client_id, client_token, server_token, enc_key, mac_key FROM "user" WHERE jid=$1`, stripSuffix(userID))
|
||||
// if row == nil {
|
||||
// return nil
|
||||
// }
|
||||
// return uq.New().Scan(row)
|
||||
return nil
|
||||
}
|
||||
|
||||
type User struct {
|
||||
@ -76,9 +76,10 @@ type User struct {
|
||||
log log.Logger
|
||||
|
||||
MXID id.UserID
|
||||
JID types.WhatsAppID
|
||||
JID types.GroupMeID
|
||||
Token types.AuthToken
|
||||
|
||||
ManagementRoom id.RoomID
|
||||
Session *whatsapp.Session
|
||||
LastConnection uint64
|
||||
}
|
||||
|
||||
@ -94,21 +95,21 @@ func (user *User) Scan(row Scannable) *User {
|
||||
}
|
||||
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
|
||||
}
|
||||
// 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 stripSuffix(jid types.WhatsAppID) string {
|
||||
func stripSuffix(jid types.GroupMeID) string {
|
||||
if len(jid) == 0 {
|
||||
return jid
|
||||
}
|
||||
@ -130,41 +131,41 @@ func (user *User) jidPtr() *string {
|
||||
}
|
||||
|
||||
func (user *User) sessionUnptr() (sess whatsapp.Session) {
|
||||
if user.Session != nil {
|
||||
sess = *user.Session
|
||||
}
|
||||
return
|
||||
// if user.Session != nil {
|
||||
// sess = *user.Session
|
||||
// }
|
||||
return
|
||||
}
|
||||
|
||||
func (user *User) Insert() {
|
||||
sess := user.sessionUnptr()
|
||||
_, err := user.db.Exec(`INSERT INTO "user" (mxid, jid, management_room, last_connection, client_id, client_token, server_token, enc_key, mac_key) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
|
||||
user.MXID, user.jidPtr(),
|
||||
user.ManagementRoom, user.LastConnection,
|
||||
sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey)
|
||||
if err != nil {
|
||||
user.log.Warnfln("Failed to insert %s: %v", user.MXID, err)
|
||||
}
|
||||
// sess := user.sessionUnptr()
|
||||
// _, err := user.db.Exec(`INSERT INTO "user" (mxid, jid, management_room, last_connection, client_id, client_token, server_token, enc_key, mac_key) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9)`,
|
||||
// user.MXID, user.jidPtr(),
|
||||
// user.ManagementRoom, user.LastConnection,
|
||||
// sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey)
|
||||
// if err != nil {
|
||||
// user.log.Warnfln("Failed to insert %s: %v", user.MXID, err)
|
||||
// }
|
||||
}
|
||||
|
||||
func (user *User) UpdateLastConnection() {
|
||||
user.LastConnection = uint64(time.Now().Unix())
|
||||
_, err := user.db.Exec(`UPDATE "user" SET last_connection=$1 WHERE mxid=$2`,
|
||||
user.LastConnection, user.MXID)
|
||||
if err != nil {
|
||||
user.log.Warnfln("Failed to update last connection ts: %v", err)
|
||||
}
|
||||
// user.LastConnection = uint64(time.Now().Unix())
|
||||
// _, err := user.db.Exec(`UPDATE "user" SET last_connection=$1 WHERE mxid=$2`,
|
||||
// user.LastConnection, user.MXID)
|
||||
// if err != nil {
|
||||
// user.log.Warnfln("Failed to update last connection ts: %v", err)
|
||||
// }
|
||||
}
|
||||
|
||||
func (user *User) Update() {
|
||||
sess := user.sessionUnptr()
|
||||
_, err := user.db.Exec(`UPDATE "user" SET jid=$1, management_room=$2, last_connection=$3, client_id=$4, client_token=$5, server_token=$6, enc_key=$7, mac_key=$8 WHERE mxid=$9`,
|
||||
user.jidPtr(), user.ManagementRoom, user.LastConnection,
|
||||
sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey,
|
||||
user.MXID)
|
||||
if err != nil {
|
||||
user.log.Warnfln("Failed to update %s: %v", user.MXID, err)
|
||||
}
|
||||
// sess := user.sessionUnptr()
|
||||
// _, err := user.db.Exec(`UPDATE "user" SET jid=$1, management_room=$2, last_connection=$3, client_id=$4, client_token=$5, server_token=$6, enc_key=$7, mac_key=$8 WHERE mxid=$9`,
|
||||
// user.jidPtr(), user.ManagementRoom, user.LastConnection,
|
||||
// sess.ClientId, sess.ClientToken, sess.ServerToken, sess.EncKey, sess.MacKey,
|
||||
// user.MXID)
|
||||
// if err != nil {
|
||||
// user.log.Warnfln("Failed to update %s: %v", user.MXID, err)
|
||||
// }
|
||||
}
|
||||
|
||||
type PortalKeyWithMeta struct {
|
||||
@ -173,77 +174,81 @@ type PortalKeyWithMeta struct {
|
||||
}
|
||||
|
||||
func (user *User) SetPortalKeys(newKeys []PortalKeyWithMeta) error {
|
||||
tx, err := user.db.Begin()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.Exec("DELETE FROM user_portal WHERE user_jid=$1", user.jidPtr())
|
||||
if err != nil {
|
||||
_ = tx.Rollback()
|
||||
return err
|
||||
}
|
||||
valueStrings := make([]string, len(newKeys))
|
||||
values := make([]interface{}, len(newKeys)*4)
|
||||
for i, key := range newKeys {
|
||||
pos := i * 4
|
||||
valueStrings[i] = fmt.Sprintf("($%d, $%d, $%d, $%d)", pos+1, pos+2, pos+3, pos+4)
|
||||
values[pos] = user.jidPtr()
|
||||
values[pos+1] = key.JID
|
||||
values[pos+2] = key.Receiver
|
||||
values[pos+3] = key.InCommunity
|
||||
}
|
||||
query := fmt.Sprintf("INSERT INTO user_portal (user_jid, portal_jid, portal_receiver, in_community) VALUES %s",
|
||||
strings.Join(valueStrings, ", "))
|
||||
_, err = tx.Exec(query, values...)
|
||||
if err != nil {
|
||||
_ = tx.Rollback()
|
||||
return err
|
||||
}
|
||||
return tx.Commit()
|
||||
// tx, err := user.db.Begin()
|
||||
// if err != nil {
|
||||
// return err
|
||||
// }
|
||||
// _, err = tx.Exec("DELETE FROM user_portal WHERE user_jid=$1", user.jidPtr())
|
||||
// if err != nil {
|
||||
// _ = tx.Rollback()
|
||||
// return err
|
||||
// }
|
||||
// valueStrings := make([]string, len(newKeys))
|
||||
// values := make([]interface{}, len(newKeys)*4)
|
||||
// for i, key := range newKeys {
|
||||
// pos := i * 4
|
||||
// valueStrings[i] = fmt.Sprintf("($%d, $%d, $%d, $%d)", pos+1, pos+2, pos+3, pos+4)
|
||||
// values[pos] = user.jidPtr()
|
||||
// values[pos+1] = key.JID
|
||||
// values[pos+2] = key.Receiver
|
||||
// values[pos+3] = key.InCommunity
|
||||
// }
|
||||
// query := fmt.Sprintf("INSERT INTO user_portal (user_jid, portal_jid, portal_receiver, in_community) VALUES %s",
|
||||
// strings.Join(valueStrings, ", "))
|
||||
// _, err = tx.Exec(query, values...)
|
||||
// if err != nil {
|
||||
// _ = tx.Rollback()
|
||||
// return err
|
||||
// }
|
||||
// return tx.Commit()
|
||||
return nil
|
||||
}
|
||||
|
||||
func (user *User) IsInPortal(key PortalKey) bool {
|
||||
row := user.db.QueryRow(`SELECT EXISTS(SELECT 1 FROM user_portal WHERE user_jid=$1 AND portal_jid=$2 AND portal_receiver=$3)`, user.jidPtr(), &key.JID, &key.Receiver)
|
||||
var exists bool
|
||||
_ = row.Scan(&exists)
|
||||
return exists
|
||||
// row := user.db.QueryRow(`SELECT EXISTS(SELECT 1 FROM user_portal WHERE user_jid=$1 AND portal_jid=$2 AND portal_receiver=$3)`, user.jidPtr(), &key.JID, &key.Receiver)
|
||||
// var exists bool
|
||||
// _ = row.Scan(&exists)
|
||||
// return exists
|
||||
return false
|
||||
}
|
||||
|
||||
func (user *User) GetPortalKeys() []PortalKey {
|
||||
rows, err := user.db.Query(`SELECT portal_jid, portal_receiver FROM user_portal WHERE user_jid=$1`, user.jidPtr())
|
||||
if err != nil {
|
||||
user.log.Warnln("Failed to get user portal keys:", err)
|
||||
return nil
|
||||
}
|
||||
var keys []PortalKey
|
||||
for rows.Next() {
|
||||
var key PortalKey
|
||||
err = rows.Scan(&key.JID, &key.Receiver)
|
||||
if err != nil {
|
||||
user.log.Warnln("Failed to scan row:", err)
|
||||
continue
|
||||
}
|
||||
keys = append(keys, key)
|
||||
}
|
||||
return keys
|
||||
// rows, err := user.db.Query(`SELECT portal_jid, portal_receiver FROM user_portal WHERE user_jid=$1`, user.jidPtr())
|
||||
// if err != nil {
|
||||
// user.log.Warnln("Failed to get user portal keys:", err)
|
||||
// return nil
|
||||
// }
|
||||
// var keys []PortalKey
|
||||
// for rows.Next() {
|
||||
// var key PortalKey
|
||||
// err = rows.Scan(&key.JID, &key.Receiver)
|
||||
// if err != nil {
|
||||
// user.log.Warnln("Failed to scan row:", err)
|
||||
// continue
|
||||
// }
|
||||
// keys = append(keys, key)
|
||||
// }
|
||||
// return keys
|
||||
return nil
|
||||
}
|
||||
|
||||
func (user *User) GetInCommunityMap() map[PortalKey]bool {
|
||||
rows, err := user.db.Query(`SELECT portal_jid, portal_receiver, in_community FROM user_portal WHERE user_jid=$1`, user.jidPtr())
|
||||
if err != nil {
|
||||
user.log.Warnln("Failed to get user portal keys:", err)
|
||||
return nil
|
||||
}
|
||||
keys := make(map[PortalKey]bool)
|
||||
for rows.Next() {
|
||||
var key PortalKey
|
||||
var inCommunity bool
|
||||
err = rows.Scan(&key.JID, &key.Receiver, &inCommunity)
|
||||
if err != nil {
|
||||
user.log.Warnln("Failed to scan row:", err)
|
||||
continue
|
||||
}
|
||||
keys[key] = inCommunity
|
||||
}
|
||||
return keys
|
||||
// rows, err := user.db.Query(`SELECT portal_jid, portal_receiver, in_community FROM user_portal WHERE user_jid=$1`, user.jidPtr())
|
||||
// if err != nil {
|
||||
// user.log.Warnln("Failed to get user portal keys:", err)
|
||||
// return nil
|
||||
// }
|
||||
// keys := make(map[PortalKey]bool)
|
||||
// for rows.Next() {
|
||||
// var key PortalKey
|
||||
// var inCommunity bool
|
||||
// err = rows.Scan(&key.JID, &key.Receiver, &inCommunity)
|
||||
// if err != nil {
|
||||
// user.log.Warnln("Failed to scan row:", err)
|
||||
// continue
|
||||
// }
|
||||
// keys[key] = inCommunity
|
||||
// }
|
||||
// return keys
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user