From 204bb5fdcb45438b7fa943272b7500fe4220ab81 Mon Sep 17 00:00:00 2001
From: biast12 <53872542+biast12@users.noreply.github.com>
Date: Sat, 29 Aug 2026 15:15:20 +0200
Subject: [PATCH] Fix: Awaiting Response Category

Awaiting Response Category has been fully broken since #140
---
 bot/listeners/messagequeue/categoryupdate.go | 14 +++++++++-----
 cmd/worker/main.go                           |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/bot/listeners/messagequeue/categoryupdate.go b/bot/listeners/messagequeue/categoryupdate.go
index e50146d5..84176fa6 100644
--- a/bot/listeners/messagequeue/categoryupdate.go
+++ b/bot/listeners/messagequeue/categoryupdate.go
@@ -12,9 +12,13 @@ import (
 )
 
 const (
-	categoryUpdateTopic    = "tickets.rpc.categoryupdate"
-	categoryUpdateDelay    = 30 * time.Second
-	categoryUpdateInterval = 10 * time.Second
+	CategoryUpdateStream = "stream:rpc:categoryupdate"
+
+	categoryUpdateDelay    = 10 * time.Minute
+	categoryUpdateInterval = time.Minute
+
+	// Separate from the interval: the queue read is destructive, so expiring mid-publish drops rows.
+	categoryUpdateTimeout = 5 * time.Minute
 )
 
 func StartCategoryUpdatePublisher(client *rpc.Client, logger *zap.Logger) {
@@ -28,7 +32,7 @@ func StartCategoryUpdatePublisher(client *rpc.Client, logger *zap.Logger) {
 }
 
 func publishReadyCategoryUpdates(client *rpc.Client, logger *zap.Logger) {
-	ctx, cancel := context.WithTimeout(context.Background(), categoryUpdateInterval)
+	ctx, cancel := context.WithTimeout(context.Background(), categoryUpdateTimeout)
 	defer cancel()
 
 	items, err := dbclient.Client.CategoryUpdateQueue.GetReadyForUpdate(ctx, categoryUpdateDelay)
@@ -53,7 +57,7 @@ func publishReadyCategoryUpdates(client *rpc.Client, logger *zap.Logger) {
 			continue
 		}
 
-		if err := client.ProduceSyncJson(ctx, categoryUpdateTopic, rpcmodel.TicketStatusUpdate{
+		if err := client.ProduceSyncJson(ctx, CategoryUpdateStream, rpcmodel.TicketStatusUpdate{
 			Ticket: rpcmodel.Ticket{
 				GuildId: item.GuildId,
 				Id:      item.TicketId,
diff --git a/cmd/worker/main.go b/cmd/worker/main.go
index 7313a425..398b9453 100644
--- a/cmd/worker/main.go
+++ b/cmd/worker/main.go
@@ -255,7 +255,7 @@ func main() {
 					logger.With(zap.String("service", "gateway-events")),
 					&pgCache,
 				),
-				"stream:rpc:categoryupdate": listeners.NewTicketStatusUpdater(&pgCache, logger),
+				messagequeue.CategoryUpdateStream: listeners.NewTicketStatusUpdater(&pgCache, logger),
 			})
 
 		if err != nil {