From b98ae5e1909ce81a926115bfe0cb29d9a2b5b37d Mon Sep 17 00:00:00 2001 From: yuriy Date: Tue, 18 Jun 2024 15:22:31 -0400 Subject: [PATCH] Added API Responses to ErrorLog.txt files --- Modules/Post-To-Discord.ahk | 5 ++- Modules/Post-To-Telegram.ahk | 72 ++++++++++++++++++++++-------------- 2 files changed, 47 insertions(+), 30 deletions(-) diff --git a/Modules/Post-To-Discord.ahk b/Modules/Post-To-Discord.ahk index 9a256f8..8c5d6fc 100644 --- a/Modules/Post-To-Discord.ahk +++ b/Modules/Post-To-Discord.ahk @@ -55,8 +55,9 @@ if(PodcastNumber != "") Message .= "[FDRPodcasts](<" . "https://fdrpodcasts.com/" . PodcastNumber . ">) \| " -UploadImageToDiscord(DiscordVideosWebhookURL, Message, VideoThumbFilepath) - +Status := UploadImageToDiscord(DiscordVideosWebhookURL, Message, VideoThumbFilepath) +Message = API Response:`n%Status% +SaveOrPostProgress(Message:=Message,PostType:="ErrorLoggingTextFile") SaveOrPostProgress(Message:="Video Links posted to #Videos Successfully.",PostType:="Tooltip,ErrorLoggingTextFile") diff --git a/Modules/Post-To-Telegram.ahk b/Modules/Post-To-Telegram.ahk index e8cab90..e4fd9fa 100644 --- a/Modules/Post-To-Telegram.ahk +++ b/Modules/Post-To-Telegram.ahk @@ -83,6 +83,11 @@ StrLenOfMessageAndVideoLinks := StrLen(TelegramVideoTitle) + StrLen(TelegramBody ; ------------------------------------------------ if(StrLenOfMessageAndVideoLinks < 1024) { Status := SendTelegramPhoto(TelegramBotToken, TelegramBotChatID, VideoThumbFilepath, caption := TelegramMessage ) ; you could add more options; compare the Telegram API docs + + ; Output returned data to ErrorLog File + Message = API Response:`n%Status% + SaveOrPostProgress(Message:=Message,PostType:=",ErrorLoggingTextFile") + if(InStr(Status, "error_code")){ Message = Telegram Post Failed due to an API Issue. Error was saved to ErrorLogging file. Please send it to Yuriy. SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging") @@ -104,48 +109,59 @@ if(StrLenOfMessageAndVideoLinks < 4096){ ; Photo and Video Title go into SendPhoto TelegramVideoTitle := TelegramVideoTitle . "`n" . VideoLinks Status := SendTelegramPhoto(TelegramBotToken, TelegramBotChatID, VideoThumbFilepath, caption := TelegramVideoTitle ) ; you could add more options; compare the Telegram API docs - + ; Output returned data to ErrorLog File + Message = API Response:`n%Status% + SaveOrPostProgress(Message:=Message,PostType:=",ErrorLoggingTextFile") + ; Video Description goes into TelegramMessage - Status2 := SendTelegramMessage(TelegramBotToken, TelegramBotChatID, text := TelegramBodymessage) + Status := SendTelegramMessage(TelegramBotToken, TelegramBotChatID, text := TelegramBodymessage) + ; Output returned data to ErrorLog File + Message = API Response:`n%Status% + SaveOrPostProgress(Message:=Message,PostType:=",ErrorLoggingTextFile") + -} else, { -; If Title, links and message are longer than 4096 chars, we need to split them into multiple messages -; ------------------------------------------------ -TelegramVideoTitle := TelegramVideoTitle . "`n" . VideoLinks -Status := SendTelegramPhoto(TelegramBotToken, TelegramBotChatID, VideoThumbFilepath, caption := TelegramVideoTitle ) ; you could add more options; compare the Telegram API docs + } else, { + ; If Title, links and message are longer than 4096 chars, we need to split them into multiple messages + ; ------------------------------------------------ + TelegramVideoTitle := TelegramVideoTitle . "`n" . VideoLinks + Status := SendTelegramPhoto(TelegramBotToken, TelegramBotChatID, VideoThumbFilepath, caption := TelegramVideoTitle ) ; you could add more options; compare the Telegram API docs -; Split the Description into 4096 character chunks while preserving sentences -; Used 4095 because a ". " has to be put in at the end of the chunk. -VideoDescriptionChunks := SplitStringWithSentences(TelegramBodymessage, 4094) + ; Split the Description into 4096 character chunks while preserving sentences + ; Used 4095 because a ". " has to be put in at the end of the chunk. + VideoDescriptionChunks := SplitStringWithSentences(TelegramBodymessage, 4094) -; go through array and post each chunk as new message -Loop % VideoDescriptionChunks.Length(){ - ; ArrayItem := ARRAY[A_Index] - Description := VideoDescriptionChunks[A_Index] + ; go through array and post each chunk as new message + Loop % VideoDescriptionChunks.Length(){ + ; ArrayItem := ARRAY[A_Index] + Description := VideoDescriptionChunks[A_Index] - SendTelegramMessage(TelegramBotToken, TelegramBotChatID, text := Description) - ; Clipboard := Description - ; msgbox % Description + Status := SendTelegramMessage(TelegramBotToken, TelegramBotChatID, text := Description) + ; Output returned data to ErrorLog File + Message = API Response:`n%Status% + SaveOrPostProgress(Message:=Message,PostType:=",ErrorLoggingTextFile") -} + ; Clipboard := Description + ; msgbox % Description + } -} -; SaveOrPostProgress(Message:="Video Links posted to #Videos Successfully.",PostType:="Tooltip,ErrorLoggingTextFile") -Message = Video Links Posted to Telegram Successfully -SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile") -GuiControl,, PostToTelegramButton, Telegram - Posted Successfully + } + + ; SaveOrPostProgress(Message:="Video Links posted to #Videos Successfully.",PostType:="Tooltip,ErrorLoggingTextFile") + Message = Video Links Posted to Telegram Successfully + SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile") + GuiControl,, PostToTelegramButton, Telegram - Posted Successfully -; sleep, 2000 + ; sleep, 2000 -ToolTip -CurrentSite := -Return -; -------------------------------/Telegram------------------------------- + ToolTip + CurrentSite := + Return + ; -------------------------------/Telegram-------------------------------