code cleanup

.gitignore

@@ -3,6 +3,7 @@
 *.txt
 *.py
 *.html
+main_test.go
 
 old/
 

bot/core/default.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/PaulSonOfLars/gotgbot/v2"
 	"github.com/PaulSonOfLars/gotgbot/v2/ext"
+	"github.com/pkg/errors"
 )
 
 func HandleDefaultFormatDownload(
@@ -59,7 +60,7 @@ func HandleDefaultFormatDownload(
 	}
 
 	if len(medias) == 0 {
-		return fmt.Errorf("no formats downloaded")
+		return errors.New("no formats downloaded")
 	}
 
 	isCaptionEnabled := true

bot/core/download.go

@@ -11,6 +11,8 @@ import (
 	"govd/enums"
 	"govd/models"
 	"govd/util"
+
+	"github.com/pkg/errors"
 )
 
 func downloadMediaItem(
@@ -25,7 +27,7 @@ func downloadMediaItem(
 
 	format := media.Format
 	if format == nil {
-		return nil, fmt.Errorf("media format is nil")
+		return nil, errors.New("media format is nil")
 	}
 
 	fileName := format.GetFileName()
@@ -79,7 +81,7 @@ func downloadMediaItem(
 	}
 
 	if format.Type == enums.MediaTypeVideo || format.Type == enums.MediaTypeAudio {
-		path, err := getFileThumbnail(format, filePath)
+		path, err := getFileThumbnail(ctx, format, filePath)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get thumbnail: %w", err)
 		}

bot/core/inline.go

@@ -100,8 +100,7 @@ func HandleInline(
 			return util.ErrInlineMediaGroup
 		}
 		err = HandleInlineCached(
-			bot, ctx,
+			bot, ctx, cached[0],
-			dlCtx, cached[0],
 		)
 		if err != nil {
 			return err
@@ -118,7 +117,6 @@ func HandleInline(
 func HandleInlineCached(
 	bot *gotgbot.Bot,
 	ctx *ext.Context,
-	dlCtx *models.DownloadContext,
 	media *models.Media,
 ) error {
 	var result gotgbot.InlineQueryResult
@@ -177,7 +175,6 @@ func HandleInlineCached(
 func HandleInlineCachedResult(
 	bot *gotgbot.Bot,
 	ctx *ext.Context,
-	dlCtx *models.DownloadContext,
 	media *models.Media,
 ) error {
 	format := media.Format

bot/core/main.go

@@ -25,7 +25,7 @@ func HandleDownloadRequest(
 ) error {
 	chatID := ctx.EffectiveMessage.Chat.Id
 	if dlCtx.Extractor.Type == enums.ExtractorTypeSingle {
-		TypingEffect(bot, ctx, chatID)
+		TypingEffect(bot, chatID)
 		err := HandleDefaultFormatDownload(bot, ctx, taskCtx, dlCtx)
 		if err != nil {
 			return err
@@ -115,7 +115,7 @@ func SendMedias(
 			inputMediaList = append(inputMediaList, inputMedia)
 		}
 		mediaType := chunk[0].Media.Format.Type
-		SendingEffect(bot, ctx, chatID, mediaType)
+		SendingEffect(bot, chatID, mediaType)
 		msgs, err := bot.SendMediaGroup(
 			chatID,
 			inputMediaList,

bot/core/util.go

@@ -6,8 +6,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"govd/database"
 	"govd/enums"
 	"govd/models"
@@ -17,9 +15,11 @@ import (
 
 	"github.com/PaulSonOfLars/gotgbot/v2"
 	"github.com/PaulSonOfLars/gotgbot/v2/ext"
+	"github.com/pkg/errors"
 )
 
 func getFileThumbnail(
+	ctx context.Context,
 	format *models.MediaFormat,
 	filePath string,
 ) (string, error) {
@@ -29,9 +29,6 @@ func getFileThumbnail(
 	fileBaseName := fileName[:len(fileName)-len(fileExt)]
 	thumbnailFilePath := filepath.Join(fileDir, fileBaseName+".thumb.jpeg")
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
 	if len(format.Thumbnail) > 0 {
 		file, err := util.DownloadFileInMemory(ctx, format.Thumbnail, nil)
 		if err != nil {
@@ -109,7 +106,7 @@ func StoreMedias(
 	var storedMedias []*models.Media
 
 	if len(medias) == 0 {
-		return fmt.Errorf("no media to store")
+		return errors.New("no media to store")
 	}
 
 	for idx, msg := range msgs {
@@ -161,7 +158,6 @@ func FormatCaption(
 
 func TypingEffect(
 	bot *gotgbot.Bot,
-	ctx *ext.Context,
 	chatID int64,
 ) {
 	bot.SendChatAction(
@@ -173,7 +169,6 @@ func TypingEffect(
 
 func SendingEffect(
 	bot *gotgbot.Bot,
-	ctx *ext.Context,
 	chatID int64,
 	mediaType enums.MediaType,
 ) {

bot/handlers/inline.go

@@ -71,8 +71,7 @@ func InlineDownloadResultHandler(
 	select {
 	case media := <-mediaChan:
 		err := core.HandleInlineCachedResult(
-			bot, ctx,
+			bot, ctx, media,
-			dlCtx, media,
 		)
 		if err != nil {
 			core.HandleErrorMessage(bot, ctx, err)

bot/main.go

@@ -46,13 +46,13 @@ func Start() {
 		logDispatcherErrors = false
 	}
 	dispatcher := ext.NewDispatcher(&ext.DispatcherOpts{
-		Error: func(b *gotgbot.Bot, ctx *ext.Context, err error) ext.DispatcherAction {
+		Error: func(_ *gotgbot.Bot, _ *ext.Context, err error) ext.DispatcherAction {
 			if logDispatcherErrors {
 				log.Printf("an error occurred while handling update: %v", err)
 			}
 			return ext.DispatcherActionNoop
 		},
-		Panic: func(b *gotgbot.Bot, ctx *ext.Context, r interface{}) {
+		Panic: func(_ *gotgbot.Bot, _ *ext.Context, r any) {
 			if logDispatcherErrors {
 				log.Printf("panic occurred while handling update: %v\n", r)
 				log.Printf("stack trace:\n%s\n", debug.Stack())

bot/middleware.go

@@ -13,11 +13,11 @@ import (
 	"github.com/PaulSonOfLars/gotgbot/v2"
 )
 
-type BotClient struct {
+type Client struct {
 	gotgbot.BotClient
 }
 
-func (b BotClient) RequestWithContext(
+func (b Client) RequestWithContext(
 	ctx context.Context,
 	token string,
 	method string,
@@ -38,18 +38,18 @@ func (b BotClient) RequestWithContext(
 	return val, err
 }
 
-func NewBotClient() BotClient {
+func NewBotClient() Client {
 	botAPIURL := os.Getenv("BOT_API_URL")
 	if botAPIURL == "" {
 		log.Println("BOT_API_URL is not provided, using default")
 		botAPIURL = gotgbot.DefaultAPIURL
 	}
-	return BotClient{
+	return Client{
 		BotClient: &gotgbot.BaseBotClient{
 			Client: http.Client{
 				Transport: &http.Transport{
 					// avoid using proxy for telegram
-					Proxy: func(r *http.Request) (*url.URL, error) {
+					Proxy: func(_ *http.Request) (*url.URL, error) {
 						return nil, nil
 					},
 				},

ext/instagram/main.go

@@ -8,6 +8,8 @@ import (
 	"io"
 	"net/http"
 	"regexp"
+
+	"github.com/pkg/errors"
 )
 
 var instagramHost = []string{"instagram.com"}
@@ -43,7 +45,7 @@ var Extractor = &models.Extractor{
 				MediaList: mediaList,
 			}, nil
 		}
-		return nil, fmt.Errorf("failed to extract media: all methods failed")
+		return nil, errors.New("failed to extract media: all methods failed")
 	},
 }
 
@@ -196,7 +198,7 @@ func GetFromIGram(
 	if err != nil {
 		return nil, fmt.Errorf("failed to build signed payload: %w", err)
 	}
-	req, err := http.NewRequest("POST", apiURL, payload)
+	req, err := http.NewRequest(http.MethodPost, apiURL, payload)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create request: %w", err)
 	}

ext/instagram/util.go

@@ -5,9 +5,6 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
-	"govd/enums"
-	"govd/models"
-	"govd/util"
 	"io"
 	"math/big"
 	"net/http"
@@ -17,7 +14,12 @@ import (
 	"strings"
 	"time"
 
+	"govd/enums"
+	"govd/models"
+	"govd/util"
+
 	"github.com/bytedance/sonic"
+	"github.com/pkg/errors"
 	"github.com/titanous/json5"
 )
 
@@ -63,11 +65,10 @@ func ParseGQLMedia(
 		caption = data.EdgeMediaToCaption.Edges[0].Node.Text
 	}
 
-	mediaType := data.Typename
 	contentID := ctx.MatchedContentID
 	contentURL := ctx.MatchedContentURL
 
-	switch mediaType {
+	switch data.Typename {
 	case "GraphVideo", "XDTGraphVideo":
 		media := ctx.Extractor.NewMedia(contentID, contentURL)
 		media.SetCaption(caption)
@@ -139,17 +140,17 @@ func ParseEmbedGQL(
 ) (*Media, error) {
 	match := embedPattern.FindStringSubmatch(string(body))
 	if len(match) < 2 {
-		return nil, fmt.Errorf("failed to find JSON in response")
+		return nil, errors.New("failed to find JSON in response")
 	}
 	jsonData := match[1]
 
-	var data map[string]interface{}
+	var data map[string]any
 	if err := json5.Unmarshal([]byte(jsonData), &data); err != nil {
 		return nil, fmt.Errorf("failed to unmarshal JSON: %w", err)
 	}
 	igCtx := util.TraverseJSON(data, "contextJSON")
 	if igCtx == nil {
-		return nil, fmt.Errorf("contextJSON not found in data")
+		return nil, errors.New("contextJSON not found in data")
 	}
 	var ctxJSON ContextJSON
 	switch v := igCtx.(type) {
@@ -158,13 +159,13 @@ func ParseEmbedGQL(
 			return nil, fmt.Errorf("failed to unmarshal contextJSON: %w", err)
 		}
 	default:
-		return nil, fmt.Errorf("contextJSON is not a string")
+		return nil, errors.New("contextJSON is not a string")
 	}
 	if ctxJSON.GqlData == nil {
-		return nil, fmt.Errorf("gql_data is nil")
+		return nil, errors.New("gql_data is nil")
 	}
 	if ctxJSON.GqlData.ShortcodeMedia == nil {
-		return nil, fmt.Errorf("media is nil")
+		return nil, errors.New("media is nil")
 	}
 	return ctxJSON.GqlData.ShortcodeMedia, nil
 }
@@ -297,13 +298,13 @@ func GetGQLData(
 		return nil, fmt.Errorf("failed to parse response: %w", err)
 	}
 	if response.Data == nil {
-		return nil, fmt.Errorf("data is nil")
+		return nil, errors.New("data is nil")
 	}
 	if response.Status != "ok" {
 		return nil, fmt.Errorf("status is not ok: %s", response.Status)
 	}
 	if response.Data.ShortcodeMedia == nil {
-		return nil, fmt.Errorf("media is nil")
+		return nil, errors.New("media is nil")
 	}
 	return response.Data, nil
 }

ext/ninegag/main.go

@@ -10,6 +10,7 @@ import (
 	"govd/util"
 
 	"github.com/bytedance/sonic"
+	"github.com/pkg/errors"
 )
 
 const (
@@ -125,7 +126,7 @@ func GetPostData(postID string) (*Post, error) {
 	}
 
 	if response.Data == nil || response.Data.Post == nil {
-		return nil, fmt.Errorf("no post data found")
+		return nil, errors.New("no post data found")
 	}
 
 	return response.Data.Post, nil

ext/ninegag/models.go

@@ -31,10 +31,6 @@ type Post struct {
 	Description string            `json:"description"`
 	Type        string            `json:"type"`
 	Nsfw        int               `json:"nsfw"`
-	CreationTs       int               `json:"creationTs"`
-	GamFlagged       bool              `json:"gamFlagged"`
-	IsVoteMasked     int               `json:"isVoteMasked"`
-	HasLongPostCover int               `json:"hasLongPostCover"`
 	Images      map[string]*Media `json:"images"`
 }
 

ext/ninegag/util.go

@@ -6,6 +6,8 @@ import (
 
 	"govd/enums"
 	"govd/models"
+
+	"github.com/pkg/errors"
 )
 
 func FindBestPhoto(
@@ -25,7 +27,7 @@ func FindBestPhoto(
 	}
 
 	if bestPhoto == nil {
-		return nil, fmt.Errorf("no photo found in post")
+		return nil, errors.New("no photo found in post")
 	}
 
 	return bestPhoto, nil
@@ -47,7 +49,7 @@ func ParseVideoFormats(
 		}
 	}
 	if video == nil {
-		return nil, fmt.Errorf("no video found in post")
+		return nil, errors.New("no video found in post")
 	}
 
 	codecMapping := map[string]struct {

ext/pinterest/util.go

@@ -2,6 +2,7 @@ package pinterest
 
 import (
 	"fmt"
+
 	"govd/enums"
 	"govd/models"
 	"govd/util/parser"

ext/reddit/main.go

@@ -10,6 +10,7 @@ import (
 	"govd/util"
 
 	"github.com/bytedance/sonic"
+	"github.com/pkg/errors"
 )
 
 var (
@@ -94,7 +95,7 @@ func MediaListFromAPI(ctx *models.DownloadContext) ([]*models.Media, error) {
 	}
 
 	if len(manifest) == 0 || len(manifest[0].Data.Children) == 0 {
-		return nil, fmt.Errorf("no data found in response")
+		return nil, errors.New("no data found in response")
 	}
 
 	data := manifest[0].Data.Children[0].Data
@@ -115,11 +116,11 @@ func MediaListFromAPI(ctx *models.DownloadContext) ([]*models.Media, error) {
 			image := data.Preview.Images[0]
 
 			// check for video preview (GIF)
-			if data.Preview.RedditVideoPreview != nil {
+			if data.Preview.VideoPreview != nil {
 				formats, err := GetHLSFormats(
-					data.Preview.RedditVideoPreview.FallbackURL,
+					data.Preview.VideoPreview.FallbackURL,
 					image.Source.URL,
-					data.Preview.RedditVideoPreview.Duration,
+					data.Preview.VideoPreview.Duration,
 				)
 				if err != nil {
 					return nil, err
@@ -189,12 +190,12 @@ func MediaListFromAPI(ctx *models.DownloadContext) ([]*models.Media, error) {
 			media.NSFW = true
 		}
 
-		var redditVideo *RedditVideo
+		var redditVideo *Video
 
-		if data.Media != nil && data.Media.RedditVideo != nil {
+		if data.Media != nil && data.Media.Video != nil {
-			redditVideo = data.Media.RedditVideo
+			redditVideo = data.Media.Video
-		} else if data.SecureMedia != nil && data.SecureMedia.RedditVideo != nil {
+		} else if data.SecureMedia != nil && data.SecureMedia.Video != nil {
-			redditVideo = data.SecureMedia.RedditVideo
+			redditVideo = data.SecureMedia.Video
 		}
 
 		if redditVideo != nil {
@@ -230,7 +231,7 @@ func GetRedditData(
 	host string,
 	slug string,
 	raise bool,
-) (RedditResponse, error) {
+) (Response, error) {
 	url := fmt.Sprintf("https://%s/%s/.json", host, slug)
 
 	req, err := http.NewRequest(http.MethodGet, url, nil)
@@ -266,7 +267,7 @@ func GetRedditData(
 		return GetRedditData(client, altHost, slug, true)
 	}
 
-	var response RedditResponse
+	var response Response
 	decoder := sonic.ConfigFastest.NewDecoder(res.Body)
 	err = decoder.Decode(&response)
 	if err != nil {

ext/reddit/models.go

@@ -12,7 +12,7 @@ type ResponseItem struct {
 	Data *Data `json:"data"`
 }
 
-type RedditResponse []*ResponseItem
+type Response []*ResponseItem
 
 type PostData struct {
 	ID            string                   `json:"id"`
@@ -27,10 +27,10 @@ type PostData struct {
 }
 
 type Media struct {
-	RedditVideo *RedditVideo `json:"reddit_video"`
+	Video *Video `json:"reddit_video"`
 }
 
-type RedditVideo struct {
+type Video struct {
 	FallbackURL      string `json:"fallback_url"`
 	HLSURL           string `json:"hls_url"`
 	DashURL          string `json:"dash_url"`
@@ -42,7 +42,7 @@ type RedditVideo struct {
 
 type Preview struct {
 	Images       []Image       `json:"images"`
-	RedditVideoPreview *RedditVideoPreview `json:"reddit_video_preview"`
+	VideoPreview *VideoPreview `json:"reddit_video_preview"`
 }
 
 type Image struct {
@@ -64,7 +64,7 @@ type MP4Variant struct {
 	Source ImageSource `json:"source"`
 }
 
-type RedditVideoPreview struct {
+type VideoPreview struct {
 	FallbackURL string `json:"fallback_url"`
 	Duration    int64  `json:"duration"`
 }

ext/redgifs/main.go

@@ -18,7 +18,7 @@ const (
 )
 
 var (
-	baseApiHeaders = map[string]string{
+	baseAPIHeaders = map[string]string{
 		"referer":      "https://www.redgifs.com/",
 		"origin":       "https://www.redgifs.com",
 		"content-type": "application/json",
@@ -132,7 +132,7 @@ func GetVideo(
 	req.Header.Set("authorization", "Bearer "+token.AccessToken)
 	req.Header.Set("user-agent", token.Agent)
 	req.Header.Set("x-customheader", "https://www.redgifs.com/watch/"+videoID)
-	for k, v := range baseApiHeaders {
+	for k, v := range baseAPIHeaders {
 		req.Header.Set(k, v)
 	}
 	res, err := client.Do(req)

ext/twitter/main.go

@@ -11,6 +11,7 @@ import (
 	"govd/util"
 
 	"github.com/bytedance/sonic"
+	"github.com/pkg/errors"
 )
 
 const (
@@ -45,7 +46,7 @@ var ShortExtractor = &models.Extractor{
 		}
 		matchedURL := Extractor.URLPattern.FindStringSubmatch(string(body))
 		if matchedURL == nil {
-			return nil, fmt.Errorf("failed to find url in body")
+			return nil, errors.New("failed to find url in body")
 		}
 		return &models.ExtractorResponse{
 			URL: matchedURL[0],
@@ -62,7 +63,6 @@ var Extractor = &models.Extractor{
 	Host: []string{
 		"twitter.com",
 		"x.com",
-		"vxx.com",
 		"vxtwitter.com",
 	},
 
@@ -95,7 +95,7 @@ func MediaListFromAPI(ctx *models.DownloadContext) ([]*models.Media, error) {
 	} else if tweetData.Entities != nil && len(tweetData.Entities.Media) > 0 {
 		mediaEntities = tweetData.Entities.Media
 	} else {
-		return nil, fmt.Errorf("no media found in tweet")
+		return nil, nil
 	}
 
 	for _, mediaEntity := range mediaEntities {
@@ -140,7 +140,7 @@ func GetTweetAPI(
 	}
 	headers := BuildAPIHeaders(cookies)
 	if headers == nil {
-		return nil, fmt.Errorf("failed to build headers. check cookies")
+		return nil, errors.New("failed to build headers. check cookies")
 	}
 	query := BuildAPIQuery(tweetID)
 

ext/twitter/util.go

@@ -2,15 +2,17 @@ package twitter
 
 import (
 	"fmt"
-	"govd/enums"
-	"govd/models"
-	"govd/util"
 	"net/http"
 	"regexp"
 	"strconv"
 	"strings"
 
+	"govd/enums"
+	"govd/models"
+	"govd/util"
+
 	"github.com/bytedance/sonic"
+	"github.com/pkg/errors"
 )
 
 const authToken = "AAAAAAAAAAAAAAAAAAAAANRILgAAAAAAnNwIzUejRCOuH5E6I8xnZz4puTs%3D1Zv7ttfk8LF81IUq16cHjhLTvJu4FA33AGWWjCpTnA"
@@ -137,7 +139,7 @@ func extractResolution(url string) (int64, int64) {
 func FindTweetData(resp *APIResponse, tweetID string) (*Tweet, error) {
 	instructions := resp.Data.ThreadedConversationWithInjectionsV2.Instructions
 	if len(instructions) == 0 {
-		return nil, fmt.Errorf("tweet data missing")
+		return nil, errors.New("tweet data missing")
 	}
 
 	entries := instructions[0].Entries
@@ -155,9 +157,9 @@ func FindTweetData(resp *APIResponse, tweetID string) (*Tweet, error) {
 				return result.Legacy, nil
 			}
 
-			return nil, fmt.Errorf("invalid tweet data")
+			return nil, errors.New("invalid tweet data")
 		}
 	}
 
-	return nil, fmt.Errorf("tweet not found")
+	return nil, errors.New("tweet not found")
 }

ext/util.go

@@ -2,10 +2,13 @@ package ext
 
 import (
 	"fmt"
-	"govd/models"
 	"net/url"
 	"strings"
 	"sync"
+
+	"govd/models"
+
+	"github.com/pkg/errors"
 )
 
 var (
@@ -37,7 +40,7 @@ func CtxByURL(urlStr string) (*models.DownloadContext, error) {
 	for redirectCount <= maxRedirects {
 		parsedURL, err := url.Parse(currentURL)
 		if err != nil {
-			return nil, fmt.Errorf("invalid URL: %v", err)
+			return nil, fmt.Errorf("invalid URL: %w", err)
 		}
 
 		host := strings.TrimPrefix(parsedURL.Host, "www.")
@@ -87,7 +90,7 @@ func CtxByURL(urlStr string) (*models.DownloadContext, error) {
 			return nil, err
 		}
 		if response.URL == "" {
-			return nil, fmt.Errorf("no URL found in response")
+			return nil, errors.New("no URL found in response")
 		}
 
 		currentURL = response.URL

go.mod

@@ -6,6 +6,7 @@ toolchain go1.24.2
 
 require (
 	github.com/PaulSonOfLars/gotgbot/v2 v2.0.0-rc.31
+	github.com/PuerkitoBio/goquery v1.10.3
 	github.com/bytedance/sonic v1.13.2
 	github.com/google/uuid v1.6.0
 	github.com/guregu/null/v6 v6.0.0
@@ -18,6 +19,7 @@ require (
 )
 
 require (
+	github.com/andybalholm/cascadia v1.3.3 // indirect
 	github.com/asticode/go-astikit v0.42.0 // indirect
 	github.com/bytedance/sonic/loader v0.2.4 // indirect
 	github.com/cloudwego/base64x v0.1.5 // indirect
@@ -26,6 +28,7 @@ require (
 	github.com/stretchr/testify v1.10.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	golang.org/x/arch v0.0.0-20210923205945-b76863e36670 // indirect
+	golang.org/x/net v0.39.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 

go.sum

@@ -1,7 +1,11 @@
 github.com/PaulSonOfLars/gotgbot/v2 v2.0.0-rc.31 h1:SIkzqC6Nv+znY4NGbWlJceWdns8QVmf9cwAYXd7Cg8k=
 github.com/PaulSonOfLars/gotgbot/v2 v2.0.0-rc.31/go.mod h1:kL1v4iIjlalwm3gCYGvF4NLa3hs+aKEfRkNJvj4aoDU=
+github.com/PuerkitoBio/goquery v1.10.3 h1:pFYcNSqHxBD06Fpj/KsbStFRsgRATgnf3LeXiUkhzPo=
+github.com/PuerkitoBio/goquery v1.10.3/go.mod h1:tMUX0zDMHXYlAQk6p35XxQMqMweEKB7iK7iLNd4RH4Y=
 github.com/aki237/nscjar v0.0.0-20210417074043-bbb606196143 h1:PqRkQZW8lAlK2DnH9iSBfISmDxSChaoNJHwP0p7SD2Y=
 github.com/aki237/nscjar v0.0.0-20210417074043-bbb606196143/go.mod h1:l0r3UsMujHR1bAYL7R0+6NXkHo/vIe+ja3xLZbUZNb8=
+github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
+github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
 github.com/asticode/go-astiav v0.35.1 h1:jq27Ihf+GXtOTnhzNTcpKrW1iLNRAuPSoarh7/SapYc=
 github.com/asticode/go-astiav v0.35.1/go.mod h1:K7D8UC6GeQt85FUxk2KVwYxHnotrxuEnp5evkkudc2s=
 github.com/asticode/go-astikit v0.42.0 h1:pnir/2KLUSr0527Tv908iAH6EGYYrYta132vvjXsH5w=
@@ -26,6 +30,7 @@ github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7
 github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
 github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -88,28 +93,89 @@ github.com/u2takey/ffmpeg-go v0.5.0 h1:r7d86XuL7uLWJ5mzSeQ03uvjfIhiJYvsRAJFCW4uk
 github.com/u2takey/ffmpeg-go v0.5.0/go.mod h1:ruZWkvC1FEiUNjmROowOAps3ZcWxEiOpFoHCvk97kGc=
 github.com/u2takey/go-utils v0.3.1 h1:TaQTgmEZZeDHQFYfd+AdUT1cT4QJgJn/XVPELhHw4ys=
 github.com/u2takey/go-utils v0.3.1/go.mod h1:6e+v5vEZ/6gu12w/DC2ixZdZtCrNokVxD0JUklcqdCs=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 gocv.io/x/gocv v0.25.0/go.mod h1:Rar2PS6DV+T4FL+PM535EImD/h13hGVaHhnCu1xarBs=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/image v0.0.0-20191009234506-e7c1f5e7dbb8/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY=
 golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
+golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
 golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/sourcemap.v1 v1.0.5 h1:inv58fC9f9J3TK2Y2R1NPntXEn3/wjWHkonhIUODNTI=

main.go

@@ -11,7 +11,7 @@ import (
 	"os"
 	"strconv"
 
-	_ "net/http/pprof"
+	_ "net/http/pprof" // profiling
 
 	"github.com/joho/godotenv"
 )

models/media.go

@@ -467,12 +467,13 @@ func (format *MediaFormat) GetInputMediaWithFileID(
 func (format *MediaFormat) GetFileName() string {
 	extension, _ := format.GetFormatInfo()
 	if format.Type == enums.MediaTypeAudio && format.Title != "" && format.Artist != "" {
-		return fmt.Sprintf("%s - %s.%s", format.Artist, format.Title, extension)
+		artist := strings.ReplaceAll(format.Artist, "/", " ")
-	} else {
+		title := strings.ReplaceAll(format.Title, "/", " ")
+		return fmt.Sprintf("%s - %s.%s", artist, title, extension)
+	}
 	name := uuid.New().String()
 	name = strings.ReplaceAll(name, "-", "")
 	return fmt.Sprintf("%s.%s", name, extension)
-	}
 }
 
 func (media *Media) HasVideo() bool {

util/av/merge_segments.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/pkg/errors"
 	ffmpeg "github.com/u2takey/ffmpeg-go"
 )
 
@@ -12,7 +13,7 @@ func MergeSegments(
 	outputPath string,
 ) (string, error) {
 	if len(segmentPaths) == 0 {
-		return "", fmt.Errorf("no segments to merge")
+		return "", errors.New("no segments to merge")
 	}
 	listFilePath := outputPath + ".segments.txt"
 	listFile, err := os.Create(listFilePath)

util/av/remux.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/asticode/go-astiav"
+	"github.com/pkg/errors"
 )
 
 func RemuxFile(inputFile string) error {
@@ -29,7 +30,7 @@ func RemuxFile(inputFile string) error {
 
 	inputCtx := astiav.AllocFormatContext()
 	if inputCtx == nil {
-		return fmt.Errorf("failed to alloc input format context")
+		return errors.New("failed to alloc input format context")
 	}
 	defer inputCtx.Free()
 
@@ -59,7 +60,7 @@ func RemuxFile(inputFile string) error {
 		}
 		outStream := outCtx.NewStream(nil)
 		if outStream == nil {
-			return fmt.Errorf("failed to create new stream in output context")
+			return errors.New("failed to create new stream in output context")
 		}
 		if err := inCP.Copy(outStream.CodecParameters()); err != nil {
 			return fmt.Errorf("failed to copy codec parameters: %w", err)
@@ -69,7 +70,7 @@ func RemuxFile(inputFile string) error {
 		inToOutIdx[inIdx] = len(inToOutIdx)
 	}
 	if len(inToOutIdx) == 0 {
-		return fmt.Errorf("no supported streams to remux")
+		return errors.New("no supported streams to remux")
 	}
 
 	if !outCtx.OutputFormat().Flags().Has(astiav.IOFormatFlagNofile) {
@@ -89,7 +90,7 @@ func RemuxFile(inputFile string) error {
 	defer packet.Free()
 	for {
 		if err := inputCtx.ReadFrame(packet); err != nil {
-			if err == astiav.ErrEof {
+			if errors.Is(err, astiav.ErrEof) {
 				break
 			}
 			return fmt.Errorf("error reading frame: %w", err)

util/av/thumbnail.go

@@ -1,13 +1,13 @@
 package av
 
 import (
-	"errors"
 	"fmt"
 	"image/jpeg"
 	"os"
 	"time"
 
 	"github.com/asticode/go-astiav"
+	"github.com/pkg/errors"
 )
 
 func ExtractVideoThumbnail(videoPath string, imagePath string) error {
@@ -65,7 +65,7 @@ func ExtractVideoThumbnail(videoPath string, imagePath string) error {
 		err := formatCtx.ReadFrame(packet)
 		if err != nil {
 			if errors.Is(err, astiav.ErrEof) {
-				return fmt.Errorf("end of file reached before finding video frame")
+				return errors.New("end of file reached before finding video frame")
 			}
 			return fmt.Errorf("failed reading frame: %w", err)
 		}
@@ -113,5 +113,5 @@ func ExtractVideoThumbnail(videoPath string, imagePath string) error {
 		return nil
 	}
 
-	return fmt.Errorf("timeout while waiting for video frame")
+	return errors.New("timeout while waiting for video frame")
 }

util/edgeproxy.go

@@ -3,14 +3,16 @@ package util
 import (
 	"bytes"
 	"fmt"
-	"govd/models"
 	"io"
 	"net/http"
 	"net/url"
 	"strconv"
 	"time"
 
+	"govd/models"
+
 	"github.com/bytedance/sonic"
+	"github.com/pkg/errors"
 )
 
 type EdgeProxyClient struct {
@@ -48,7 +50,7 @@ func NewEdgeProxy(
 
 func (c *EdgeProxyClient) Do(req *http.Request) (*http.Response, error) {
 	if c.proxyURL == "" {
-		return nil, fmt.Errorf("proxy URL is not set")
+		return nil, errors.New("proxy URL is not set")
 	}
 
 	targetURL := req.URL.String()

util/http.go

@@ -1,8 +1,6 @@
 package util
 
 import (
-	"govd/config"
-	"govd/models"
 	"log"
 	"net"
 	"net/http"
@@ -10,6 +8,9 @@ import (
 	"strings"
 	"sync"
 	"time"
+
+	"govd/config"
+	"govd/models"
 )
 
 var (

util/img.go

@@ -9,11 +9,11 @@ import (
 	"os"
 	"slices"
 
-	_ "image/gif"
+	_ "image/gif" // register GIF decoder
-	_ "image/png"
+	_ "image/png" // register PNG decoder
 
-	_ "github.com/strukturag/libheif/go/heif"
+	_ "github.com/strukturag/libheif/go/heif" // register HEIF decoder
-	_ "golang.org/x/image/webp"
+	_ "golang.org/x/image/webp"               // register WebP decoder
 )
 
 var (

util/misc.go

@@ -85,7 +85,7 @@ func EscapeCaption(str string) string {
 }
 
 func GetLastError(err error) error {
-	var lastErr error = err
+	var lastErr = err
 	for {
 		unwrapped := errors.Unwrap(lastErr)
 		if unwrapped == nil {

util/parser/m3u8.go

@@ -9,12 +9,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
-
 	"govd/enums"
 	"govd/models"
 
 	"github.com/grafov/m3u8"
+	"github.com/pkg/errors"
 )
 
 var httpClient = &http.Client{
@@ -89,8 +88,8 @@ func parseMasterPlaylist(
 			VideoCodec: videoCodec,
 			AudioCodec: audioCodec,
 			Bitrate:    int64(variant.Bandwidth),
-			Width:      int64(width),
+			Width:      width,
-			Height:     int64(height),
+			Height:     height,
 			URL:        []string{variantURL},
 		}
 		variantContent, err := fetchContent(variantURL)
@@ -153,7 +152,7 @@ func parseAlternative(
 	altURL := resolveURL(baseURL, alternative.URI)
 	audioCodec := getAudioAlternativeCodec(variants, alternative)
 	format := &models.MediaFormat{
-		FormatID:   fmt.Sprintf("hls-%s", alternative.GroupId),
+		FormatID:   "hls" + alternative.GroupId,
 		Type:       enums.MediaTypeAudio,
 		AudioCodec: audioCodec,
 		URL:        []string{altURL},