Merge pull request #2 from robherley/robherley/adjust-notify-time

add option to adjust notify time before auction ends

Author: robherley

database/migrations/20250320030724_add_notify_minutes.sql

@@ -0,0 +1,11 @@
+-- +goose Up
+-- +goose StatementBegin
+ALTER TABLE subscriptions
+ADD COLUMN notify_minutes INTEGER NOT NULL DEFAULT 10;
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+ALTER TABLE subscriptions
+DROP COLUMN notify_minutes;
+-- +goose StatementEnd

database/queries/items.sql

@@ -11,8 +11,9 @@ SELECT EXISTS (
 ) AS is_tracked;
 
 -- name: FindItemsEndingSoon :many
-SELECT * FROM items
-WHERE ends_at < datetime('now', '+10 minutes') AND sent_final = FALSE
+SELECT i.* FROM items i
+JOIN subscriptions s ON i.subscription_id = s.id
+WHERE i.ends_at < datetime('now', '+' || s.notify_minutes || ' minutes') AND i.sent_final = FALSE
 LIMIT 100;
 
 -- name: SetItemSentFinal :exec

database/queries/subscriptions.sql

@@ -1,6 +1,6 @@
 -- name: CreateSubscription :one
-INSERT INTO subscriptions (id, user_id, term, last_notified_at, min_price, max_price)
-VALUES (?, ?, ?, 0, ?, ?)
+INSERT INTO subscriptions (id, user_id, term, last_notified_at, min_price, max_price, notify_minutes)
+VALUES (?, ?, ?, 0, ?, ?, ?)
 RETURNING *;
 
 -- name: FindSubscription :one

internal/bot/cmd/subscribe.go

@@ -33,6 +33,7 @@ func (cmd *Subscribe) Description() string {
 func (cmd *Subscribe) Options() []*discordgo.ApplicationCommandOption {
 	termMinLength := 1
 	termMaxLength := 100
+	notifyMinValue := float64(1)
 	return []*discordgo.ApplicationCommandOption{
 		{
 			Type:        discordgo.ApplicationCommandOptionString,
@@ -54,6 +55,13 @@ func (cmd *Subscribe) Options() []*discordgo.ApplicationCommandOption {
 			Description: "Maximum price to alert on",
 			Required:    false,
 		},
+		{
+			Type:        discordgo.ApplicationCommandOptionInteger,
+			Name:        "notify",
+			Description: "How many minutes before the auction ends to send a notification",
+			Required:    false,
+			MinValue:    &notifyMinValue,
+		},
 		// TODO: category
 	}
 }
@@ -69,9 +77,10 @@ func (cmd *Subscribe) Handle(ctx context.Context, s *discordgo.Session, i *disco
 		data := i.ApplicationCommandData()
 
 		var (
-			term     string
-			minPrice *int64
-			maxPrice *int64
+			term          string
+			minPrice      *int64
+			maxPrice      *int64
+			notifyMinutes int64 = 10
 		)
 
 		for _, option := range data.Options {
@@ -84,6 +93,8 @@ func (cmd *Subscribe) Handle(ctx context.Context, s *discordgo.Session, i *disco
 			case "max":
 				max := option.IntValue()
 				maxPrice = &max
+			case "notify":
+				notifyMinutes = option.IntValue()
 			}
 		}
 
@@ -113,11 +124,12 @@ func (cmd *Subscribe) Handle(ctx context.Context, s *discordgo.Session, i *disco
 		}
 
 		sub, err := cmd.db.CreateSubscription(ctx, sqlgen.CreateSubscriptionParams{
-			ID:       db.NewID(),
-			UserID:   userID,
-			Term:     term,
-			MinPrice: minPrice,
-			MaxPrice: maxPrice,
+			ID:            db.NewID(),
+			UserID:        userID,
+			Term:          term,
+			MinPrice:      minPrice,
+			MaxPrice:      maxPrice,
+			NotifyMinutes: notifyMinutes,
 		})
 
 		if err != nil {

internal/bot/cmd/subscriptions.go

@@ -52,7 +52,7 @@ func (cmd *Subscriptions) Handle(ctx context.Context, s *discordgo.Session, i *d
 			builder.WriteString(sub.Term)
 
 			if sub.MinPrice != nil || sub.MaxPrice != nil {
-				builder.WriteString("$")
+				builder.WriteString(" $")
 				if sub.MinPrice != nil {
 					builder.WriteString(strconv.FormatInt(*sub.MinPrice, 10))
 				} else {
@@ -67,6 +67,10 @@ func (cmd *Subscriptions) Handle(ctx context.Context, s *discordgo.Session, i *d
 				builder.WriteString(" ")
 			}
 
+			builder.WriteString(" ⏲️ ")
+			builder.WriteString(strconv.FormatInt(sub.NotifyMinutes, 10))
+			builder.WriteString("m")
+
 			builder.WriteString("\n")
 		}
 	}