fix item tracking & better cleanup

Author: robherley

Dockerfile

@@ -11,7 +11,8 @@ RUN go mod verify
 
 COPY . .
 
-RUN go build
+ARG VERSION
+RUN go build -ldflags "-X github.com/robherley/gw-bot/internal/meta.Version=${VERSION}"
 
 FROM alpine
 

database/queries/items.sql

@@ -3,9 +3,12 @@ INSERT INTO items (id, subscription_id, goodwill_id, created_at, started_at, end
 VALUES (?, ?, ?, CURRENT_TIMESTAMP, ?, ?)
 RETURNING *;
 
--- name: FindItemInSubscription :one
-SELECT * FROM items
-WHERE subscription_id = ? AND goodwill_id = ?;
+-- name: IsItemTracked :one
+SELECT EXISTS (
+  SELECT 1
+  FROM items
+  WHERE subscription_id = ? AND goodwill_id = ?
+) AS is_tracked;
 
 -- name: FindItemsEndingSoon :many
 SELECT * FROM items
@@ -22,3 +25,7 @@ DELETE FROM items
 WHERE ends_at < datetime('now', '-1 day')
 LIMIT 1000
 RETURNING COUNT(*);
+
+-- name: DeleteItemsInSubscriptions :exec
+DELETE FROM items
+WHERE subscription_id IN (sqlc.slice('ids'));

internal/bot/bot.go

@@ -233,11 +233,8 @@ func (b *Bot) NotifyEndingSoonItems(sub sqlgen.Subscription, items []sqlgen.Item
 }
 
 func (b *Bot) ItemToEmbed(item gw.Item) *discordgo.MessageEmbed {
-	return &discordgo.MessageEmbed{
+	embed := &discordgo.MessageEmbed{
 		Title: item.Title,
-		Image: &discordgo.MessageEmbedImage{
-			URL: item.ImageURL,
-		},
 		Fields: []*discordgo.MessageEmbedField{
 			{
 				Name:   "Current Price",
@@ -267,6 +264,20 @@ func (b *Bot) ItemToEmbed(item gw.Item) *discordgo.MessageEmbed {
 		},
 		URL: item.URL(),
 	}
+
+	if item.ImageURL != "" {
+		embed.Image = &discordgo.MessageEmbedImage{
+			URL: item.ImageURL,
+		}
+	}
+
+	slog.Info("embedding item",
+		"item_id", item.ItemID,
+		"url", item.URL(),
+		"image_url", item.ImageURL,
+	)
+
+	return embed
 }
 
 func Chunk[T any](slice []T, chunkSize int) [][]T {

internal/bot/cmd/ping.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"os"
 
 	"github.com/bwmarrin/discordgo"
+	"github.com/robherley/gw-bot/internal/meta"
 )
 
 func NewPing() Handler {
@@ -35,17 +35,12 @@ func (cmd *ping) Handle(ctx context.Context, s *discordgo.Session, i *discordgo.
 		user = i.Member.User.String()
 	}
 
-	version := "unknown"
-	if v, ok := os.LookupEnv("VERSION"); ok {
-		version = v
-	}
-
 	payload := map[string]interface{}{
 		"user":       user,
 		"guild_id":   i.GuildID,
 		"dm":         i.GuildID == "",
 		"channel_id": i.ChannelID,
-		"version":    version,
+		"version":    meta.Version,
 	}
 
 	bytes, err := json.MarshalIndent(payload, "", "  ")

internal/bot/cmd/unsubscribe.go

@@ -89,6 +89,10 @@ func (cmd *Unsubscribe) Handle(ctx context.Context, s *discordgo.Session, i *dis
 			return err
 		}
 
+		if err := cmd.db.DeleteItemsInSubscriptions(ctx, subIDs); err != nil {
+			return err
+		}
+
 		if err := cmd.db.DeleteUserSubscriptions(ctx, sqlgen.DeleteUserSubscriptionsParams{
 			UserID: userID,
 			Ids:    subIDs,

internal/db/sqlgen/items.sql.go

@@ -51,28 +51,44 @@ func (l *Looper) NotifyNewItems(ctx context.Context) {
 
 				log := log.With("subscription_id", sub.ID, "user_id", sub.UserID)
 
-				items, err := l.gw.Search(ctx, sub.Term, opts...)
+				foundItems, err := l.gw.Search(ctx, sub.Term, opts...)
 				if err != nil {
 					log.Error("failed to search for items", "error", err)
 					continue
 				}
 
-				if len(items) == 0 {
+				newItems := make([]gw.Item, 0, len(foundItems))
+				for _, item := range foundItems {
+					tracked, err := l.db.IsItemTracked(ctx, sqlgen.IsItemTrackedParams{
+						SubscriptionID: sub.ID,
+						GoodwillID:     item.ItemID,
+					})
+					if err != nil {
+						log.Error("failed to check if item is tracked", "error", err)
+						continue
+					}
+
+					if tracked != 1 {
+						newItems = append(newItems, item)
+					}
+				}
+
+				if len(newItems) == 0 {
 					log.Info("no new items found")
 					continue
 				}
 
-				log.Info("new items found", "count", len(items))
+				log.Info("new items found", "count", len(newItems))
 
-				for _, item := range items {
+				for _, item := range newItems {
 					_, err := l.db.CreateItem(ctx, item.NewCreateItemParams(sub))
 					if err != nil {
 						log.Error("failed to create item", "error", err)
 						continue
 					}
 				}
 
-				if err := l.bot.NotifyNewItems(sub, items); err != nil {
+				if err := l.bot.NotifyNewItems(sub, newItems); err != nil {
 					log.Error("failed to notify new items", "error", err)
 				}
 

internal/db/sqlgen/querier.go

@@ -0,0 +1,3 @@
+package meta
+
+var Version = "unknown"