From a6dc4e27b99c6b793401ec078341f493000fdaf7 Mon Sep 17 00:00:00 2001 From: William P Date: Thu, 12 Mar 2026 20:55:42 -0400 Subject: [PATCH 1/3] 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 } -- 2.49.1 From f303eb3eb845e838a1b00d0a9f34a09c21f82dd4 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 13 Mar 2026 16:01:04 +0000 Subject: [PATCH 2/3] chore(deps): update dependency yt-dlp/yt-dlp to v2026.03.13 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c1a7602..ae951bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ######################################## # Versions -ARG YT_DLP_VERSION="2026.03.03" +ARG YT_DLP_VERSION="2026.03.13" ################################################################################ # Deno builder stage -- 2.49.1 From b392048ca1a005ea1a05a1418bb861af459377ad Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 13 Mar 2026 23:01:09 +0000 Subject: [PATCH 3/3] chore(deps): update module github.com/lrstanley/go-ytdlp to v1.3.4 --- app/go.mod | 2 +- app/go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/go.mod b/app/go.mod index 8c9e24c..c6b3d59 100644 --- a/app/go.mod +++ b/app/go.mod @@ -4,7 +4,7 @@ go 1.25.2 require ( github.com/bwmarrin/discordgo v0.29.0 - github.com/lrstanley/go-ytdlp v1.3.3 + github.com/lrstanley/go-ytdlp v1.3.4 ) require ( diff --git a/app/go.sum b/app/go.sum index 65282fc..96035f3 100644 --- a/app/go.sum +++ b/app/go.sum @@ -16,6 +16,8 @@ github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0U github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/lrstanley/go-ytdlp v1.3.3 h1:Y9kJcdTwskPWDiwONMIl501Dhi+OrTF7HHY6J6+Lbco= github.com/lrstanley/go-ytdlp v1.3.3/go.mod h1:VgjnTrvkTf+23JuySjyPq1iQ8ijSovBtTPpXH5XrLtI= +github.com/lrstanley/go-ytdlp v1.3.4 h1:x3ppgdeN3FbguT5ifc6ISrgjYN10+dVUAbprA7/dYrk= +github.com/lrstanley/go-ytdlp v1.3.4/go.mod h1:VgjnTrvkTf+23JuySjyPq1iQ8ijSovBtTPpXH5XrLtI= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= -- 2.49.1