account data only; integrate smtp server; logging

This commit is contained in:
Aine
2022-08-21 23:00:20 +03:00
parent c4b7a16e21
commit c746c91dbb
9 changed files with 157 additions and 99 deletions

View File

@@ -9,14 +9,7 @@ import (
const settingskey = "cc.etke.postmoogle.settings"
var migrations = []string{
`
CREATE TABLE IF NOT EXISTS settings (
room_id VARCHAR(255),
mailbox VARCHAR(255)
)
`,
}
var migrations = []string{}
// settings of a room
type settings struct {
@@ -57,21 +50,7 @@ func (b *Bot) getSettings(ctx context.Context, roomID id.RoomID) (*settings, err
defer span.Finish()
var config settings
query := "SELECT * FROM settings WHERE room_id = "
switch b.lp.GetStore().GetDialect() {
case "postgres":
query += "$1"
case "sqlite3":
query += "?"
}
row := b.lp.GetDB().QueryRow(query, roomID)
err := row.Scan(&config.Mailbox)
if err == nil {
return &config, nil
}
b.log.Error("cannot find settings in database: %v", err)
err = b.lp.GetClient().GetRoomAccountData(roomID, settingskey, &config)
err := b.lp.GetClient().GetRoomAccountData(roomID, settingskey, &config)
return &config, err
}
@@ -79,47 +58,5 @@ func (b *Bot) getSettings(ctx context.Context, roomID id.RoomID) (*settings, err
func (b *Bot) setSettings(ctx context.Context, roomID id.RoomID, cfg *settings) error {
span := sentry.StartSpan(ctx, "http.server", sentry.TransactionName("setSettings"))
defer span.Finish()
tx, err := b.lp.GetDB().Begin()
if err == nil {
var insert string
switch b.lp.GetStore().GetDialect() {
case "postgres":
insert = "INSERT INTO settings VALUES ($1) ON CONFLICT (room_id) DO UPDATE SET mailbox = $1"
case "sqlite3":
insert = "INSERT INTO settings VALUES (?) ON CONFLICT (room_id) DO UPDATE SET mailbox = ?"
}
_, err = tx.Exec(insert, cfg.Mailbox)
if err != nil {
b.log.Error("cannot insert settigs: %v", err)
// nolint // no need to check error here
tx.Rollback()
}
if err != nil {
err = tx.Commit()
if err != nil {
b.log.Error("cannot commit transaction: %v", err)
}
}
}
return b.lp.GetClient().SetRoomAccountData(roomID, settingskey, cfg)
}
// FindRoomID by mailbox
func (b *Bot) FindRoomID(mailbox string) (id.RoomID, error) {
query := "SELECT room_id FROM settings WHERE mailbox = "
switch b.lp.GetStore().GetDialect() {
case "postgres":
query += "$1"
case "sqlite3":
query += "?"
}
var roomID string
row := b.lp.GetDB().QueryRow(query, mailbox)
err := row.Scan(&roomID)
return id.RoomID(roomID), err
}