From a6dc4e27b99c6b793401ec078341f493000fdaf7 Mon Sep 17 00:00:00 2001
From: William P <me@williamtpeebles.com>
Date: Thu, 12 Mar 2026 20:55:42 -0400
Subject: [PATCH] fix: resolve timeout issues and implement format retrieval
 retries

---
 app/main.go  | 25 ++++++++++++++++++++++++-
 app/ytdlp.go |  4 +++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/main.go b/app/main.go
index 4e315db..4129080 100644
--- a/app/main.go
+++ b/app/main.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/signal"
 	"sort"
+	"strings"
 	"syscall"
 
 	"github.com/bwmarrin/discordgo"
@@ -365,8 +366,20 @@ func main() {
 				h(s, i)
 			}
 		case discordgo.InteractionMessageComponent:
-			if h, ok := componentHandlers[i.MessageComponentData().CustomID]; ok {
+			customID := i.MessageComponentData().CustomID
+			if h, ok := componentHandlers[customID]; ok {
 				h(s, i)
+			} else if strings.HasPrefix(customID, "retry:") {
+				url := strings.TrimPrefix(customID, "retry:")
+				s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
+					Type: discordgo.InteractionResponseUpdateMessage,
+					Data: &discordgo.InteractionResponseData{
+						Content:    fmt.Sprintf("%s Fetching available formats...", loading_emoji),
+						Components: []discordgo.MessageComponent{},
+						Flags:      discordgo.MessageFlagsEphemeral,
+					},
+				})
+				go fetchAndShowFormats(s, i, url)
 			}
 		}
 	})
@@ -444,6 +457,16 @@ func fetchAndShowFormats(s *discordgo.Session, i *discordgo.InteractionCreate, u
 	if err != nil {
 		_, err = s.InteractionResponseEdit(i.Interaction, &discordgo.WebhookEdit{
 			Content: ptr("❌ Error fetching formats: " + err.Error()),
+			Components: &[]discordgo.MessageComponent{
+				&discordgo.ActionsRow{
+					Components: []discordgo.MessageComponent{
+						discordgo.Button{
+							Label: "Retry",
+							CustomID: fmt.Sprintf("retry:%s", url),
+						},
+					},
+				},
+			},
 		})
 		if err != nil {
 			log.Printf("Error updating interaction: %v", err)
diff --git a/app/ytdlp.go b/app/ytdlp.go
index 761d9a3..f259255 100644
--- a/app/ytdlp.go
+++ b/app/ytdlp.go
@@ -19,7 +19,9 @@ func GetFormats(url string) (*FormatOptions, error) {
 		SkipDownload().
 		DumpJSON()
 
-	result, err := dl.Run(context.TODO(), url)
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
+	defer cancel()
+	result, err := dl.Run(ctx, url)
 	if err != nil {
 		return nil, err
 	}