Merge pull request 'release v1.0.3' (#54) from dev into master
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 5m19s
Build and Push Docker Image / deploy-on-green (push) Successful in 7s

Reviewed-on: #54
This commit was merged in pull request #54.
This commit is contained in:
2026-03-14 12:52:41 +00:00
5 changed files with 31 additions and 4 deletions

View File

@@ -3,7 +3,7 @@
######################################## ########################################
# Versions # Versions
ARG YT_DLP_VERSION="2026.03.03" ARG YT_DLP_VERSION="2026.03.13"
################################################################################ ################################################################################
# Deno builder stage # Deno builder stage

View File

@@ -4,7 +4,7 @@ go 1.25.2
require ( require (
github.com/bwmarrin/discordgo v0.29.0 github.com/bwmarrin/discordgo v0.29.0
github.com/lrstanley/go-ytdlp v1.3.3 github.com/lrstanley/go-ytdlp v1.3.4
) )
require ( require (

View File

@@ -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/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 h1:Y9kJcdTwskPWDiwONMIl501Dhi+OrTF7HHY6J6+Lbco=
github.com/lrstanley/go-ytdlp v1.3.3/go.mod h1:VgjnTrvkTf+23JuySjyPq1iQ8ijSovBtTPpXH5XrLtI= 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 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=

View File

@@ -6,6 +6,7 @@ import (
"os" "os"
"os/signal" "os/signal"
"sort" "sort"
"strings"
"syscall" "syscall"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
@@ -365,8 +366,20 @@ func main() {
h(s, i) h(s, i)
} }
case discordgo.InteractionMessageComponent: case discordgo.InteractionMessageComponent:
if h, ok := componentHandlers[i.MessageComponentData().CustomID]; ok { customID := i.MessageComponentData().CustomID
if h, ok := componentHandlers[customID]; ok {
h(s, i) 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 { if err != nil {
_, err = s.InteractionResponseEdit(i.Interaction, &discordgo.WebhookEdit{ _, err = s.InteractionResponseEdit(i.Interaction, &discordgo.WebhookEdit{
Content: ptr("❌ Error fetching formats: " + err.Error()), 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 { if err != nil {
log.Printf("Error updating interaction: %v", err) log.Printf("Error updating interaction: %v", err)

View File

@@ -19,7 +19,9 @@ func GetFormats(url string) (*FormatOptions, error) {
SkipDownload(). SkipDownload().
DumpJSON() 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 { if err != nil {
return nil, err return nil, err
} }