release v1.0.3 #54

Merged
williamp merged 6 commits from dev into master 2026-03-14 12:52:41 +00:00
2 changed files with 27 additions and 2 deletions
Showing only changes of commit a6dc4e27b9 - Show all commits

View File

@@ -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)

View File

@@ -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
}