Merge pull request 'release v1.0.4' (#60) from dev into master

Reviewed-on: #60

Dockerfile

@@ -3,7 +3,7 @@
 
 ########################################
 # Versions
-ARG YT_DLP_VERSION="2026.03.03"
+ARG YT_DLP_VERSION="2026.03.17"
 
 ################################################################################
 # Deno builder stage
@@ -38,7 +38,7 @@ RUN case "$TARGETARCH" in \
 
 ################################################################################
 # FFmpeg builder stage
-FROM debian:13-slim@sha256:1d3c811171a08a5adaa4a163fbafd96b61b87aa871bbc7aa15431ac275d3d430 AS ffmpeg-builder
+FROM debian:13-slim@sha256:26f98ccd92fd0a44d6928ce8ff8f4921b4d2f535bfa07555ee5d18f61429cf0c AS ffmpeg-builder
 RUN apt-get update && \
   apt-get install -y --no-install-recommends ffmpeg
 COPY --from=yt-dlp-builder /rootfs/bin/yt-dlp /yt-dlp
@@ -54,7 +54,7 @@ RUN mkdir -p /rootfs/bin && \
 
 ################################################################################
 # App builder stage
-FROM golang:1.26.1-trixie@sha256:ab8c4944b04c6f97c2b5bffce471b7f3d55f2228badc55eae6cce87596d5710b AS app-builder
+FROM golang:1.26.1-trixie@sha256:96b28783b99bcd265fbfe0b36a3ac6462416ce6bf1feac85d4c4ff533cbaa473 AS app-builder
 
 COPY app/ /opt/app
 WORKDIR /opt/app

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.5
 )
 
 require (

app/go.sum

@@ -16,6 +16,10 @@ 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/lrstanley/go-ytdlp v1.3.5 h1:eT+29mK3Lp+XPMQOH25+jVerrrjifYW1o3IkTYJ9SMs=
+github.com/lrstanley/go-ytdlp v1.3.5/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=

app/main.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"os/signal"
 	"sort"
+	"strings"
 	"syscall"
 
 	"github.com/bwmarrin/discordgo"
@@ -365,12 +366,28 @@ 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)
 			}
 		}
 	})
 
+	log.Println("Initialize loading emoji")
+	initLoadingEmoji(s)
+	
+
 	log.Println("Adding commands")
 	registeredCommands := make([]*discordgo.ApplicationCommand, len(commands))
 	for i, v := range commands {
@@ -440,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)

app/misc.go

@@ -2,11 +2,45 @@ package main
 
 import (
 	"fmt"
-	"os"
+	"log"
 	"regexp"
+	_ "embed"
+	"encoding/base64"
+
+	"github.com/bwmarrin/discordgo"
 )
 
-var loading_emoji = os.Getenv("LOADING_EMOJI")
+var loading_emoji string
+
+//go:embed assets/loading.webp
+var rawLoadingEmoji []byte
+
+var loadingEmojiBase64 = func() string {
+	s := "data:image/webp;base64," + base64.StdEncoding.EncodeToString(rawLoadingEmoji)
+	rawLoadingEmoji = nil
+	return s
+}()
+
+func initLoadingEmoji(s *discordgo.Session) {
+	emojis, err := s.ApplicationEmojis(s.State.User.ID)
+	if err != nil {
+		log.Panic("Cannot get emojis")
+	}
+	for _, e := range emojis {
+		if e.Name == "loading" {
+			loading_emoji = fmt.Sprintf("<a:%s:%s>", e.Name, e.ID)
+			return
+		}
+	}
+	e, err := s.ApplicationEmojiCreate(s.State.User.ID, &discordgo.EmojiParams{
+		Name:  "loading",
+		Image: loadingEmojiBase64,
+	})
+	if err != nil {
+		log.Panicf("Cannot create loading emoji: %s", err)
+	}
+	loading_emoji = fmt.Sprintf("<a:%s:%s>", e.Name, e.ID)
+}
 
 var urlPattern = regexp.MustCompile(`https?://\S+`)
 

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
 	}