feat: add quote command, update yap leaderboard to use timezone

Author: polarhive

Makefile

@@ -1,4 +1,4 @@
-.PHONY: build run clean test deps help docker-build
+.PHONY: build run clean test deps help docker-build pull push
 
 # Detect OS and arch
 UNAME_S := $(shell uname -s)
@@ -49,13 +49,18 @@ docker-build: ## Build using Docker for cross-compilation to Ubuntu
 	docker build --platform linux/amd64 -t ash .
 	docker run --rm -v $(PWD):/host ash cp /usr/local/bin/ash /host/ash-linux-amd64
 
-# Pull configuration
+# Sync configuration
 RSYNC_OPTS ?= -avzhP --delete
-PULL_SRC ?= ark:ash/data/
+REMOTE_DATA ?= ark:ash/data/
 
-pull: ## Pull the remote 'data' directory into local ./data/ (overwrites). Set PULL_SRC to change source.
+pull: ## Pull remote db into local ./data/ (stops remote bot first)
+	ssh ark sudo systemctl stop ash.service
 	@mkdir -p data
-	rsync $(RSYNC_OPTS) $(PULL_SRC) ./data/
+	rsync $(RSYNC_OPTS) $(REMOTE_DATA) ./data/
+
+push: ## Push local ./data/ to remote (restarts remote bot after)
+	rsync $(RSYNC_OPTS) ./data/ $(REMOTE_DATA)
+	ssh ark sudo systemctl restart ash.service
 
 .DEFAULT_GOAL := run
 

bot.json

@@ -138,6 +138,12 @@
             "command": "knockknock",
             "input_type": "text",
             "output_type": "text"
+        },
+        "quote": {
+            "type": "builtin",
+            "command": "quote",
+            "input_type": "text",
+            "output_type": "text"
         }
     }
 }

bot/bot.go

@@ -12,6 +12,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/polarhive/ash/util"
+
 	"maunium.net/go/mautrix"
 	"maunium.net/go/mautrix/event"
 	"maunium.net/go/mautrix/id"
@@ -166,7 +168,17 @@ func (s *KnockKnockState) Delete(evID id.EventID) {
 // Yap leaderboard
 // ---------------------------------------------------------------------------
 
-// QueryTopYappers returns the top N message senders in the last 24h for the
+// YapTimezone is the timezone used to determine "start of day" for the yap
+// leaderboard. Defaults to UTC. Set via config.json "TIMEZONE" field.
+var YapTimezone = time.UTC
+
+// startOfToday returns midnight in the configured YapTimezone as Unix millis.
+func startOfToday() int64 {
+	now := time.Now().In(YapTimezone)
+	return time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, YapTimezone).UnixMilli()
+}
+
+// QueryTopYappers returns the top N message senders since midnight for the
 // current room, excluding messages that start with the bot label (e.g. [BOT]).
 func QueryTopYappers(ctx context.Context, db *sql.DB, matrixClient *mautrix.Client, ev *event.Event, args string, replyLabel string, mention bool) (string, error) {
 	if db == nil {
@@ -190,7 +202,7 @@ func QueryTopYappers(ctx context.Context, db *sql.DB, matrixClient *mautrix.Clie
 	}
 
 	roomID := string(ev.RoomID)
-	cutoff := time.Now().Add(-24 * time.Hour).UnixMilli()
+	cutoff := startOfToday()
 
 	rows, err := db.QueryContext(ctx, `
 		SELECT sender, SUM(LENGTH(body) - LENGTH(REPLACE(body, ' ', '')) + 1) as word_count
@@ -245,13 +257,13 @@ func QueryTopYappers(ctx context.Context, db *sql.DB, matrixClient *mautrix.Clie
 	}
 
 	if len(entries) == 0 {
-		return "no messages found in the last 24h", nil
+		return "no messages found today", nil
 	}
 
 	// Build plain text and HTML versions.
 	var plain, html strings.Builder
-	plain.WriteString(replyLabel + "top yappers (last 24h):\n")
-	html.WriteString(replyLabel + "top yappers (last 24h):<br>")
+	plain.WriteString(replyLabel + "top yappers (today):\n")
+	html.WriteString(replyLabel + "top yappers (today):<br>")
 	for i, e := range entries {
 		plain.WriteString(fmt.Sprintf("%d. %s \u2014 %d words\n", i+1, e.display, e.count))
 		if mention {
@@ -281,7 +293,7 @@ func QueryTopYappers(ctx context.Context, db *sql.DB, matrixClient *mautrix.Clie
 }
 
 // queryYapGuess handles "/bot yap guess N". It looks up the caller's actual
-// position on the 24h word-count leaderboard and reports the difference.
+// position on today's (since midnight UTC) word-count leaderboard and reports the difference.
 func queryYapGuess(ctx context.Context, db *sql.DB, matrixClient *mautrix.Client, ev *event.Event, guessArg string, replyLabel string) (string, error) {
 	guess := 1
 	if guessArg != "" {
@@ -292,7 +304,7 @@ func queryYapGuess(ctx context.Context, db *sql.DB, matrixClient *mautrix.Client
 
 	roomID := string(ev.RoomID)
 	senderID := string(ev.Sender)
-	cutoff := time.Now().Add(-24 * time.Hour).UnixMilli()
+	cutoff := startOfToday()
 
 	rows, err := db.QueryContext(ctx, `
 		SELECT sender, SUM(LENGTH(body) - LENGTH(REPLACE(body, ' ', '')) + 1) as word_count
@@ -327,7 +339,7 @@ func queryYapGuess(ctx context.Context, db *sql.DB, matrixClient *mautrix.Client
 	}
 
 	if actualPos == 0 {
-		return replyLabel + "you have no messages in the last 24h!", nil
+		return "you have no messages today!", nil
 	}
 
 	diff := guess - actualPos
@@ -360,6 +372,82 @@ func queryYapGuess(ctx context.Context, db *sql.DB, matrixClient *mautrix.Client
 	return msg, nil
 }
 
+// ---------------------------------------------------------------------------
+// Random quote
+// ---------------------------------------------------------------------------
+
+// QueryRandomQuote picks a random message from the room's history (excluding
+// bot messages and commands) and formats it as a quote.
+func QueryRandomQuote(ctx context.Context, db *sql.DB, matrixClient *mautrix.Client, ev *event.Event, args string, replyLabel string, mention bool) (string, error) {
+	if db == nil {
+		return "", fmt.Errorf("no database available")
+	}
+
+	roomID := string(ev.RoomID)
+
+	// Parse duration argument (default 24h)
+	durSec, err := util.ParseDurationArg(args)
+	if err != nil {
+		durSec = 24 * 3600 // fallback to 24h
+	}
+	cutoff := time.Now().Unix() - durSec
+
+	row := db.QueryRowContext(ctx, `
+		SELECT sender, body, ts_ms
+		FROM messages
+		WHERE room_id = ?
+		  AND body NOT LIKE '[BOT]%'
+		  AND body NOT LIKE '/bot %'
+		  AND msgtype = 'm.text'
+		  AND LENGTH(body) > 5
+		  AND ts_ms >= ? * 1000
+		ORDER BY RANDOM()
+		LIMIT 1
+	`, roomID, cutoff)
+
+	var sender, body string
+	var tsMs int64
+	if err := row.Scan(&sender, &body, &tsMs); err != nil {
+		return "no messages found to quote", nil
+	}
+
+	// Resolve display name.
+	display := sender
+	if matrixClient != nil {
+		if resp, err := matrixClient.JoinedMembers(ctx, ev.RoomID); err == nil {
+			if member, ok := resp.Joined[id.UserID(sender)]; ok && member.DisplayName != "" {
+				display = member.DisplayName
+			}
+		}
+	}
+	if display == sender && strings.HasPrefix(sender, "@") {
+		if idx := strings.Index(sender, ":"); idx > 0 {
+			display = sender[1:idx]
+		}
+	}
+
+	ts := time.UnixMilli(tsMs).In(YapTimezone)
+	date := ts.Format("02 Jan 2006")
+
+	plain := fmt.Sprintf("%s> %s\n> \u2014 %s, %s", replyLabel, body, display, date)
+	html := fmt.Sprintf("%s<blockquote>%s<br>\u2014 <i>%s, %s</i></blockquote>", replyLabel, body, display, date)
+
+	if matrixClient != nil {
+		content := event.MessageEventContent{
+			MsgType:       event.MsgText,
+			Body:          plain,
+			Format:        event.FormatHTML,
+			FormattedBody: html,
+			RelatesTo:     &event.RelatesTo{InReplyTo: &event.InReplyTo{EventID: ev.ID}},
+		}
+		if _, err := matrixClient.SendMessageEvent(ctx, ev.RoomID, event.EventMessage, &content); err != nil {
+			return "", fmt.Errorf("send quote reply: %w", err)
+		}
+		return "", nil
+	}
+	return plain, nil
+}
+
 // ---------------------------------------------------------------------------
 // UwUify
 // ---------------------------------------------------------------------------

bot/bot_test.go

@@ -131,7 +131,7 @@ func TestQueryTopYappers(t *testing.T) {
 	_, _ = db.Exec(`INSERT INTO messages(id, room_id, sender, ts_ms, body, msgtype) VALUES (?, ?, ?, ?, ?, ?)`,
 		"bot-2", room, "@bot:example.com", now, "/bot help", "m.text")
 
-	// Old message — should be excluded (>24h ago).
+	// Old message — should be excluded (before today UTC).
 	_, _ = db.Exec(`INSERT INTO messages(id, room_id, sender, ts_ms, body, msgtype) VALUES (?, ?, ?, ?, ?, ?)`,
 		"old-1", room, "@old:example.com", now-100000000, "ancient msg", "m.text")
 
@@ -270,3 +270,83 @@ func TestQueryYapGuess(t *testing.T) {
 		t.Errorf("expected no messages for unknown sender, got: %s", result)
 	}
 }
+
+func TestQueryRandomQuote(t *testing.T) {
+	db, err := sql.Open("sqlite3", ":memory:")
+	if err != nil {
+		t.Fatalf("open db: %v", err)
+	}
+	defer db.Close()
+
+	_, err = db.Exec(`CREATE TABLE IF NOT EXISTS messages (
+		id TEXT PRIMARY KEY,
+		room_id TEXT,
+		sender TEXT,
+		ts_ms INTEGER,
+		body TEXT,
+		msgtype TEXT,
+		raw_json TEXT
+	)`)
+	if err != nil {
+		t.Fatalf("create table: %v", err)
+	}
+
+	room := "!testroom:example.com"
+	ev := &event.Event{RoomID: id.RoomID(room)}
+	ctx := context.Background()
+
+	// Empty room — should return "no messages found".
+	result, err := QueryRandomQuote(ctx, db, nil, ev, "", "", false)
+	if err != nil {
+		t.Fatalf("QueryRandomQuote empty: %v", err)
+	}
+	if !strings.Contains(result, "no messages") {
+		t.Errorf("expected 'no messages' for empty room, got: %s", result)
+	}
+
+	// Insert messages: one recent, one old.
+	now := time.Now().UnixMilli()
+	_, _ = db.Exec(`INSERT INTO messages(id, room_id, sender, ts_ms, body, msgtype) VALUES (?, ?, ?, ?, ?, ?)`,
+		"msg-1", room, "@alice:example.com", now, "the quick brown fox jumps", "m.text")
+	_, _ = db.Exec(`INSERT INTO messages(id, room_id, sender, ts_ms, body, msgtype) VALUES (?, ?, ?, ?, ?, ?)`,
+		"msg-2", room, "@bob:example.com", now-3*86400000, "hello world from 3 days ago", "m.text")
+
+	// Should return only recent message for 1d.
+	result, err = QueryRandomQuote(ctx, db, nil, ev, "1d", "", false)
+	if err != nil {
+		t.Fatalf("QueryRandomQuote 1d: %v", err)
+	}
+	if !strings.Contains(result, "fox jumps") {
+		t.Errorf("expected recent quote, got: %s", result)
+	}
+	if strings.Contains(result, "3 days ago") {
+		t.Errorf("should not quote old message, got: %s", result)
+	}
+
+	// Should return either for 1w.
+	result, err = QueryRandomQuote(ctx, db, nil, ev, "1w", "", false)
+	if err != nil {
+		t.Fatalf("QueryRandomQuote 1w: %v", err)
+	}
+	if !strings.Contains(result, "fox jumps") && !strings.Contains(result, "3 days ago") {
+		t.Errorf("expected any quote, got: %s", result)
+	}
+
+	// Bot messages should be excluded.
+	_, _ = db.Exec(`INSERT INTO messages(id, room_id, sender, ts_ms, body, msgtype) VALUES (?, ?, ?, ?, ?, ?)`,
+		"bot-1", room, "@bot:example.com", now, "[BOT] I am a bot message", "m.text")
+
+	result, err = QueryRandomQuote(ctx, db, nil, ev, "1d", "", false)
+	if err != nil {
+		t.Fatalf("QueryRandomQuote bot: %v", err)
+	}
+	if strings.Contains(result, "[BOT]") {
+		t.Errorf("bot messages should be excluded, got: %s", result)
+	}
+	if !strings.Contains(result, "> ") || !strings.Contains(result, "\u2014") {
+		t.Errorf("expected blockquote format, got: %s", result)
+	}
+	if !strings.Contains(result, "alice") && !strings.Contains(result, "bob") {
+		t.Errorf("expected alice or bob in quote, got: %s", result)
+	}
+}

bot/commands.go

@@ -331,7 +331,8 @@ var builtinFuncs = map[string]func(string) string{
 
 // builtinDBFuncs maps builtin command names that need DB access.
 var builtinDBFuncs = map[string]func(context.Context, *sql.DB, *mautrix.Client, *event.Event, string, string, bool) (string, error){
-	"yap": QueryTopYappers,
+	"yap":   QueryTopYappers,
+	"quote": QueryRandomQuote,
 }
 
 // ---------------------------------------------------------------------------

cmd/ash/main.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"sync"
 	"syscall"
+	"time"
 
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
@@ -93,6 +94,16 @@ func run(ctx context.Context, metaDB *sql.DB, messagesDB *sql.DB, cfg *config.Co
 		log.Info().Str("path", botCfgPath).Msg("loaded bot config")
 	}
 
+	// Set yap leaderboard timezone from config (defaults to UTC).
+	if cfg.Timezone != "" {
+		if tz, err := time.LoadLocation(cfg.Timezone); err != nil {
+			log.Warn().Err(err).Str("tz", cfg.Timezone).Msg("invalid TIMEZONE in config, using UTC")
+		} else {
+			bot.YapTimezone = tz
+			log.Info().Str("tz", cfg.Timezone).Msg("yap leaderboard timezone set")
+		}
+	}
+
 	readyChan := make(chan bool)
 	var once sync.Once
 	syncer.OnSync(func(_ context.Context, _ *mautrix.RespSync, _ string) bool {

config.json.example

@@ -24,5 +24,6 @@
     "BOT_CONFIG_PATH": "./bot.json",
     "DEBUG": true,
     "DRY_RUN": false,
-    "OPT_OUT_TAG": "#private"
+    "OPT_OUT_TAG": "#private",
+    "TIMEZONE": "Asia/Kolkata"
 }

config/config.go

@@ -36,6 +36,7 @@ type Config struct {
 	DryRun        bool          `json:"DRY_RUN"`
 	DeviceName    string        `json:"MATRIX_DEVICE_NAME"`
 	OptOutTag     string        `json:"OPT_OUT_TAG"`
+	Timezone      string        `json:"TIMEZONE,omitempty"`
 }
 
 // LoadConfig reads and parses the config.json file.

util/util.go

@@ -96,3 +96,38 @@ func FormatPosts(posts []interface{}, linkstashURL string) string {
 	sb.WriteString(fmt.Sprintf("\nSee full list: %s", linkstashURL))
 	return sb.String()
 }
+
+// ParseDurationArg parses duration strings like '1d', '2d', '1w', '1m', '24h' into seconds.
+func ParseDurationArg(arg string) (int64, error) {
+	arg = strings.TrimSpace(arg)
+	if arg == "" {
+		return 24 * 3600, nil // default 24h
+	}
+	var n int64
+	var unit string
+	if _, err := fmt.Sscanf(arg, "%dd", &n); err == nil {
+		return n * 86400, nil
+	}
+	if _, err := fmt.Sscanf(arg, "%dw", &n); err == nil {
+		return n * 7 * 86400, nil
+	}
+	if _, err := fmt.Sscanf(arg, "%dm", &n); err == nil {
+		return n * 30 * 86400, nil
+	}
+	if _, err := fmt.Sscanf(arg, "%dh", &n); err == nil {
+		return n * 3600, nil
+	}
+	if _, err := fmt.Sscanf(arg, "%d%s", &n, &unit); err == nil {
+		switch unit {
+		case "d":
+			return n * 86400, nil
+		case "w":
+			return n * 7 * 86400, nil
+		case "m":
+			return n * 30 * 86400, nil
+		case "h":
+			return n * 3600, nil
+		}
+	}
+	return 0, fmt.Errorf("invalid duration: %s", arg)
+}