added Rumble RTMP input, gui additions

added auto update checks option and functionality
fixed locals thumbnail upload, rumble URL grab
2024-05-11 00:58:30 -04:00 · 2024-05-10 02:36:02 -04:00 · 2024-05-08 21:35:32 -04:00 · 2024-05-08 13:58:37 -04:00
12 changed files with 758 additions and 435 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ Freedomain Video Uploader.exe
 Lib/LBRY Process Killer.exe
 Lib/chrome-win64
 Lib/Version.ini
+
--- a/Vars.ahk
+++ b/Vars.ahk
@@ -0,0 +1,84 @@
+;---ENVIRONMENT---------------------------------------------------------------------
+#NoEnv ; Recommended for performance and compatibility with future AutoHotkey releases.
+;#Warn ; Enable warnings to assist with detecting common errors.
+;DetectHiddenWindows, On
+#SingleInstance, Force
+DetectHiddenWindows, ON
+SendMode Input ; Recommended for new scripts due to its superior speed and reliability.
+SetWorkingDir %A_ScriptDir% ; Ensures a consistent starting directory.
+;SetKeyDelay, 500
+CoordMode, ToolTip, Screen
+CoordMode, Mouse, Screen
+; #NoTrayIcon
+; Menu, Tray, Icon, RMScriptManager.ico
+
+;---Notes/Extra Info/#Includes------------------------------------------------------
+
+
+;---VARIABLES-----------------------------------------------------------------------
+ScriptName = Freedomain Livestream Scheduler
+
+AHKFilepath = %A_ScriptDir%\%ScriptName%.ahk
+Exefilepath = %A_ScriptDir%\%ScriptName%.exe
+icopath = %A_ScriptDir%\Assets\Icon.ico
+VersionIniFP = %A_ScriptDir%\Version.ini
+
+
+;---MAIN SCRIPT---------------------------------------------------------------------
+
+; Bump the version number in the version.ini file
+IniRead, VersionNumber, %VersionIniFP%, %ScriptName%, Version, 0.0 ; , Filename, Section, Key [, Default]
+VersionNumber += .01
+VersionNumber := SubStr(VersionNumber, 1, 4)
+
+IniWrite, %VersionNumber%, %VersionIniFP%,%ScriptName%, Version
+
+
+
+; Kill any active intances of the uploaders so the .exe file can be overwriten by the compilation
+process, close, %ScriptName%.exe
+
+sleep, 1000
+
+; Delete the .exe file so it can be repalced
+if(FileExist(Exefilepath)){
+	FileDelete, %Exefilepath%
+	if(ErrorLevel){
+		msgbox, failed to delete Exe file. Please delete manually and re-run the compiler.
+		ExitApp
+	}
+}
+
+
+if(!FileExist(AHKFilepath)){
+	msgbox, %AHKFilepath% does not exist`nExiting
+	ExitApp
+}
+
+
+if(!FileExist(icopath)){
+	msgbox, %icopath% does not exist`nExiting
+	ExitApp
+}
+
+
+run, %comspec% /c ""C:\Program Files\AutoHotkey\Compiler\Ahk2Exe.exe" /in "%AHKFilepath%" /out "%exefilepath%" /icon "%icopath%""
+
+
+; OldNotify(ScriptToCompile,"Compiled Successfully",5)
+; sleep, 5000
+ExitApp
+
+
+
+
+
+
+
+
+
+
+
+
+
+;---FUNCTIONS-----------------------------------------------------------------------
--- a/EXE.ahk
+++ b/EXE.ahk
@@ -27,11 +27,11 @@ VersionIniFP = %A_ScriptDir%\Version.ini
 ;---MAIN SCRIPT---------------------------------------------------------------------

 ; Bump the version number in the version.ini file
-IniRead, VersionNumber, %VersionIniFP%, %ScriptName%, Version, 0.0 ; , Filename, Section, Key [, Default]
+IniRead, VersionNumber, %VersionIniFP%, Livestream-Scheduler, Version, 0.0 ; , Filename, Section, Key [, Default]
 VersionNumber += .01
 VersionNumber := SubStr(VersionNumber, 1, 4)

-IniWrite, %VersionNumber%, %VersionIniFP%,%ScriptName%, Version
+IniWrite, %VersionNumber%, %VersionIniFP%,Livestream-Scheduler, Version



--- a/Scheduler.ahk
+++ b/Scheduler.ahk
@@ -49,6 +49,7 @@ CheckIfUpdateInstalled(PassedInArgument)
 #include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\Zip.ahk
 #include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\URLDownloadToVar.ahk
 #Include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\Miscellaneous-Functions.ahk
+#Include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\LBRY-Functions.ahk



@@ -104,12 +105,15 @@ FileInstall, Version.ini, %A_ScriptDir%\Lib\Version.ini, 1
 IniRead, ScriptVersion, %A_ScriptDir%\Lib\Version.ini,%ScriptSettingsSection%, Version, 0.0
 ; IniRead, ScriptName, %A_ScriptDir%\Lib\Version.ini,%ScriptSettingsSection%, Name, %ScriptSettingsSection%

-global ScriptName := "Livestream Scheduler"
+global ScriptName := "Freedomain Livestream Scheduler"
 global ScriptAbbreviatedName := "FLS" ; used for error logging

 FullScriptName := ScriptName . " - " . ScriptVersion

+; Msgbox % "FullScriptName: " FullScriptName

+global GitReleasesAPIURL
+GitReleasesAPIURL = https://freedomain.dev/api/v1/repos/yuriy/livestream-scheduler/releases


 ; Read Info From Files
@@ -144,13 +148,15 @@ LivestreamThumbnail := ThumbnailJPGFilepath

 if(FileExist(ThumbnailJPEGFilepath))
 LivestreamThumbnail := ThumbnailJPEGFilepath
-
-
 }




+; Read settings.ini
+; ------------------------------------------------
+IniRead, ConfirmBeforeSubmit, %SettingsIniFilepath%, %ScriptSettingsSection%, ConfirmBeforeSubmit, 1
+IniRead, AutoUpdateCheck, %SettingsIniFilepath%, %ScriptSettingsSection%, AutoUpdateCheck, 1



@@ -163,23 +169,26 @@ ButtonHeights := 30

 ThumbnailPreviewWidth := 200

-GuiHeight := 450
+GuiHeight := 440

 ; Column One
-ColumnOneWidth := 400
+ColumnOneWidth := 500

 ColumnOneEditBoxWidth := ColumnOneWidth - (MarginSize * 2)
-GuiFontSize = 10
+ColumnOneEditBoxHalfWidth := (ColumnOneEditBoxWidth / 2) + 5
+
+
+GuiFontSize = 15

 ; Column Two
 ColumnTwoXPosition := ColumnOneWidth + (MarginSize * 2)
 ColumnTwoEditBoxWidth := 200
-
+ColumnTwoEditBoxHalfWidth := ColumnTwoEditBoxWidth / 2



 ; Results Screen
-ResultButtonWidth := 150
+ResultButtonWidth := 250
 ResultButtonEditWidth := 250
 ResultButtonHeights := 30

@@ -194,27 +203,43 @@ Gui, Font, s%GuiFontSize%


 Gui, Font, Bold
+Gui, Font, s8
 Gui, Add, Text,, Title
 Gui, Font, Normal
+Gui, Font, s%GuiFontSize%
 Gui, Add, Edit,w%ColumnOneEditBoxWidth% vLivestreamTitle, %LivestreamTitle%

 Gui, Font, Bold
+Gui, Font, s8
 Gui, Add, Text,, Description
 Gui, Font, Normal
+Gui, Font, s%GuiFontSize%
 Gui, Add, Edit,w%ColumnOneEditBoxWidth% h150 vLivestreamDescription, %LivestreamDescription%

 Gui, Font, Bold
-Gui, Add, Text,, Tags
+Gui, Font, s8
+Gui, Add, Text,, Tags (Comma Seperated)
 Gui, Font, Normal
+Gui, Font, s%GuiFontSize%
 Gui, Add, Edit,w%ColumnOneEditBoxWidth% vLivestreamTags, %LivestreamTags%


+
 Gui, Font, Bold
+Gui, Font, s8
 Gui, Add, Text,, Thumbnail
-Gui, Font, Normal
 Gui, Add, Button, x+%MarginSize% yp-3 gSelectThumbnail, Select
+Gui, Font, Normal
+Gui, Font, s%GuiFontSize%
 Gui, Add, Picture, x%MarginSize% w%ThumbnailPreviewWidth% h-1 vThumbnailPreview, %LivestreamThumbnail%

+Gui, Font, Bold
+Gui, Font, S10
+Gui, Add, Button, x%ColumnOneEditBoxHalfWidth%  yp-%marginsize% w%ColumnOneEditBoxHalfWidth% h40 gSaveAsTemplate, Save As Template
+Gui, Add, Button,gSchedulePost w%ColumnOneEditBoxHalfWidth% gLoadTemplate h40 , Load Template
+
+
+; Gui, Add, Button, yp+0 x%ColumnOneEditBoxHalfWidth% w%ColumnOneEditBoxHalfWidth%, Text button here


 ; Gui, Add, Edit,w%ColumnOneEditBoxWidth% h150 vLivestreamDescription, This livestream is happening soon!
@@ -226,47 +251,71 @@ Gui, Add, Picture, x%MarginSize% w%ThumbnailPreviewWidth% h-1 vThumbnailPreview,
 ; ------------------------------------------------
 Gui, Font, s%GuiFontSize%
 Gui, Font, Bold
-; Gui, Add, Text,  , Settings
 Gui, Add, Text,y0 x%ColumnTwoXPosition%, Settings
 Gui, Font, Normal
-Gui, Add, Checkbox, vConfirmBeforeSubmit checked, Confirm Before Submit
+Gui, Font, s8
+Gui, Add, Checkbox, vConfirmBeforeSubmit checked%ConfirmBeforeSubmit%, Confirm Before Submit
+Gui, Add, Checkbox, vAutoUpdateCheck Checked%AutoUpdateCheck%, Auto Update Check
+
+if(UpdateAvailable){
+	Gui, Add, Button, cRed w%ColumnTwoEditBoxWidth% gUpdateScript vUpdateAvailable center, Update Available!
+}
+else, {
+	Gui, Add, Button, w%ColumnTwoEditBoxWidth% gUpdateScript vUpdateAvailable center, No Updates Available
+}


 Gui, Font, s%GuiFontSize%
 Gui, Font, Bold
 ; Gui, Add, Text,  , Settings
-Gui, Add, Text, y+%MarginSizeDoubled%, Date and Time of Livestream
+Gui, Add, Text, y+%MarginSizeDoubled% , Date and Time
 Gui, Font, Normal

 Gui, Add, DateTime, vLivestreamDate w%ColumnTwoEditBoxWidth%, MM/dd/yyyy
 Gui, Add, DateTime, vLivestreamTime w%ColumnTwoEditBoxWidth% Choose200505311900, Time
-Gui, Add, Button, gSetLivestreamTimeMorning,Morning
-Gui, Add, Button,yp+0 x+%MarginSize% gSetLivestreamTimeMorning,Evening
+Gui, Font, s8
+Gui, Font, Normal
+Gui, Add, Button, gSetLivestreamTimeMorning yp+35 w%ColumnTwoEditBoxHalfWidth%,Morning
+Gui, Add, Button,yp+0 x+0 gSetLivestreamTimeMorning w%ColumnTwoEditBoxHalfWidth%,Evening

+
+Gui, Font, s%GuiFontSize%
 Gui, Font, Bold
-Gui, Add, Text,y+%MarginSizeDoubled% x%ColumnTwoXPosition%, Platform to Schedule On
+Gui, Add, Text,y+%MarginSizeDoubled% x%ColumnTwoXPosition%, Platforms
 Gui, Font, Normal

 ; Gui, Add, Checkbox,, Dlive
-Gui, Add, Checkbox, checked vLocals, Locals
-; Gui, Add, Checkbox,checked vOdysee, Odysee

-Gui, Font, Bold
-Gui, Add, Button,gSchedulePost w%ColumnTwoEditBoxWidth% y+50 gSaveAsTemplate, Save as Template
-Gui, Add, Button,gSchedulePost w%ColumnTwoEditBoxWidth% gLoadTemplate, Load Template
+
+Gui, Add, Checkbox,checked vOdysee, Odysee
+Gui, Add, Checkbox, x+%marginSize% yp+0 checked vLocals, Locals
+Gui, Add, Checkbox,x%ColumnTwoXPosition% y+%marginsize% checked vRumble, Rumble
+Gui, Font, S8
+Gui, Add, Checkbox, x+10 yp+5 Checked vInputRumbleCustomRTMP,  Input RTMP
+

 Gui, Font, s15
-Gui, Add, Button,gSchedulePost w%ColumnTwoEditBoxWidth% h40 y+50, Schedule
-Gui, Font, Normal
+Gui, Add, Button, x%ColumnTwoXPosition% y+%marginsizeDoubled% gSchedulePost w%ColumnTwoEditBoxWidth% h40, Schedule
+; Gui, Font, Normal
+
+Gui, Show, h%GuiHeight%, %FullScriptName%
+
+
+
+;---Check for Updates---
+;------------------------------------------------
+if(AutoUpdateCheck AND !UpdateAvailable){
+	SetTimer, CheckForUpdates, -1000
+}
+

-Gui, Show, h%GuiHeight%
 Return



 SetLivestreamTimeMorning:
 if(A_GuiControl = "Morning")
-GuiControl, , LivestreamTime, 200505311130
+GuiControl, , LivestreamTime, 200505311100
 if(A_GuiControl = "Evening")
 GuiControl, , LivestreamTime, 200505311900
 Return
@@ -339,6 +388,13 @@ Return
 SchedulePost:
 Gui, submit, NoHide

+
+; Save Settings.ini
+; ------------------------------------------------
+IniWrite, %ConfirmBeforeSubmit%, %SettingsIniFilepath%, %ScriptSettingsSection%, ConfirmBeforeSubmit
+IniWrite, %AutoUpdateCheck%, %SettingsIniFilepath%, %ScriptSettingsSection%, AutoUpdateCheck
+
+
 ; Re-use an existing errorlog or create new directory
 if(InStr(PassedInArgument, "\ErrorLogging\"))
 CreateErrorLoggingFiles(PassedInArgument)
@@ -371,10 +427,20 @@ if(Locals){
 	Gosub, LocalsSchedule
 }

+if(Rumble)
+gosub, RumbleSchedule
+
+
+if(InputRumbleCustomRTMP){
+	gosub, RumbleSetRTMP
+}
+
 ; msgbox, done!

 ; Gui, Add, 

+ToolTip ; hide any existing tooltips
+
 Gui, Destroy


@@ -392,24 +458,42 @@ Gui, Destroy
 ; ------------------------------------------------
 IniRead, LocalsRTMPURL, %PostStatusesFilepath%, Livestream,LocalsRTMPURL, %A_Space%
 IniRead, LocalsRTMPKey, %PostStatusesFilepath%, Livestream,LocalsRTMPKey, %A_Space%
-IniRead, LivestreamURL, %PostStatusesFilepath%, Livestream,LivestreamURL, %A_Space%
+IniRead, LocalsLivestreamURL, %PostStatusesFilepath%, Livestream,LocalsLivestreamURL, %A_Space%

+IniRead, OdyseeLivestreamURL, %PostStatusesFilepath%, Livestream,OdyseeLivestreamURL, %A_Space%
+IniRead, RumbleLivestreamURL, %PostStatusesFilepath%, Livestream,RumbleLivestreamURL, %A_Space%


 Gui, Font, Bold
 Gui, Font, s%GuiFontSize%

-Gui, Add, Button, x10 y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, Locals URL
-Gui, Add, Edit, x+5 yp+0  h%ResultButtonHeights% w%ResultButtonEditWidth% vLivestreamURL center, %LivestreamURL%
-
-Gui, Add, Button, x10 y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, Locals RTMP URL
+Gui, Add, Button,x%MarginSize% y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, Locals RTMP URL
 Gui, Add, Edit, x+5 yp+0  h%ResultButtonHeights% w%ResultButtonEditWidth% vLocalsRTMPURL center, %LocalsRTMPURL%

-Gui, Add, Button, x10 y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, Locals RTMP Key
+Gui, Add, Button, x%MarginSize% y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, Locals RTMP Key
 Gui, Add, Edit, x+5 yp+0  h%ResultButtonHeights% w%ResultButtonEditWidth% vLocalsRTMPKey center, %LocalsRTMPKey%

+Gui, Add, Button, x%MarginSize% y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, Locals URL
+Gui, Add, Edit, x+5 yp+0  h%ResultButtonHeights% w%ResultButtonEditWidth% vLocalsLivestreamURL center, %LocalsLivestreamURL%

-Gui, Add, Button, gRetryUpload h%ResultButtonHeights% w%ResultButtonEditWidth%,Try Failed Again
+Gui, Add, Button, x%MarginSize% y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, Odysee URL 
+Gui, Add, Edit, x+5 yp+0  h%ResultButtonHeights% w%ResultButtonEditWidth% vOdyseeLivestreamURL center, %OdyseeLivestreamURL%
+
+Gui, Add, Button, x%MarginSize% y+10 h%ResultButtonHeights% w%ResultButtonWidth% gResultsGUIAction, Rumble URL 
+Gui, Add, Edit, x+5 yp+0  h%ResultButtonHeights% w%ResultButtonEditWidth% vRumbleLivestreamURL center, %RumbleLivestreamURL%
+
+
+Gui, Add, Button, x%MarginSize% y+50 gResultsGUIAction h%ResultButtonHeights% w%ResultButtonEditWidth%,Copy Title
+Gui, Add, Button, x+%marginsize% gResultsGUIAction h%ResultButtonHeights% w%ResultButtonEditWidth%,Copy Description
+Gui, Add, Button, x%MarginSize% h%ResultButtonHeights% w%ResultButtonEditWidth%,
+Gui, Add, Button, x+%marginsize% gRetryUpload h%ResultButtonHeights% w%ResultButtonEditWidth%,Try Failed Again
+
+Gui, Font, s8
+Gui, Font, Normal
+Gui, Add, Button, y%MarginSize% w%ResultButtonEditWidth% Center, Error Log
+Gui, Add, Edit,  y+5 h300 w%ResultButtonEditWidth%, %ErrorLogVar%
+
+; Gui, Add, Button, x%MarginSize% gRetryUpload h%ResultButtonHeights% w%ResultButtonEditWidth%,Try Failed Again

 Gui, Show

@@ -426,8 +510,23 @@ Message = Copying %A_GuiControl% to Clipboard
 SaveOrPostProgress(Message:=Message,PostType:="Tooltip")


+if(A_GuiControl = "Copy Title"){
+	Clipboard := LivestreamTitle
+}
+if(A_GuiControl = "Copy Description"){
+	Clipboard := LivestreamDescription
+}
+
+if(A_GuiControl = "Rumble URL"){
+	Clipboard := RumbleLivestreamURL
+}
+
+if(A_GuiControl = "Odysee URL"){
+	Clipboard := OdyseeLivestreamURL
+}
+
 if(A_GuiControl = "Locals URL"){
-	Clipboard := LivestreamURL
+	Clipboard := LocalsLivestreamURL
 }

 if(A_GuiControl = "Locals RTMP URL"){
@@ -455,11 +554,17 @@ Return



-
+; GoSubs for Selenium Automation
+; ------------------------------------------------
 #Include %A_ScriptDir%\Modules\Locals-Schedule.ahk
-
-
 #Include %A_ScriptDir%\Modules\Odysee-Schedule.ahk
+#Include %A_ScriptDir%\Modules\Odysee-Grab-URL.ahk
+#Include %A_ScriptDir%\Modules\Rumble-Schedule.ahk
+#Include %A_ScriptDir%\Modules\Rumble-Set-RTMP.ahk
+
+
+
+#Include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\Update-Functions.ahk


 ; Misc
--- a/Lib/Freedomain-Posters-Shared-Functions
+++ b/Lib/Freedomain-Posters-Shared-Functions
--- a/Modules/Locals-Check-Login-Status.ahk
+++ b/Modules/Locals-Check-Login-Status.ahk
@@ -7,8 +7,8 @@ Try, PageURL := driver.Url
 if(InStr(PageURL, "/register"))
 {
 	LoginPageURL := LocalsPostPageURL . "/login"
-	Message = Website Login Expired. Trying to log back in. Navigating to: %LoginPageURL%
+	Message = Website Login Expired. Please log back in and then try again.
 	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
 	try, driver.Get(LoginPageURL)	;Open selected URL
-
+	Return
 }
--- a/Modules/Locals-Schedule.ahk
+++ b/Modules/Locals-Schedule.ahk
@@ -34,9 +34,14 @@ CheckForAlerts()
 ; Input Title and Description into Create a Livestream - First Screen
 ; ------------------------------------------------
 Xpath = //input[@id='title']
-; try, driver.FindElementByXPath(Xpath).SendKeys("TEST STRINGHERE")

 Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=LivestreamTitle)
+if(Status){
+	Message = Failed to input Livestream Title
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+	Return
+}
+

 Xpath = //textarea[@id='body']
 Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=LivestreamDescription)
@@ -50,7 +55,7 @@ Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000
 ; Create a Livestream - Second Screen
 ; ------------------------------------------------
 ; check if "Schedule Livestream" checkbox is checked, check it if not
-LivestreamScheduledCheckbox := driver.findElementByID("is_scheduled_livestream").isSelected()   ;Checks if a checkbox is ticked or not and saves it to a variable, usually: 0 = Unchecked,  -1 = Checked
+try, LivestreamScheduledCheckbox := driver.findElementByID("is_scheduled_livestream").isSelected()   ;Checks if a checkbox is ticked or not and saves it to a variable, usually: 0 = Unchecked,  -1 = Checked
 if(LivestreamScheduledCheckbox = 0){
 	Xpath = //label[normalize-space()='Schedule this live stream?']
 	Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
@@ -63,12 +68,12 @@ if(LivestreamScheduledCheckbox = 0){
 }

 ; Make sure the "Notify Users" checkbox is checked
-NotifyUsersCheckbox := driver.findElementByID("is_do_promo").isSelected()   ;Checks if a checkbox is ticked or not and saves it to a variable, usually: 0 = Unchecked,  -1 = Checked
+try, NotifyUsersCheckbox := driver.findElementByID("is_do_promo").isSelected()   ;Checks if a checkbox is ticked or not and saves it to a variable, usually: 0 = Unchecked,  -1 = Checked
 if(NotifyUsersCheckbox = 0){
 	Xpath = //label[@for='is_do_promo']
 	Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)

-	NotifyUsersCheckbox := driver.findElementByID("is_do_promo").isSelected()
+	try, NotifyUsersCheckbox := driver.findElementByID("is_do_promo").isSelected()
 	if(NotifyUsersCheckbox = 0){
 		Message = Failed to select the "Notify Users" checkbox
 		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
@@ -90,6 +95,39 @@ try, driver.FindElementByXPath(Xpath).SendKeys(driver.Keys.BackSpace).SendKeys(d
 Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=LocalsLivestreamTime)


+
+
+; Upload Custom Thumbnail
+; ------------------------------------------------
+
+if(Livestreamthumbnail){
+	Message = Uploading Thumbnail
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
+
+	; this `label` element is a child of the thumbnail input element.
+	xpath = (//label[@id='photo-upload-btn'])[2]
+
+	; the element ID for input elements seems to change/be generated each time the page is generated
+	XpathIDForUploads := GetHTMLValueFromXpathOuterHTML(XPATH, "label for")
+
+	if(XpathIDForUploads = "Failed"){
+		Message = Failed to grab element needed for uploading thumbnail. Please attach thumbnail manually.
+		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+		Return
+	}
+
+	ThubmnailInputXpath = (//input[@id='%XpathIDForUploads%'])[1]
+	Status := Selenium_LoopToSendValueToXpath(Xpath:=ThubmnailInputXpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=Livestreamthumbnail)
+	if(Status){
+		Message = Failed to upload livestream thumbnail
+		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+		Return
+	}
+
+	Sleep, 2000
+}
+
+
 if(ConfirmBeforeSubmit){
 	OnMessage(0x44, "OnMsgBoxUserConfirmation")
 	MsgBox 0x21, User Confirmation, Please check that all data was input correctly and fix any mistakes and then click PROCEED to finalize the Upload.`n`nClick STOP to cancel the rest of this Upload and move on to the next website.
@@ -121,7 +159,12 @@ if(!InStr(LivestreamURL, "https")){
 	; @todo
 }

-; Navigate to the post
+
+
+
+
+; Navigate to the Post and Grab the URL
+; ------------------------------------------------
 Message = Navigating to Livestream Page to grab RTMP Settings
 SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")

--- a/Modules/Odysee-Grab-URL.ahk
+++ b/Modules/Odysee-Grab-URL.ahk
@@ -0,0 +1,154 @@
+
+OdyseeGrabURL:
+Iniread, OdyseeURLSLUG, %PostStatusesFilepath%, Livestream,OdyseeURLSLUG, %A_Space%
+
+if(OdyseeURLSLUG = ""){
+	Message = OdyseeURLSLug is empty in the Livestream.ini file.
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+	Return
+}
+
+
+Status := NavigateFromBaseURLTo("https://odysee.com/$/livestream")
+if(Status)
+Return
+
+; click on Local Setup button to switch windows
+Xpath = //span[contains(text(),'Local Setup')]
+Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
+
+
+Xpath = //label[normalize-space()='Stream server']
+try, Status := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
+
+if(!Status){
+	Message = Failed to switch to "Stream Server" page
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+	Return
+}
+
+
+
+/*
+Message = Waiting for Livestream Created Confirmation Popup
+SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
+
+Xpath = //h2[normalize-space()='Livestream Created']
+
+Loop, 60 {
+
+	try, Status := ElementInnerText := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
+	if(Status = "Livestream Created")
+	break
+	else, {
+		sleep, 1000
+		Continue
+	}
+
+}
+
+*/
+
+Message = Grabbing Livestream URL from Livestream Settings Page
+SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
+/*
+		; Grab and Format the livestream URL
+		Xpath = //li[@role='link']
+		Loop, 60 {
+			URLSLUG := GetHTMLValueFromXpathOuterHTML(XPATH, "href")
+			if(URLSLug = "Failed"){
+				Message = Failed to Grab URL SLug from confirmation popup
+				SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+				Return
+			}
+			; Msgbox % "URLSLug: " URLSLug
+			if(InStr(URLSLug, OdyseeLivestreamSlug))
+				break
+
+			if(A_Index = 60){
+				Message = Odysee did not generate permanant livestream URL after 1 minute of waiting. Congestion Issues?
+				SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+				Return
+			}
+
+			sleep, 1000
+
+		}
+		*/
+		/*; Message = 
+		Xpath = //span[contains(text(),'View Livestream Settings')]
+		Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=5,SleepLength:=1000)
+		if(Status){
+			Message = Failed to click on View Livestream Settigns Button
+			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+			Return
+		}
+
+		; Double check that we're on the right page.
+		Xpath = //label[normalize-space()='Stream server']
+		try InnerText := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
+		if(InnerText != "Stream server"){
+			Message = Failed to Navigate to View Livestream Settings Page
+			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+			Return
+		}
+
+
+		*/
+
+
+		Message = Waiting for Livestream to get confirmed and URL to be generated`nWill Give up after 5 minutes
+		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
+
+
+		Xpath = //div[@class='section']//li[1]
+		Loop, 100 {
+
+			if(A_Index = 100){
+				Message = Failed to grab URL after 5 minutes of waiting.
+				SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+				Return
+			}
+
+			Try ElementOuterHTML := driver.findelementbyxpath(Xpath).Attribute("outerHTML") ;XPATH-ID & Tag
+
+			if(!InStr(ElementOuterHTML, OdyseeURLSLUG)){
+				Sleep, 5000
+				Continue
+				; Message = Failed to Grab Livestream URL. Please copy and paste it manually.
+				; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+				; return
+
+			}
+			else, {
+				break
+			}
+
+		}
+		; Clipboard := OdyseeURLSLUG
+		; Msgbox % "OdyseeURLSLUG: " OdyseeURLSLUG
+		; Clipboard := ElementOuterHTML
+		; Msgbox % "ElementOuterHTML: " ElementOuterHTML
+
+
+
+
+
+		Xpath = //div[@class='section']//li[1]
+		URLSLUG := GetHTMLValueFromXpathOuterHTML(XPATH, "href")
+		if(URLSLUG = "Failed"){
+			Message = Failed to Grab Livestream URL from outerHTML of livestream element.
+			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+			Return
+		}
+
+		OdyseeLivestreamURL := "https://odysee.com" . URLSLug
+		; Msgbox % "OdyseeLivestreamURL: " OdyseeLivestreamURL
+
+		; Message = URL Slug Grabbed from Confirmation Popup: %URLSLug%
+		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
+
+		; OdyseeLivestreamURL := "https://odysee.com" . URLSLug
+
+
+		IniWrite, %OdyseeLivestreamURL%, %PostStatusesFilepath%, Livestream,OdyseeLivestreamURL
--- a/Modules/Odysee-Schedule.ahk
+++ b/Modules/Odysee-Schedule.ahk
@@ -41,6 +41,11 @@ if(InStr(Status, "Clear")){
 FormatTime, OdyseeLivestreamDate , %LivestreamDate%, MM-dd-yyyy ; _hhmmss 
 OdyseeLivestreamSlug := "livestream-" . OdyseeLivestreamDate
 OdyseeURLSLUG := LBRYCMDTextReplacement(OdyseeLivestreamSlug)
+IniWrite, %OdyseeURLSLUG%, %PostStatusesFilepath%, Livestream,OdyseeURLSLUG
+
+Xpath = (//div[@class='form-field__prefix'])[1]
+try OdyseeChannelURL := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
+

 Message = Inputting Livestream Information
 SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
@@ -235,103 +240,8 @@ Xpath = //button[@aria-label='Confirm']//span[@class='button__content']
 Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=5,SleepLength:=1000)


-Message = Waiting for Livestream Created Confirmation Popup
-SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
-
-Xpath = //h2[normalize-space()='Livestream Created']
-
-Loop, 60 {
-
-	try, Status := ElementInnerText := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
-	if(Status = "Livestream Created")
-	break
-	else, {
-		sleep, 1000
-		Continue
-	}
-
-}
-
-
-Message = Grabbing Livestream URL from Livestream Settings Page
-SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
-/*
-		; Grab and Format the livestream URL
-		Xpath = //li[@role='link']
-		Loop, 60 {
-			URLSLUG := GetHTMLValueFromXpathOuterHTML(XPATH, "href")
-			if(URLSLug = "Failed"){
-				Message = Failed to Grab URL SLug from confirmation popup
-				SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-				Return
-			}
-			; Msgbox % "URLSLug: " URLSLug
-			if(InStr(URLSLug, OdyseeLivestreamSlug))
-				break
-
-			if(A_Index = 60){
-				Message = Odysee did not generate permanant livestream URL after 1 minute of waiting. Congestion Issues?
-				SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-				Return
-			}
-
-			sleep, 1000
-
-		}
-		*/
-		; Message = 
-		Xpath = //span[contains(text(),'View Livestream Settings')]
-		Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=5,SleepLength:=1000)
-		if(Status){
-			Message = Failed to click on View Livestream Settigns Button
-			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-			Return
-		}
-
-		; Double check that we're on the right page.
-		Xpath = //label[normalize-space()='Stream server']
-		try InnerText := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
-		if(InnerText != "Stream server"){
-			Message = Failed to Navigate to View Livestream Settings Page
-			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-			Return
-		}
-
-
-
-		Xpath = //div[@class='section']//li[1]
-		Try ElementOuterHTML := driver.findelementbyxpath(Xpath).Attribute("outerHTML") ;XPATH-ID & Tag
-		; Clipboard := OdyseeURLSLUG
-		; Msgbox % "OdyseeURLSLUG: " OdyseeURLSLUG
-		; Clipboard := ElementOuterHTML
-		; Msgbox % "ElementOuterHTML: " ElementOuterHTML
-
-
-		if(!InStr(ElementOuterHTML, OdyseeURLSLUG)){
-			Message = Failed to Grab Livestream URL. Please copy and paste it manually.
-			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-			return
-
-		}
-
-
-		Xpath = //div[@class='section']//li[1]
-		URLSLUG := GetHTMLValueFromXpathOuterHTML(XPATH, "href")
-		if(URLSLUG = "Failed"){
-			Message = Failed to Grab Livestream URL from outerHTML of livestream element.
-			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-			Return
-		}
-
-		OdyseeLivestreamURL := "https://odysee.com" . URLSLug
-		; Msgbox % "OdyseeLivestreamURL: " OdyseeLivestreamURL
-
-		; Message = URL Slug Grabbed from Confirmation Popup: %URLSLug%
-		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
-
-		; OdyseeLivestreamURL := "https://odysee.com" . URLSLug
-
-
+OdyseeLivestreamURL := "https://" . OdyseeChannelURL .  OdyseeURLSLUG
+; OdyseeURL := "https://" . OdyseeURL
 IniWrite, %OdyseeLivestreamURL%, %PostStatusesFilepath%, Livestream,OdyseeLivestreamURL


--- a/Modules/Rumble-Schedule.ahk
+++ b/Modules/Rumble-Schedule.ahk
@@ -1,5 +1,5 @@

-RumbleUpload:
+RumbleSchedule:
 ;------------------------------------------------

 CurrentSite := "Rumble"
@@ -38,326 +38,279 @@ if(InStr(CurrentURL, "/sso/auth/consent")){



-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-try CurrentURL := driver.URL
-if(InStr(CurrentURL, "/login.php")){
-
-	if(AutoLogin){
-		Message = Logging in Automatically by clicking into the UN+PW fields for info to register
+; Schedule New Stream
+; ------------------------------------------------
+Message = Scheduling new stream and inputting information
 SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")

-		; have to click into username and password field for page to register that there's input
-		; clicking with JS doesn't make it register, but with xpath selenium it does
-		Xpath = //input[@id='login-username']
-		driver.FindElementByXPath(Xpath).click()
-
-		Xpath = //input[@id='login-password']
-		driver.FindElementByXPath(Xpath).click()
+; Schedule new stream
+; Schedule a stream button
+Xpath = //div[normalize-space()='Schedule a stream']
+Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)


-		js = document.querySelector("button[type='submit']").click(); 
-		driver.executeScript(js)
-
-
-		; Do a double check to make sure that login worked
-		Message = Checking Login Status
+Xpath = (//h2[normalize-space()='Select a template (optional)'])
+try ElementInnerText := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
+if(!ElementInnerText){
+	Message = Templates Subwindow did not show up
 	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
-
-		try CurrentURL := driver.URL
-
-		if(!InStr(CurrentURL, "/upload")){
-			Message = Failed to log back in. Please Log Back In Manually
-			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-			SaveDriverURLOFErrorPage()
 	Return
 }


-	} 
-	else, { ; notify user and return
-		Message = Login Expired. Please Log Back in
-		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-		SaveDriverURLOFErrorPage()
-		Return
-	}

-	Message = Waiting 5 seconds for page to fully load
-	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
-	sleep, 5000
-}

-; CheckForAlerts()
+loop, 3 {
+	Xpath = (//div[@class='flex items-center justify-between gap-x-8 p-4 bg-indigo rounded-xl'])[%A_Index%]
+	try, ElementText := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text

-Message = Uploading Video File
-SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
-; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
-
-Xpath = //input[@id='Filedata']
-Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=VideoFilepath)
+	; use the template with "Freedomain Livestream in the name"
+	if(InStr(ElementText, "Freedomain Livestream")){
+		Xpath = (//span[contains(text(),'Select')])[1]
+		Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
 		if(Status){
-	try, CurrentURL := GetCurrentTabURlBase()
-	Message = Failed to Upload Video File`nCurrent Tab URL: %CurrentURL%
-	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-	SaveDriverURLOFErrorPage()
-	Return
-}
-
-
-; Input Title
-try driver.findElementsByName("title").item[1].SendKeys(VideoTitle)     ;selects element based on Name and sends variable to it.
-catch e {
-	Message = Video Upload Failed, Please Check Login Status
-	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-	SaveDriverURLOFErrorPage()
-	Return
-}
-; Input Description
-Loop, 5 { ; Attempt to input video description a couple of times
-	TooltipThis("Inputting Description `nAttempt Number: " A_index)
-
-	status := js_SendAndCheckWithID(Element:="description",ValueToCheck:="value",SleepLength:=3000,JSStringText:=JSVideoDescription)
-	if(!Status)
-	Break
-
-/*	if(A_index = 5){
-		Clipboard := VideoDescription
-		Message = Unable to Input Video Description`nDescription copied to clipboard, please paste it in at your earliest convenience. 
+			Message = Failed to Select Livestream Template
 			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
 			Return
 		}
-
-	js = document.getElementsByName('description')[1].value = "%JSVideoDescription%";  ; Send content through javascript (Great for getting around emoji chrome limitaitons)
-	try driver.executeScript(js)    ;Executes a Javascript on the webpage, mostly used for buttons.
-
-	try Description := driver.findElementsByName("description").item[2].Attribute("value") ;XPath: ID=site-title & span tag
-	if(Description != "")
-	Break
-	sleep, 2000
-	*/
 	}

-
-
-
-; sleep, 5000
-
-
-Message = Selecting Channel
-SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
-
-
-
-; try driver.findElementsByID("channelId").item[1].click()
-
-; @todo replace with regex
-js = return document.querySelector("#channelId").innerHTML; 
-try, ChannelIDNumber := driver.executeScript(js)
-; Msgbox % "ChannelIDNumber: " ChannelIDNumber
-ChannelIDNumber := StrSplit(ChannelIDNumber, "option value=")
-
-; Msgbox % "ChannelIDNumber: " ChannelIDNumber
-
-ChannelIDNumber := ChannelIDNumber[3]
-; Msgbox % "ChannelIDNumber: " ChannelIDNumber
-
-SingleQuote = "
-ChannelIDNumber := StrSplit(ChannelIDNumber, "data-private")
-ChannelIDNumber := ChannelIDNumber[1]
-ChannelIDNumber := StrReplace(ChannelIDNumber, SingleQuote, "")
-ChannelIDNumber := StrReplace(ChannelIDNumber, " ", "")
-
-; Msgbox % "ChannelIDNumber: " ChannelIDNumber
-
-
-; js = return document.querySelector("#channelId").value; 
-; try, ChannelIDNumber := driver.executeScript(js)
-; Msgbox % "ChannelIDNumber: " ChannelIDNumber
-if(ChannelIDNumber = ""){
-	Message = ChannelIDNumber is blank. Unable to select Upload Channel
-	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-	SaveDriverURLOFErrorPage()
-	Return
 }

+; input thumbnail
+if(Livestreamthumbnail){

-ChannelIDNumber = 6070526 ; freedomain
-; ChannelIDNumber = 762377 ; personal
-
-Xpath = //option[@value='%ChannelIDNumber%']
-try driver.FindElementByXPath(Xpath).click()
-catch e {
-	Message = Failed to click on Channel using %ChannelIDNumber%.
-	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-	SaveDriverURLOFErrorPage()
-	Return
-	; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-	; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
-}
-
-
-
-; Input Tags
-Message = Inputting Tags
-SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
-
-try driver.findElementsByName("tags").item[1].SendKeys(VideoTags)     ;selects element based on Name and sends variable to it.
-
-
-
-; Custom Thumbnail
-if(VideoThumbFilepath != "") {
-	TooltipThis("Uploading Thumbnail")
-	Xpath = //input[@name='customThumb']
-	Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=VideoThumbFilepath)
+	Xpath = //input[@id='room-thumbnail']
+	Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=Livestreamthumbnail)
 	if(Status){
-		Message = Failed to Upload Thumbanil
+		Message = Faied to upload custom thubmanil
 		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+		Return
+	}
 }


-	; @todo: Add a check to see if progress gets stuck
-	; Check Upload Percentage
-	TooltipThis("Waiting for Video to Finish Uploading")
-	Loop, %Number_of_loops_to_Check_Upload_status% {
-		sleep, %Time_Between_Loops_Upload_Status%

-		jscheck = return document.getElementsByClassName('num_percent')[0].textContent;
-		try RumbleUploadPercent := driver.executeScript(jsCheck)
+; input Livestream Title
+Xpath = //input[@placeholder='Give your stream a name']
+Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=LivestreamTitle, ClearElement:=1)

-		; try RumbleUploadPercent := driver.findelementbyxpath(Xpath).Attribute("textContent") 
-		RumbleUploadPercent := StrSplit(RumbleUploadPercent, " ")
-		RumbleUploadPercent := RumbleUploadPercent[1]
+; input Livestream Description
+Xpath = //textarea[@placeholder='Tell the audience more about your stream']
+Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=LivestreamDescription, ClearElement:=1)

-		if(InStr(RumbleUploadPercent, "100%")) ; once variable contains 100%, then we can break out of loop and continue
+
+
+; Input Date & Time
+; ------------------------------------------------
+; Create variables with time and date of timestream
+FormatTime, RumbleLivestreamDate , %LivestreamDate%, dddd, MMMM
+FormatTime, LivestreamOrdinalDay , %LivestreamDate%, d
+FormatTime, RumbleLivestreamYear , %LivestreamDate%, yyyy
+
+LivestreamOrdinalDay := GetDateOrdinalSuffix(LivestreamOrdinalDay)
+; Msgbox % "LivestreamOrdinalDay: " LivestreamOrdinalDay
+
+RumbleLivestreamDate := RumbleLivestreamDate . " " . LivestreamOrdinalDay . ", " . RumbleLivestreamYear
+; Msgbox % "RumbleLivestreamDate: " RumbleLivestreamDate
+; Msgbox % "RumbleLivestreamDate: " RumbleLivestreamDate
+
+
+FormatTime, RumbleLivestreamTime , %LivestreamTime%, h:mm tt
+; Msgbox % "RumbleLivestreamTime: " RumbleLivestreamTime
+; FormatTime, RumbleLivestreamYear , %LivestreamDate%, yyyy
+
+; click on box to open time picker dialogue
+Xpath = //input[@placeholder='Pick a time']
+Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
+
+; generate xpath based on date and click element
+Xpath = //div[@aria-label='Choose %RumbleLivestreamDate%']
+Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
+if(Status){
+	Message = Failed to select date from popup menu using generated xpath.`nXpath = %Xpath%
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+	Return
+}
+
+; generate xpath based on time and click element
+Xpath = //li[normalize-space()='%RumbleLivestreamTime%']
+Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
+if(Status){
+	Message = Failed to select time from popup menu using generated xpath.`nXpath = %Xpath%
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+	Return
+}
+
+
+
+; Select Channel for Upload
+; ------------------------------------------------
+; click channel dropdown
+Xpath = //span[@class='text-light truncate text-mini']
+Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
+if(Status){
+	Message = Failed to click on Channel dropdown menu
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+	Return
+}
+
+; Grab inner text of all items in the channel select drop down menu
+xpath = (//div[@class='shadow-md rounded-lg overflow-x-hidden bg-indigo'])[1]
+try ElementInnerText := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
+
+; pull out name of first channel in dropdown
+FirstChannelName := StrSplit(ElementInnerText, "`n")[1]
+
+Xpath = (//span[normalize-space()='%FirstChannelName%'])[1]
+Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
+if(Status){
+	Message = Failed to select the channel -%FirstChannelName%- from Channel dropdown menu
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+	return
+}
+
+
+
+; Select each Secondary Platform checkbox
+; ------------------------------------------------
+IniRead, RumbleSecondaryPlatformsList, %SettingsIniFilepath%, %ScriptSettingsSection%, RumbleSecondaryPlatforms, %A_Space%
+
+if(RumbleSecondaryPlatformsList = ""){
+	; if variable is empty, get all items in the list and write them to .ini file
+	Loop, 10 {
+
+		IndexPlusOne := A_index + 1
+		Xpath = (//div[@class='flex shrink-0 items-center gap-x-4'])[%A_index%]
+		XpathCheckbox = (//div[@class='relative shrink-0'])[%IndexPlusOne%]
+
+		try SecondaryPlatformCheckboxName := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
+
+		RumbleSecondaryPlatformsList .= SecondaryPlatformCheckboxName . "--"
+
+		if(SecondaryPlatformCheckboxName = "Add new destination" OR SecondaryPlatformCheckboxName = ""){
 			Break
-
-
-		Status := Check_For_Stuck_Video_Upload(A_index, RumbleUploadPercent)
-		if(Status = "Failed")
-		Return
-		; if(HasVal(Array_Index_Num_of_Upload_StatusChecks, A_index)) { ; 30 minutes and 60 minutes - send a notification message
-			; 	Message = Upload Progress: %RumbleUploadPercent%
-			; 	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")  
-			; }
-
 		}
-
-		; Msgbox % "RumbleUploadPercent: " RumbleUploadPercent
-
-		; Click on one of the video thumbnail options first
-		; Seems to be a bug on rumble, in order to be able to select a custom thumb through js, gotta select on of the generated ones first.
-		; Xpath = /html/body/main/div/div/div/section/form[1]/div/div[2]/div[3]/a[2] ; thumbnail option #3
-		; try driver.FindElementByXPath(Xpath).click()    ;Clicks on Xpath based on variable.
-
-
-
-
-/*	
-	js = document.getElementById('customThumb').click(); 
-	driver.executeScript(js)    ;Executes a Javascript on the webpage, mostly used for buttons.
-	Status := InputFilePathIntoOpenWindow(VideoThumbFilepath)
-	if(Status)
-	{
-		Message = Upload Failed:`nUnable to Find "Open File" window to input filepath into
-		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-		Return
 	}
-
-	*/
-
-
+	IniWrite, %RumbleSecondaryPlatformsList%, %SettingsIniFilepath%, %ScriptSettingsSection%, RumbleSecondaryPlatformsList
+	MsgBox 0x40, Rumble Secondary Platforms List Generated, Rumble Secondary Platforms List was genearted and all the available options were added to it.`n`nPlease edit the settings.ini file and remove any platforms you do not need selected from the follwoing KEY:`n`n[%ScriptSettingsSection%]`nRumbleSecondaryPlatformsList=
 }


-if(ConfirmBeforeSubmit)
-msgbox, Please check that all data was input correctly and then click OK to Publish Video
+Loop, 10 {

-try UploadPageURL := driver.URL
-
-; Submit Button
-js = document.getElementById('submitForm').click(); 
-try driver.executeScript(js)    ;
+	IndexPlusOne := A_index + 1
+	Xpath = (//div[@class='flex shrink-0 items-center gap-x-4'])[%A_index%]
+	XpathCheckbox = (//div[@class='relative shrink-0'])[%IndexPlusOne%]


-try driver.executeScript("return document.readyState").equals("complete") ; wait until page loads completely before proceeding
+	try SecondaryPlatformCheckboxName := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text

-
-; Select Rumble Only Licensing
-js = document.getElementsByClassName('greenLink mRight last')[0].click(); ; Send content through javascript (Great for getting around emoji chrome limitaitons)
-try driver.executeScript(js)    ;Executes a Javascript on the webpage, mostly used for buttons.
-
-; Check off condition 1
-js = document.getElementById("crights").click()
-try driver.executeScript(js)
-
-; Check off condition 2
-js = document.getElementById("cterms").click()
-try driver.executeScript(js)
-
-; Click the Submit Button
-js = document.getElementById("submitForm2").click()
-try driver.executeScript(js)
-
-
-; Loop until able to grab the direct link from the result page.
-Loop, 24 {
-	TooltipThis("Waiting for Result Page to load to grab Video URL")
-	Sleep, 5000 
-
-	js = return document.getElementById("error_files_2").textContent;
-	RumbleError := driver.executeScript(js)    ;Executes a Javascript on the webpage, mostly used for buttons.
-	if(RumbleError != "") {
-		Message = Rumble Upload Failed due to:`n%RumbleError%
-		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-		SaveDriverURLOFErrorPage()
-		Return
+	if(SecondaryPlatformCheckboxName = "Add new destination" OR SecondaryPlatformCheckboxName = ""){
+		Break
 	}

-	js = return document.getElementById('direct').value;
-	try RumbleURL := driver.executeScript(js)    ;Executes a Javascript on the webpage, mostly used for buttons.
-
-/*	try RumbleURL := driver.findElementsByID("direct").item[1].Attribute("value") ;grab Direct Link from the result page
-	catch e { ; if not able to grab it, then sleep for 5 seconds and then loop again
+	if(!InStr(RumbleSecondaryPlatformsList,SecondaryPlatformCheckboxName))
 		Continue
-	}
-	*/
-	if(RumbleURL != ""){  ; If URL is grabbed from result page, then kick out of loop
-		Break
-	}
-	if(A_Index = 10) ; if looped for 5 minutes and still no URL grabbed
-	{ ; @todo: add error check if submit button clicked and error appears

-		Xpath = /html/body/main/div/div/div/section/form[2]/div/div[9] ; grab inner content of where error usually appears.
-		try RumbleUploadError := driver.findelementbyxpath(Xpath).Attribute("innerText") ; Grabb innertext
-		; Msgbox % "UseThumbUploadToolTextExist: " UseThumbUploadToolTextExist
-
-
-		Message = Upload Error (E#1341)`nVideo Uploaded but not able to be finalized.`nPlease fix the issue and click the final submit button. `nError: %RumbleUploadError%
+	Status := Selenium_LoopToClickXpath(Xpath:=XpathCheckbox,NumOfLoops:=2,SleepLength:=1000)
+	if(Status){
+		Message = Failed to check off the checkbox for: %SecondaryPlatformCheckboxName%
+		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+	}
+
+	sleep, 250
+
+}
+
+
+if(ConfirmBeforeSubmit){
+	OnMessage(0x44, "OnMsgBoxUserConfirmation")
+	MsgBox 0x21, User Confirmation, Please check that all data was input correctly and fix any mistakes and then click PROCEED to finalize the Upload.`n`nClick STOP to cancel the rest of this Upload and move on to the next website.
+	OnMessage(0x44, "")
+
+	IfMsgBox OK, {
+
+		} Else IfMsgBox Cancel, {
+			Message = User Selected STOP button when asked for confirmation. Cancelling Rest of automation for this site.
 			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
-		SaveDriverURLOFErrorPage()
 			Return
 		}
 	}
+/*
+*/

-IniWrite, %RumbleURL%, %VideoLinksIniFile%, URLs, RumbleURL
+; click the "next" button to finalize the upload
+Xpath = (//button[@class='rounded-full px-6 py-2 bg-primary hover:brightness-[0.92] cursor-pointer'])[1]
+Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
+if(Status){
+	Message = Failed to click "Next" to finalize the upload
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+}

-Message = Upload Complete: %RumbleURL%
+
+Message = Waiting 15 seconds before Navigating to Rumble and Grabbing Livestream URL
 SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
-SaveDriverURL()
-AddToTotalVideosUploadedCount()
+sleep, 15000

+
+try, driver.get("https://rumble.com/account/live-streaming")
+catch e {
+	Message = Failed to Navigate to Rumble.com
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
 	Return
+}
+
+try, driver.executeScript("return document.readyState").equals("complete") ; wait until page loads completely before proceeding
+
+
+Xpath = (//span[@class='video-info-status recorder'])[1]
+
+Loop, 5 {
+	if(A_index = 5){
+		Message = Failed to grab livestream URL. `nAfter 5 checks the top livestream is still not in -Waiting for Stream- status.
+		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+		Return
+	}
+
+	try StreamStatus := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
+	if(StreamStatus != "Waiting for Stream"){
+		Message = First Livestream on the list is not in -Waiting for Stream- status.`nWaiting 30 seconds and checking again.
+		SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
+		sleep, 30000
+		try, driver.executeScript("history.go(0)") ;refresh page 
+		try, driver.executeScript("return document.readyState").equals("complete") ; wait until page loads completely before proceeding
+	}
+	else, 
+	break
+
+}
+
+
+Xpath = (//h2[@class='video-title'])[1]
+
+RumbleURLSlug := GetHTMLValueFromXpathOuterHTML(XPATH, "href")
+if(RumbleURLSlug = "" or RumbleURLSlug = "Failed"){
+	Message = Failed to grab Rumble URL Slug from Livestreams Page
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+	Return
+}
+
+RumbleLivestreamURL := "https://rumble.com" . RumbleURLSlug
+
+IniWrite, %RumbleLivestreamURL%, %PostStatusesFilepath%, Livestream,RumbleLivestreamURL
+
+
+return
+
+
+
+
+
+
+
+
+
+
+
+
--- a/Modules/Rumble-Set-RTMP.ahk
+++ b/Modules/Rumble-Set-RTMP.ahk
@@ -0,0 +1,73 @@
+RumbleSetRTMP:
+;------------------------------------------------
+
+
+CurrentSite := "Rumble Studio"
+Message = Inputting Custom RTMP Settings into Rumble Studio
+SaveOrPostProgress(Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
+
+Status := NavigateFromBaseURLTo("https://studio.rumble.com/settings/connections")
+if(Status)
+Return
+
+try driver.executeScript("return document.readyState").equals("complete") ; wait until page loads completely before proceeding
+
+CheckForAlerts()
+
+
+
+IniRead, LocalsRTMPURL, %PostStatusesFilepath%, Livestream,LocalsRTMPURL, %A_Space%
+IniRead, LocalsRTMPKey, %PostStatusesFilepath%, Livestream,LocalsRTMPKey, %A_Space%
+
+if(LocalsRTMPURL = ""){
+	Message = Skipping. No LocalsRTMPURL in Status.ini file
+	SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+	Return
+}
+
+Loop, 10 {
+
+	; IndexPlusOne := A_index + 1
+	IndexMinusOne := A_index - 1
+	Xpath = (//div[@class='flex shrink-0 items-center gap-x-4'])[%A_index%]
+	XpathCheckbox = (//img[@alt='More options'])[%IndexMinusOne%]
+
+
+	try SecondaryPlatformCheckboxName := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
+
+	; Msgbox % "SecondaryPlatformCheckboxName: " SecondaryPlatformCheckboxName
+
+	if(SecondaryPlatformCheckboxName = "LOCALS RTMP USE"){
+		Status := Selenium_LoopToClickXpath(Xpath:=XpathCheckbox,NumOfLoops:=2,SleepLength:=1000)
+		if(Status){
+			Message = Failed to click into 3 dot menu for -LOCALS RTMP USE-
+			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+		}
+
+		; click Edit RTMP in the popup menu
+		Xpath = (//span[normalize-space()='Edit RTMP'])[1]
+		Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
+		if(Status){
+			Message = Failed to click into 3 dot menu for -LOCALS RTMP USE-
+			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+		}
+
+
+		; Input New RTMP Info
+		XpathRTMP = (//input[@placeholder='Enter the RTMP URL'])[1]
+		XpathStreamkey = (//input[@placeholder='Enter the stream key'])[1] 
+
+		Status := Selenium_LoopToSendValueToXpath(Xpath:=XpathRTMP,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=LocalsRTMPURL)
+		Status := Selenium_LoopToSendValueToXpath(Xpath:=XpathStreamkey,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=LocalsRTMPKey)
+
+		; click save button
+		Xpath = (//button[@class='rounded-full px-6 py-2 bg-primary/50 pointer-events-none'])[1]
+		Status := Selenium_LoopToClickXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000)
+		if(Status){
+			Message = Failed to Click Save Button
+			SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
+			Return
+		}
+
+	}
+}
--- a/Version.ini
+++ b/Version.ini
Author	SHA1	Message	Date
Yuriy	a73eaf0e17	added Rumble RTMP input, gui additions	2024-05-11 00:58:30 -04:00
Yuriy	44b343a0a7	added auto update checks option and functionality	2024-05-10 02:36:02 -04:00
Yuriy	a008541c7c	fixed locals thumbnail upload, rumble URL grab	2024-05-08 21:35:32 -04:00
Yuriy	4bd4e1f7c3	rumble functionality, bug fixes, gui improvements	2024-05-08 13:58:37 -04:00