From af6ccd597024aa867a5742a5c6771c9a11c18c9f Mon Sep 17 00:00:00 2001 From: bt Date: Tue, 26 May 2026 12:13:46 +0200 Subject: [daemon] Fix users history --- storage/storage.go | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'storage') diff --git a/storage/storage.go b/storage/storage.go index 1292945..a32c4a0 100644 --- a/storage/storage.go +++ b/storage/storage.go @@ -42,16 +42,34 @@ func (db *Database) AddMessage(msg core.Message) (err error) { return err } -func (db *Database) GetHistory(channel string, since time.Time, num int, offset int) (history []core.Message, err error) { +func (db *Database) GetHistory(target string, since time.Time, num, offset int) (history []core.Message, err error) { rows, err := db.Query( - `SELECT source, target, timestamp, content FROM messages WHERE target = ? AND timestamp > ? LIMIT ? OFFSET ?`, - channel, since.Unix(), num, offset, + `SELECT source, target, timestamp, content FROM messages + WHERE target = ? AND timestamp > ? LIMIT ? OFFSET ?`, + target, since.Unix(), num, offset, ) + + return db.getHistory(rows, err) +} + +func (db *Database) GetHistoryUser(user1, user2 string, since time.Time, num int, offset int) (history []core.Message, err error) { + rows, err := db.Query( + `SELECT source, target, timestamp, content FROM messages + WHERE (source = ? OR source = ? ) AND (target = ? OR target = ?) AND timestamp > ? LIMIT ? OFFSET ?`, + user1, user2, user1, user2, since.Unix(), num, offset, + ) + + return db.getHistory(rows, err) +} + +func (db *Database) getHistory(rows *sql.Rows, err error) ([]core.Message, error) { + var history []core.Message + defer func() { if rows == nil { return } - if err := rows.Close(); err != nil { + if err = rows.Close(); err != nil { log.Println("cannot close database row:", err) } }() @@ -63,7 +81,7 @@ func (db *Database) GetHistory(channel string, since time.Time, num int, offset for rows.Next() { var msg core.Message var timestamp int64 - if err := rows.Scan(&msg.Source, &msg.Target, ×tamp, &msg.Content); err != nil { + if err = rows.Scan(&msg.Source, &msg.Target, ×tamp, &msg.Content); err != nil { return history, err } msg.Timestamp = time.Unix(timestamp, 0) -- cgit v1.2.3