From 1a87147fe01c2afd75c1612fe33ad7f28367fdb4 Mon Sep 17 00:00:00 2001 From: Logan Gartner Date: Wed, 20 Jul 2022 15:06:07 -0600 Subject: [PATCH] Links are now separated by a newline --- helpers.go | 2 +- messageCreate.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/helpers.go b/helpers.go index 4ec4095..a4e5f2c 100644 --- a/helpers.go +++ b/helpers.go @@ -101,7 +101,7 @@ func getLargestYTFormat(input goutubedl.Result, sizeLimit float64) (format goutu } else { size = input.Formats()[i].Filesize } - if size <= sizeLimit { + if size <= sizeLimit && input.Formats()[i].FormatID != 17 { return input.Formats()[i], nil } } diff --git a/messageCreate.go b/messageCreate.go index ddbe3f5..1350bae 100644 --- a/messageCreate.go +++ b/messageCreate.go @@ -50,7 +50,7 @@ func messageCreate(session *discordgo.Session, message *discordgo.MessageCreate) } } - response.Content = response.Content + fmt.Sprintf("<%s>", regexp.MustCompile("http.*twitter.com").ReplaceAllString(url, "https://nitter.pussthecat.org")) + response.Content = response.Content + fmt.Sprintf("\n<%s>", regexp.MustCompile("http.*twitter.com").ReplaceAllString(url, "https://nitter.pussthecat.org")) result, err := goutubedl.New(context.Background(), url, goutubedl.Options{}) if err != nil { @@ -100,7 +100,7 @@ func messageCreate(session *discordgo.Session, message *discordgo.MessageCreate) } } - response.Content = response.Content + fmt.Sprintf("<%s>", regexp.MustCompile("http.*youtube\\.com").ReplaceAllString(url, "https://piped.kavin.rocks")) + response.Content = response.Content + fmt.Sprintf("\n<%s>", regexp.MustCompile("http.*youtube\\.com").ReplaceAllString(url, "https://piped.kavin.rocks")) result, err := goutubedl.New(context.Background(), url, goutubedl.Options{}) if err != nil { @@ -141,7 +141,7 @@ func messageCreate(session *discordgo.Session, message *discordgo.MessageCreate) } else if output, _ := regexp.MatchString("(http.*instagram\\.com/p/.*)|(http.*instagram\\.com/tv/.*)|(http.*instagram\\.com/reel/.*)", url); output { log.Println("Instagram detected.") - response.Content = response.Content + fmt.Sprintf("%s", regexp.MustCompile("http.*instagram\\.com").ReplaceAllString(url, "https://bibliogram.art")) + response.Content = response.Content + fmt.Sprintf("\n%s", regexp.MustCompile("http.*instagram\\.com").ReplaceAllString(url, "https://bibliogram.art")) result, err := goutubedl.New(context.Background(), url, goutubedl.Options{}) if err != nil {