dave/youtube-downloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refine the discord api a little

Browse Source
This commit is contained in:
PhatPhuckDave
2025-04-13 16:30:28 +02:00
parent 00ed4e9fc1
commit 586c49558e
2 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
downloader/discordNotifier.go
View File

@@ -10,6 +10,13 @@ import (
"os" "os"
) )
func NotifyDiscordErrorless(message string) {
err := NotifyDiscord(message)
if err != nil {
log.Printf("Error notifying discord: %v", err)
}
}
func NotifyDiscord(message string) error { func NotifyDiscord(message string) error {
webhookURL := os.Getenv("YTDL_DISCORD_WEBHOOK_URL") webhookURL := os.Getenv("YTDL_DISCORD_WEBHOOK_URL")
if webhookURL == "" { if webhookURL == "" {

26
downloader/main.go
View File

@@ -44,21 +44,13 @@ type DLHandler struct{}
func (*DLHandler) HandleMessage(message *nsq.Message) error { func (*DLHandler) HandleMessage(message *nsq.Message) error {
log.Printf("Received message '%s' with %d attempts", message.Body, message.Attempts) log.Printf("Received message '%s' with %d attempts", message.Body, message.Attempts)
err := NotifyDiscord(fmt.Sprintf("Received message '%s' with %d attempts", message.Body, message.Attempts)) NotifyDiscordErrorless(fmt.Sprintf("Received message '%s' with %d attempts", message.Body, message.Attempts))
if err != nil {
Error.Printf("Error notifying discord: %v", err)
return err
}
data := DownloadRequest{} data := DownloadRequest{}
err = json.Unmarshal(message.Body, &data) err := json.Unmarshal(message.Body, &data)
if err != nil { if err != nil {
Error.Printf("Error unmarshalling message: %v", err) Error.Printf("Error unmarshalling message: %v", err)
err = NotifyDiscord(fmt.Sprintf("Error unmarshalling message: %v", err)) NotifyDiscordErrorless(fmt.Sprintf("Error unmarshalling message: %v", err))
if err != nil {
Error.Printf("Error notifying discord: %v", err)
return err
}
return err return err
} }
@@ -82,19 +74,11 @@ func (*DLHandler) HandleMessage(message *nsq.Message) error {
err = downloader.Download(data.Link) err = downloader.Download(data.Link)
if err != nil { if err != nil {
Error.Printf("Error downloading %s: %v", data.Link, err) Error.Printf("Error downloading %s: %v", data.Link, err)
err = NotifyDiscord(fmt.Sprintf("Error downloading %s: %v", data.Link, err)) NotifyDiscordErrorless(fmt.Sprintf("Error downloading %s: %v", data.Link, err))
if err != nil {
Error.Printf("Error notifying discord: %v", err)
return err
}
return err return err
} }
message.Finish() message.Finish()
err = NotifyDiscord(fmt.Sprintf("Downloaded %s", data.Link)) NotifyDiscordErrorless(fmt.Sprintf("Downloaded %s", data.Link))
if err != nil {
Error.Printf("Error notifying discord: %v", err)
return err
}
return nil return nil
} }