- Adjusting logic for signing in YouTube bot account to detect when n…

…o channel is set
SaviorXTanren · Sep 6, 2023 · 5435926 · 5435926
1 parent ae66c34
commit 5435926
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 22 deletions.
diff --git a/MixItUp.Base/Resources.Designer.cs b/MixItUp.Base/Resources.Designer.cs
diff --git a/MixItUp.Base/Resources.resx b/MixItUp.Base/Resources.resx
@@ -8450,7 +8450,7 @@ NOTE: This may require you to opt-in to the Preview build from the General tab i
     <value>Failed to connect to YouTube chat servers</value>
   </data>
   <data name="YouTubeFailedToGetBotData" xml:space="preserve">
-    <value>Failed to get YouTube bot data</value>
+    <value>Failed to get YouTube bot data. For YouTube bot accounts, ensure that you have created a channel on YouTube for the account you are signing in to. See the following Wiki page for more information: https://wiki.mixitupapp.com/accounts#bot-accounts</value>
   </data>
   <data name="YouTubeFailedToGetUserData" xml:space="preserve">
     <value>Failed to get YouTube user data</value>
@@ -10282,7 +10282,4 @@ sendParentMessage({ Type: "Remove", ID: "{ID}" });</value>
   <data name="MusicPlayerSelectFolderOrPlayMusicToLoadInSongs" xml:space="preserve">
     <value>Select a new folder to load in music from a folder or hit the Play button to load in music from the last used folder.</value>
   </data>
-  <data name="YouTubeBotAccountEnsureChannelCreated" xml:space="preserve">
-    <value>For YouTube bot accounts, ensure that you have created a channel on YouTube for the account you are signing in to. See the following Wiki page for more information: https://wiki.mixitupapp.com/accounts#bot-accounts</value>
-  </data>
 </root>
diff --git a/MixItUp.Base/Services/YouTube/YouTubePlatformService.cs b/MixItUp.Base/Services/YouTube/YouTubePlatformService.cs
@@ -58,12 +58,7 @@ public static async Task<Result<YouTubePlatformService>> ConnectUser()
 
         public static async Task<Result<YouTubePlatformService>> ConnectBot()
         {
-            Result<YouTubePlatformService> result = await YouTubePlatformService.Connect(YouTubePlatformService.BotScopes);
-            if (!result.Success)
-            {
-                result.Combine(new Result(Resources.YouTubeBotAccountEnsureChannelCreated));
-            }
-            return result;
+            return await YouTubePlatformService.Connect(YouTubePlatformService.BotScopes);
         }
 
         public static async Task<Result<YouTubePlatformService>> Connect(IEnumerable<OAuthClientScopeEnum> scopes)

diff --git a/MixItUp.Base/Services/YouTube/YouTubeSessionService.cs b/MixItUp.Base/Services/YouTube/YouTubeSessionService.cs
@@ -84,12 +84,12 @@ public async Task<Result> ConnectBot()
             Result<YouTubePlatformService> result = await YouTubePlatformService.ConnectBot();
             if (result.Success)
             {
-                this.BotConnection = result.Value;
-                this.Bot = await this.BotConnection.GetCurrentChannel();
+                this.Bot = await result.Value.GetCurrentChannel();
                 if (this.Bot == null)
                 {
                     return new Result(MixItUp.Base.Resources.YouTubeFailedToGetBotData);
                 }
+                this.BotConnection = result.Value;
             }
             return result;
         }