Fix deployment issues and add threads, numbered watchlist, search URL encoding
- Fix SQLite connection string (drop query param, use explicit PRAGMA) - Register sqlite3-fk-wal driver for mautrix cryptohelper (pure Go, no CGO) - Fetch DeviceID via /whoami when using bare access token - Log cross-signing results at Warn/Info instead of Debug - Post deals into Matrix threads: Game Deals, DLC Deals, Epic Free Games - Add numbered watchlist; !extend and !unwatch accept list numbers - URL-encode search queries for multi-word !search commands - Add GetConfig/SetConfig helpers for persistent thread event IDs Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
prosolis
@@ -3,10 +3,21 @@ package watchlist
|
||||
import (
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"math"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"maunium.net/go/mautrix/id"
|
||||
|
||||
"github.com/prosolis/Pastel/internal/currency"
|
||||
"github.com/prosolis/Pastel/internal/deals"
|
||||
)
|
||||
|
||||
const (
|
||||
searchRateLimit = 5 // max searches per window
|
||||
searchRateWindow = 10 * time.Minute // sliding window
|
||||
)
|
||||
|
||||
// DMSender is the interface for sending DMs to users.
|
||||
@@ -18,11 +29,46 @@ type DMSender interface {
|
||||
type CommandHandler struct {
|
||||
store *Store
|
||||
sender DMSender
|
||||
conv *currency.Converter
|
||||
|
||||
rateMu sync.Mutex
|
||||
rateLimit map[id.UserID][]time.Time // search timestamps per user
|
||||
}
|
||||
|
||||
// NewCommandHandler creates a new command handler.
|
||||
func NewCommandHandler(store *Store, sender DMSender) *CommandHandler {
|
||||
return &CommandHandler{store: store, sender: sender}
|
||||
func NewCommandHandler(store *Store, sender DMSender, conv *currency.Converter) *CommandHandler {
|
||||
return &CommandHandler{
|
||||
store: store,
|
||||
sender: sender,
|
||||
conv: conv,
|
||||
rateLimit: make(map[id.UserID][]time.Time),
|
||||
}
|
||||
}
|
||||
|
||||
// checkSearchRate returns true if the user is within the rate limit.
|
||||
func (h *CommandHandler) checkSearchRate(userID id.UserID) bool {
|
||||
h.rateMu.Lock()
|
||||
defer h.rateMu.Unlock()
|
||||
|
||||
now := time.Now()
|
||||
cutoff := now.Add(-searchRateWindow)
|
||||
|
||||
// Prune old entries
|
||||
recent := h.rateLimit[userID]
|
||||
filtered := recent[:0]
|
||||
for _, t := range recent {
|
||||
if t.After(cutoff) {
|
||||
filtered = append(filtered, t)
|
||||
}
|
||||
}
|
||||
|
||||
if len(filtered) >= searchRateLimit {
|
||||
h.rateLimit[userID] = filtered
|
||||
return false
|
||||
}
|
||||
|
||||
h.rateLimit[userID] = append(filtered, now)
|
||||
return true
|
||||
}
|
||||
|
||||
// HandleMessage parses and dispatches a DM command.
|
||||
@@ -49,6 +95,8 @@ func (h *CommandHandler) HandleMessage(senderID, body string) {
|
||||
h.handleUnwatch(uid, args)
|
||||
case "!extend":
|
||||
h.handleExtend(uid, args)
|
||||
case "!search":
|
||||
h.handleSearch(uid, args)
|
||||
case "!watchlist":
|
||||
h.handleList(uid)
|
||||
case "!help":
|
||||
@@ -79,9 +127,15 @@ func (h *CommandHandler) handleWatch(userID id.UserID, gameName string) {
|
||||
gameName, expires.Format("January 2, 2006")))
|
||||
}
|
||||
|
||||
func (h *CommandHandler) handleUnwatch(userID id.UserID, gameName string) {
|
||||
if gameName == "" {
|
||||
h.reply(userID, "Usage: !unwatch <game name>")
|
||||
func (h *CommandHandler) handleUnwatch(userID id.UserID, args string) {
|
||||
if args == "" {
|
||||
h.reply(userID, "Usage: !unwatch <# or game name>")
|
||||
return
|
||||
}
|
||||
|
||||
gameName, err := h.resolveGameArg(userID, args)
|
||||
if err != nil {
|
||||
h.reply(userID, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
@@ -100,9 +154,15 @@ func (h *CommandHandler) handleUnwatch(userID id.UserID, gameName string) {
|
||||
h.reply(userID, fmt.Sprintf("Removed \"%s\" from your watchlist.", gameName))
|
||||
}
|
||||
|
||||
func (h *CommandHandler) handleExtend(userID id.UserID, gameName string) {
|
||||
if gameName == "" {
|
||||
h.reply(userID, "Usage: !extend <game name>")
|
||||
func (h *CommandHandler) handleExtend(userID id.UserID, args string) {
|
||||
if args == "" {
|
||||
h.reply(userID, "Usage: !extend <# or game name>")
|
||||
return
|
||||
}
|
||||
|
||||
gameName, err := h.resolveGameArg(userID, args)
|
||||
if err != nil {
|
||||
h.reply(userID, err.Error())
|
||||
return
|
||||
}
|
||||
|
||||
@@ -138,24 +198,84 @@ func (h *CommandHandler) handleList(userID id.UserID) {
|
||||
|
||||
var sb strings.Builder
|
||||
sb.WriteString(fmt.Sprintf("Your watchlist (%d):\n", len(entries)))
|
||||
for _, e := range entries {
|
||||
sb.WriteString(fmt.Sprintf(" - %s (expires %s)\n", e.GameName, e.ExpiresAt.Format("January 2, 2006")))
|
||||
for i, e := range entries {
|
||||
sb.WriteString(fmt.Sprintf(" %d. %s (expires %s)\n", i+1, e.GameName, e.ExpiresAt.Format("January 2, 2006")))
|
||||
}
|
||||
sb.WriteString("\nUse !extend <#> or !unwatch <#> with the number above.")
|
||||
|
||||
h.reply(userID, sb.String())
|
||||
}
|
||||
|
||||
func (h *CommandHandler) handleSearch(userID id.UserID, query string) {
|
||||
if query == "" {
|
||||
h.reply(userID, "Usage: !search <game name>")
|
||||
return
|
||||
}
|
||||
|
||||
if !h.checkSearchRate(userID) {
|
||||
h.reply(userID, fmt.Sprintf("Rate limited — max %d searches per %d minutes. Try again shortly.",
|
||||
searchRateLimit, int(searchRateWindow.Minutes())))
|
||||
return
|
||||
}
|
||||
|
||||
h.conv.EnsureRates()
|
||||
|
||||
results, err := deals.SearchCheapSharkDeals(query, 5)
|
||||
if err != nil {
|
||||
slog.Error("search: cheapshark failed", "query", query, "error", err)
|
||||
h.reply(userID, "Search failed. Please try again later.")
|
||||
return
|
||||
}
|
||||
|
||||
if len(results) == 0 {
|
||||
h.reply(userID, fmt.Sprintf("No current deals found for \"%s\".", query))
|
||||
return
|
||||
}
|
||||
|
||||
var sb strings.Builder
|
||||
sb.WriteString(fmt.Sprintf("Deals matching \"%s\":\n\n", query))
|
||||
for _, d := range results {
|
||||
discount := int(math.Floor(d.Savings))
|
||||
price := h.conv.FormatPrice(d.SalePrice)
|
||||
sb.WriteString(fmt.Sprintf(" %s\n", d.Title))
|
||||
sb.WriteString(fmt.Sprintf(" %d%% off on %s — %s\n", discount, d.StoreName, price))
|
||||
sb.WriteString(fmt.Sprintf(" %s\n\n", d.DealURL))
|
||||
}
|
||||
sb.WriteString("\nCommands: !watch, !unwatch, !extend, !watchlist")
|
||||
|
||||
h.reply(userID, sb.String())
|
||||
}
|
||||
|
||||
func (h *CommandHandler) handleHelp(userID id.UserID) {
|
||||
h.reply(userID, "Watchlist commands:\n"+
|
||||
h.reply(userID, "Commands:\n"+
|
||||
" !search <game name> — Search for current deals\n"+
|
||||
" !watch <game name> — Watch for deals on a game\n"+
|
||||
" !unwatch <game name> — Remove a game from your watchlist\n"+
|
||||
" !extend <game name> — Reset the 180-day expiry timer\n"+
|
||||
" !watchlist — Show your current watches\n"+
|
||||
" !unwatch <# or game name> — Remove a game from your watchlist\n"+
|
||||
" !extend <# or game name> — Reset the 180-day expiry timer\n"+
|
||||
" !watchlist — Show your numbered watchlist\n"+
|
||||
" !help — Show this message\n\n"+
|
||||
"Watches expire after 180 days. You'll get a reminder 7 days before.")
|
||||
}
|
||||
|
||||
// resolveGameArg resolves an argument that is either a list number (from !watchlist)
|
||||
// or a game name. Returns the game name.
|
||||
func (h *CommandHandler) resolveGameArg(userID id.UserID, arg string) (string, error) {
|
||||
num, err := strconv.Atoi(strings.TrimSpace(arg))
|
||||
if err != nil {
|
||||
return arg, nil // not a number, treat as game name
|
||||
}
|
||||
|
||||
entries, err := h.store.ListWatches(string(userID))
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("Something went wrong. Please try again.")
|
||||
}
|
||||
|
||||
if num < 1 || num > len(entries) {
|
||||
return "", fmt.Errorf("Invalid number. Use !watchlist to see your list (1-%d).", len(entries))
|
||||
}
|
||||
|
||||
return entries[num-1].GameName, nil
|
||||
}
|
||||
|
||||
func (h *CommandHandler) reply(userID id.UserID, text string) {
|
||||
if err := h.sender.SendDM(userID, text); err != nil {
|
||||
slog.Error("watchlist: failed to send DM", "user", userID, "error", err)
|
||||
|
||||
Reference in New Issue
Block a user