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

Reviewed-on: #60

.gitea/workflows/build-and-push.yaml

@@ -26,7 +26,7 @@ jobs:
         uses: docker/setup-buildx-action@v4
         with:
           driver: remote
-          endpoint: 'tcp://buildkitd:1234'
+          endpoint: 'tcp://buildkitd.gitea-runner.svc.cluster.local:1234'
 
       # Log in to the Gitea container registry
       - name: Log in to Gitea Container Registry

.gitea/workflows/build-only.yaml

@@ -21,14 +21,14 @@ jobs:
 
       # Set up Docker Buildx for building the image
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+        uses: docker/setup-buildx-action@v4
         with:
           driver: remote
-          endpoint: 'tcp://buildkitd:1234'
+          endpoint: 'tcp://buildkitd.gitea-runner.svc.cluster.local:1234'
 
       # Build the Docker image
       - name: Build Docker Image
-        uses: docker/build-push-action@v6
+        uses: docker/build-push-action@v7
         with:
           context: .                    # Build context (current directory)
           file: ./Dockerfile            # Path to Dockerfile

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.25.8-trixie@sha256:bc16125656839ffe56154c675f7a9662bec2ef7d4060177239914e7c6d2fd8a8 AS app-builder
+FROM golang:1.26.1-trixie@sha256:96b28783b99bcd265fbfe0b36a3ac6462416ce6bf1feac85d4c4ff533cbaa473 AS app-builder
 
 COPY app/ /opt/app
 WORKDIR /opt/app

app/go.mod

@@ -2,20 +2,16 @@ module git.dubyatp.xyz/williamp/yt-dlp-bot
 
 go 1.25.2
 
-//replace github.com/lrstanley/go-ytdlp => /home/williamp/go-ytdlp
-
-replace github.com/lrstanley/go-ytdlp => github.com/dubyatp/go-ytdlp v0.0.0-20260213041320-010f95f0f1d3
-
 require (
 	github.com/bwmarrin/discordgo v0.29.0
-	github.com/lrstanley/go-ytdlp v1.2.7
+	github.com/lrstanley/go-ytdlp v1.3.5
 )
 
 require (
 	github.com/ProtonMail/go-crypto v1.3.0 // indirect
-	github.com/cloudflare/circl v1.6.1 // indirect
+	github.com/cloudflare/circl v1.6.3 // indirect
 	github.com/gorilla/websocket v1.4.2 // indirect
-	github.com/ulikunitz/xz v0.5.13 // indirect
-	golang.org/x/crypto v0.41.0 // indirect
-	golang.org/x/sys v0.35.0 // indirect
+	github.com/ulikunitz/xz v0.5.15 // indirect
+	golang.org/x/crypto v0.48.0 // indirect
+	golang.org/x/sys v0.41.0 // indirect
 )

app/go.sum

@@ -4,25 +4,41 @@ github.com/bwmarrin/discordgo v0.29.0 h1:FmWeXFaKUwrcL3Cx65c20bTRW+vOb6k8AnaP+Eg
 github.com/bwmarrin/discordgo v0.29.0/go.mod h1:NJZpH+1AfhIcyQsPeuBKsUtYrRnjkyu0kIVMCHkZtRY=
 github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0=
 github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
+github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8=
+github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dubyatp/go-ytdlp v0.0.0-20260213041320-010f95f0f1d3 h1:tGzvzV6fSzybhIpwU+wjvjOSq8RBNtHENm+G03E+mgo=
 github.com/dubyatp/go-ytdlp v0.0.0-20260213041320-010f95f0f1d3/go.mod h1:38IL64XM6gULrWtKTiR0+TTNCVbxesNSbTyaFG2CGTI=
+github.com/dubyatp/go-ytdlp v0.0.0-20260308044557-db32b29c1590 h1:27d1UwjlfuF/kwHj98B6UP30D1d7mvk/bmnDQ0xKX1s=
+github.com/dubyatp/go-ytdlp v0.0.0-20260308044557-db32b29c1590/go.mod h1:VgjnTrvkTf+23JuySjyPq1iQ8ijSovBtTPpXH5XrLtI=
 github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
 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=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/ulikunitz/xz v0.5.13 h1:ar98gWrjf4H1ev05fYP/o29PDZw9DrI3niHtnEqyuXA=
 github.com/ulikunitz/xz v0.5.13/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.15 h1:9DNdB5s+SgV3bQ2ApL10xRc35ck0DuIX/isZvIk+ubY=
+github.com/ulikunitz/xz v0.5.15/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
 golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
 golang.org/x/crypto v0.41.0 h1:WKYxWedPGCTVVl5+WHSSrOBT0O8lx32+zxmHxijgXp4=
 golang.org/x/crypto v0.41.0/go.mod h1:pO5AFd7FA68rFak7rOAGVuygIISepHftHnr8dr6+sUc=
+golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
+golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
 golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
+golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

app/main.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"os/signal"
 	"sort"
+	"strings"
 	"syscall"
-	"time"
 
 	"github.com/bwmarrin/discordgo"
 )
@@ -53,6 +53,24 @@ func main() {
 				},
 			},
 		},
+		{
+			Name:                     "version",
+			Description:              "Show application version",
+			DefaultMemberPermissions: &defaultMemberPermissions,
+			Contexts:                 &[]discordgo.InteractionContextType{interactionPrivateChannel},
+		},
+		{
+			Name: "download video",
+			Type: discordgo.MessageApplicationCommand,
+			IntegrationTypes: &[]discordgo.ApplicationIntegrationType{
+				discordgo.ApplicationIntegrationUserInstall,
+			},
+
+			Contexts: &[]discordgo.InteractionContextType{
+				discordgo.InteractionContextBotDM,
+				discordgo.InteractionContextPrivateChannel,
+			},
+		},
 	}
 
 	var componentHandlers = map[string]func(s *discordgo.Session, i *discordgo.InteractionCreate){
@@ -124,54 +142,10 @@ func main() {
 			setInteractionState(i.Interaction.Token, state)
 
 			// Build audio format options
-			audioMenuOptions := []discordgo.SelectMenuOption{}
-			for _, aOpt := range state.FormatOptions.AudioOptions {
-				label := aOpt.Format
-				if aOpt.Language != nil {
-					label += fmt.Sprintf(" [%s]", *aOpt.Language)
-				}
-				if aOpt.TBR != nil {
-					label += fmt.Sprintf(" (%.0fkbps)", *aOpt.TBR)
-				}
-
-				// Discord has a 100 char limit on labels
-				if len(label) > 100 {
-					label = label[:97] + "..."
-				}
-
-				audioMenuOptions = append(audioMenuOptions, discordgo.SelectMenuOption{
-					Label: label,
-					Value: aOpt.FormatID,
-				})
-
-				// Discord has a limit of 25 options per select menu
-				if len(audioMenuOptions) >= 25 {
-					break
-				}
-			}
+			audioMenuOptions := buildAudioMenuOptions(state.FormatOptions.AudioOptions)
 
 			// Build video format options (to keep them visible but disabled)
-			videoMenuOptions := []discordgo.SelectMenuOption{}
-			for _, vOpt := range state.FormatOptions.VideoOptions {
-				label := fmt.Sprintf("%s (%s", vOpt.Resolution, vOpt.Ext)
-				if vOpt.TBR != nil {
-					label += fmt.Sprintf(", %.0fkbps", *vOpt.TBR)
-				}
-				label += ")"
-
-				if len(label) > 100 {
-					label = label[:97] + "..."
-				}
-
-				videoMenuOptions = append(videoMenuOptions, discordgo.SelectMenuOption{
-					Label: label,
-					Value: vOpt.FormatID,
-				})
-
-				if len(videoMenuOptions) >= 25 {
-					break
-				}
-			}
+			videoMenuOptions := buildVideoMenuOptions(state.FormatOptions.VideoOptions)
 
 			// Update components - disable video select, enable audio select
 			updatedComponents := []discordgo.MessageComponent{
@@ -274,14 +248,7 @@ func main() {
 				// Respond immediately to prevent timeout
 				response = fmt.Sprintf("%s **Starting download**", loading_emoji)
 
-				// Start async download after responding
-				go func() {
-					// Small delay to ensure response is sent first
-					time.Sleep(100 * time.Millisecond)
-					startAsyncDownload(s, i, state.Requester, state.URL, state.VideoFormatID, state.VideoFormatName, state.AudioFormatID, state.AudioFormatName, out_dir, temp_dir)
-				}()
-
-				// Clean up state after starting download
+				// Clean up state before responding
 				deleteInteractionState(i.Interaction.Token)
 			} else {
 				response = "I don't see a video here :("
@@ -296,6 +263,9 @@ func main() {
 			if err != nil {
 				log.Printf("Error: %v", err)
 			}
+			if state.URL != "" {
+				go startAsyncDownload(s, i, state.Requester, state.URL, state.VideoFormatID, state.VideoFormatName, state.AudioFormatID, state.AudioFormatName, out_dir, temp_dir)
+			}
 		},
 	}
 
@@ -335,11 +305,168 @@ func main() {
 			}
 
 			// Fetch formats asynchronously
-			go func() {
+			go fetchAndShowFormats(s, i, url)
+		},
+		"download video": func(s *discordgo.Session, i *discordgo.InteractionCreate) {
+			data := i.ApplicationCommandData()
+			targetMsg, ok := data.Resolved.Messages[data.TargetID]
+			if !ok || targetMsg == nil {
+				s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
+					Type: discordgo.InteractionResponseChannelMessageWithSource,
+					Data: &discordgo.InteractionResponseData{
+						Content: "Error: Could not find the target message",
+						Flags:   discordgo.MessageFlagsEphemeral,
+					},
+				})
+				return
+			}
+			url := extractURLFromString(targetMsg.Content)
+			if url == "" {
+				s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
+					Type: discordgo.InteractionResponseChannelMessageWithSource,
+					Data: &discordgo.InteractionResponseData{
+						Content: "Error: No URL provided",
+						Flags:   discordgo.MessageFlagsEphemeral,
+					},
+				})
+				return
+			}
+
+			// Send initial "fetching formats" response
+			err := s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
+				Type: discordgo.InteractionResponseChannelMessageWithSource,
+				Data: &discordgo.InteractionResponseData{
+					Content: fmt.Sprintf("%s Fetching available formats...", loading_emoji),
+					Flags:   discordgo.MessageFlagsEphemeral,
+				},
+			})
+			if err != nil {
+				log.Printf("Error: %v", err)
+				return
+			}
+
+			// Fetch formats asynchronously
+			go fetchAndShowFormats(s, i, url)
+		},
+		"version": func(s *discordgo.Session, i *discordgo.InteractionCreate) {
+			s.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
+				Type: discordgo.InteractionResponseChannelMessageWithSource,
+				Data: &discordgo.InteractionResponseData{
+					Content: "[yt-dlp-bot](https://git.dubyatp.xyz/williamp/yt-dlp-bot) by dubyatp",
+					Flags:   discordgo.MessageFlagsEphemeral,
+				},
+			})
+		},
+	}
+
+	s.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) {
+		switch i.Type {
+		case discordgo.InteractionApplicationCommand:
+			if h, ok := commandHandlers[i.ApplicationCommandData().Name]; ok {
+				h(s, i)
+			}
+		case discordgo.InteractionMessageComponent:
+			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 {
+		cmd, err := s.ApplicationCommandCreate(s.State.User.ID, "", v)
+		if err != nil {
+			log.Panicf("Cannot create '%v' command: %v", v.Name, err)
+		}
+		registeredCommands[i] = cmd
+	}
+
+	log.Println("Bot is now running. Press CTRL+C to exit")
+	sc := make(chan os.Signal, 1)
+	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
+	<-sc
+
+	s.Close()
+}
+
+func buildVideoMenuOptions(videoOptions []VideoOption) []discordgo.SelectMenuOption {
+	opts := make([]discordgo.SelectMenuOption, 0, 25)
+	for _, vOpt := range videoOptions {
+		label := fmt.Sprintf("%s (%s", vOpt.Resolution, vOpt.Ext)
+		if vOpt.TBR != nil {
+			label += fmt.Sprintf(", %.0fkbps", *vOpt.TBR)
+		}
+		label += ")"
+		if len(label) > 100 {
+			label = label[:97] + "..."
+		}
+		opts = append(opts, discordgo.SelectMenuOption{
+			Label: label,
+			Value: vOpt.FormatID,
+		})
+		if len(opts) >= 25 {
+			break
+		}
+	}
+	return opts
+}
+
+func buildAudioMenuOptions(audioOptions []AudioOption) []discordgo.SelectMenuOption {
+	opts := make([]discordgo.SelectMenuOption, 0, 25)
+	for _, aOpt := range audioOptions {
+		label := aOpt.Format
+		if aOpt.Language != nil {
+			label += fmt.Sprintf(" [%s]", *aOpt.Language)
+		}
+		if aOpt.TBR != nil {
+			label += fmt.Sprintf(" (%.0fkbps)", *aOpt.TBR)
+		}
+		if len(label) > 100 {
+			label = label[:97] + "..."
+		}
+		opts = append(opts, discordgo.SelectMenuOption{
+			Label: label,
+			Value: aOpt.FormatID,
+		})
+		if len(opts) >= 25 {
+			break
+		}
+	}
+	return opts
+}
+
+func fetchAndShowFormats(s *discordgo.Session, i *discordgo.InteractionCreate, url string) {
 	formatOptions, err := GetFormats(url)
 	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)
@@ -348,107 +475,57 @@ func main() {
 	}
 
 	// Sort video formats: highest resolution first, then by bitrate
-				sort.Slice(formatOptions.VideoOptions, func(i, j int) bool {
-					// Compare by height (descending)
-					heightI := 0
-					if formatOptions.VideoOptions[i].Height != nil {
-						heightI = *formatOptions.VideoOptions[i].Height
+	sort.Slice(formatOptions.VideoOptions, func(x, y int) bool {
+		heightX, heightY := 0, 0
+		if formatOptions.VideoOptions[x].Height != nil {
+			heightX = *formatOptions.VideoOptions[x].Height
 		}
-					heightJ := 0
-					if formatOptions.VideoOptions[j].Height != nil {
-						heightJ = *formatOptions.VideoOptions[j].Height
+		if formatOptions.VideoOptions[y].Height != nil {
+			heightY = *formatOptions.VideoOptions[y].Height
 		}
-
-					if heightI != heightJ {
-						return heightI > heightJ
+		if heightX != heightY {
+			return heightX > heightY
 		}
-
-					// If heights are equal, compare by TBR (descending)
-					tbrI := 0.0
-					if formatOptions.VideoOptions[i].TBR != nil {
-						tbrI = *formatOptions.VideoOptions[i].TBR
+		tbrX, tbrY := 0.0, 0.0
+		if formatOptions.VideoOptions[x].TBR != nil {
+			tbrX = *formatOptions.VideoOptions[x].TBR
 		}
-					tbrJ := 0.0
-					if formatOptions.VideoOptions[j].TBR != nil {
-						tbrJ = *formatOptions.VideoOptions[j].TBR
+		if formatOptions.VideoOptions[y].TBR != nil {
+			tbrY = *formatOptions.VideoOptions[y].TBR
 		}
-
-					return tbrI > tbrJ
+		return tbrX > tbrY
 	})
 
 	// Sort audio formats: highest bitrate first
-				sort.Slice(formatOptions.AudioOptions, func(i, j int) bool {
-					tbrI := 0.0
-					if formatOptions.AudioOptions[i].TBR != nil {
-						tbrI = *formatOptions.AudioOptions[i].TBR
+	sort.Slice(formatOptions.AudioOptions, func(x, y int) bool {
+		tbrX, tbrY := 0.0, 0.0
+		if formatOptions.AudioOptions[x].TBR != nil {
+			tbrX = *formatOptions.AudioOptions[x].TBR
 		}
-					tbrJ := 0.0
-					if formatOptions.AudioOptions[j].TBR != nil {
-						tbrJ = *formatOptions.AudioOptions[j].TBR
+		if formatOptions.AudioOptions[y].TBR != nil {
+			tbrY = *formatOptions.AudioOptions[y].TBR
 		}
-
-					return tbrI > tbrJ
+		return tbrX > tbrY
 	})
 
-				// Build video format options for Discord select menu
-				videoMenuOptions := []discordgo.SelectMenuOption{}
-				for _, vOpt := range formatOptions.VideoOptions {
-					label := fmt.Sprintf("%s (%s", vOpt.Resolution, vOpt.Ext)
-					if vOpt.TBR != nil {
-						label += fmt.Sprintf(", %.0fkbps", *vOpt.TBR)
-					}
-					label += ")"
+	videoMenuOptions := buildVideoMenuOptions(formatOptions.VideoOptions)
+	audioMenuOptions := buildAudioMenuOptions(formatOptions.AudioOptions)
 
-					// Discord has a 100 char limit on labels
-					if len(label) > 100 {
-						label = label[:97] + "..."
-					}
-
-					videoMenuOptions = append(videoMenuOptions, discordgo.SelectMenuOption{
-						Label: label,
-						Value: vOpt.FormatID,
+	if len(videoMenuOptions) == 0 || len(audioMenuOptions) == 0 {
+		_, err = s.InteractionResponseEdit(i.Interaction, &discordgo.WebhookEdit{
+			Content: ptr("❌ No separate video/audio streams found for this URL. The source may only provide combined formats."),
 		})
-
-					// Discord has a limit of 25 options per select menu
-					if len(videoMenuOptions) >= 25 {
-						break
+		if err != nil {
+			log.Printf("Error updating interaction: %v", err)
 		}
+		return
 	}
 
-				// Build audio format options for Discord select menu
-				audioMenuOptions := []discordgo.SelectMenuOption{}
-				for _, aOpt := range formatOptions.AudioOptions {
-					label := aOpt.Format
-					if aOpt.Language != nil {
-						label += fmt.Sprintf(" [%s]", *aOpt.Language)
-					}
-					if aOpt.TBR != nil {
-						label += fmt.Sprintf(" (%.0fkbps)", *aOpt.TBR)
-					}
-
-					// Discord has a 100 char limit on labels
-					if len(label) > 100 {
-						label = label[:97] + "..."
-					}
-
-					audioMenuOptions = append(audioMenuOptions, discordgo.SelectMenuOption{
-						Label: label,
-						Value: aOpt.FormatID,
-					})
-
-					// Discord has a limit of 25 options per select menu
-					if len(audioMenuOptions) >= 25 {
-						break
-					}
-				}
-
-				// Store format options in interaction state
 	setInteractionState(i.Interaction.Token, &InteractionState{
 		URL:           url,
 		FormatOptions: formatOptions,
 	})
 
-				// Update message with format selection menus
 	_, err = s.InteractionResponseEdit(i.Interaction, &discordgo.WebhookEdit{
 		Content: ptr("Select a video format:"),
 		Components: &[]discordgo.MessageComponent{
@@ -478,43 +555,4 @@ func main() {
 	if err != nil {
 		log.Printf("Error updating interaction: %v", err)
 	}
-			}()
-		},
-	}
-
-	s.AddHandler(func(s *discordgo.Session, i *discordgo.InteractionCreate) {
-		switch i.Type {
-		case discordgo.InteractionApplicationCommand:
-			if h, ok := commandHandlers[i.ApplicationCommandData().Name]; ok {
-				h(s, i)
-			}
-			if h, ok := componentHandlers[i.ApplicationCommandData().Name]; ok {
-				h(s, i)
-			}
-		case discordgo.InteractionMessageComponent:
-			if h, ok := commandHandlers[i.MessageComponentData().CustomID]; ok {
-				h(s, i)
-			}
-			if h, ok := componentHandlers[i.MessageComponentData().CustomID]; ok {
-				h(s, i)
-			}
-		}
-	})
-
-	log.Println("Adding commands")
-	registeredCommands := make([]*discordgo.ApplicationCommand, len(commands))
-	for i, v := range commands {
-		cmd, err := s.ApplicationCommandCreate(s.State.User.ID, "", v)
-		if err != nil {
-			log.Panicf("Cannot create '%v' command: %v", v.Name, err)
-		}
-		registeredCommands[i] = cmd
-	}
-
-	log.Println("Bot is now running. Press CTRL+C to exit")
-	sc := make(chan os.Signal, 1)
-	signal.Notify(sc, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
-	<-sc
-
-	s.Close()
 }

app/misc.go

@@ -2,10 +2,51 @@ 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+`)
+
+func extractURLFromString(in_url string) string {
+	return string(urlPattern.Find([]byte(in_url)))
+}
 
 // Helper function to create string pointer
 func ptr(s string) *string {

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
 	}

flake.nix

@@ -46,11 +46,8 @@
                         .venv/bin/pip install -r ./app/requirements.txt
                         source .venv/bin/activate
                     fi
-<<<<<<< HEAD
-=======
 
                     export YTDLP_BIN=${pkgs.lib.getExe pkgs.yt-dlp}
->>>>>>> v1-refactor
                 '';
             };
         });