Fix/youtube blockage (#137)

* Update player errors to look better * Update InnerTube * Add a check for the video ID returned from YouTube
lighttube-org · Apr 2, 2024 · 082af42 · 082af42
1 parent c24b2b7
commit 082af42
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 13 deletions.
diff --git a/LightTube/Controllers/YoutubeController.cs b/LightTube/Controllers/YoutubeController.cs
@@ -66,6 +66,11 @@ public async Task<IActionResult> Watch(string v, string? list, bool contentCheck
 			player = await _youtube.GetPlayerAsync(v, contentCheckOk, false, HttpContext.GetLanguage(),
 				HttpContext.GetRegion());
 			e = null;
+			if (player.Details.Id != v)
+			{
+				e = new Exception($"YouTube returned a different video than the requested one ({v} != {player.Details.Id})");
+				player = null;
+			}
 		}
 		catch (Exception ex)
 		{

diff --git a/LightTube/LightTube.csproj b/LightTube/LightTube.csproj
@@ -10,7 +10,7 @@
         <PublishReadyToRunExclude Include="ZstdSharp.dll" />
         <PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
         <PackageReference Include="Humanizer.Core" Version="2.14.1" />
-        <PackageReference Include="InnerTube" Version="1.0.28" /> 
+        <PackageReference Include="InnerTube" Version="1.0.29" /> 
         <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.8" />
         <PackageReference Include="MongoDB.Driver" Version="2.23.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />

diff --git a/LightTube/Views/Shared/Player.cshtml b/LightTube/Views/Shared/Player.cshtml
@@ -41,19 +41,36 @@
 		}
 		else
 		{
-			<div id="player" class="player @(Model.GetClass()) error" style="background-image: url('@Model.Thumbnails.LastOrDefault()?.Url')">
-				<span>
-					@Model.Exception.Message
-				</span>
+			<div class="player-error-container">
+				<div class="player-error-icon">
+					<svg class="icon" fill="currentColor" style="color: white;" width="128" height="128">
+						<use xlink:href="/svg/bootstrap-icons.svg#exclamation-circle"></use>
+					</svg>
+				</div>
+				<div class="player-error-info">
+					<div class="title">An error has occurred @(Model.Exception.GetType() == typeof(Exception) ? "" : $"({Model.Exception.GetType().Name})")</div>
+					<p class="ml-1">@Model.Exception.Message</p>
+					<p>
+						This error might not occur in other instances. Find them <a href="https://github.com/lighttube-org/LightTube/blob/master/INSTANCES.md">here</a>
+					</p>
+				</div>
 			</div>
 		}
 	}
 	else
 	{
-		<div id="player" class="player @(Model.GetClass()) error" style="background-image: url('@Model.Thumbnails.LastOrDefault()?.Url')">
-			<span>
-				Failed to load player
-			</span>
+		<div class="player-error-container">
+			<div class="player-error-icon">
+				<svg class="icon" fill="currentColor" style="color: white;" width="128" height="128">
+					<use xlink:href="/svg/bootstrap-icons.svg#exclamation-circle"></use>
+				</svg>
+			</div>
+			<div class="player-error-info">
+				<div class="title">Failed to load the player</div>
+				<p>
+					This might not occur in other instances. Find them <a href="https://github.com/lighttube-org/LightTube/blob/master/INSTANCES.md">here</a>
+				</p>
+			</div>
 		</div>
 	}
 }
@@ -109,10 +126,16 @@ else if (Model.Player.Formats.Any())
 else
 {
 	playable = false;
-	<div id="player" class="player @(Model.GetClass()) error" style="background-image: url('@Model.Thumbnails.LastOrDefault()?.Url')">
-		<span>
-			No muxed formats were returned by YouTube
-		</span>
+	<div class="player-error-container">
+		<div class="player-error-icon">
+			<svg class="icon" fill="currentColor" style="color: white;" width="128" height="128">
+				<use xlink:href="/svg/bootstrap-icons.svg#exclamation-circle"></use>
+			</svg>
+		</div>
+		<div class="player-error-info">
+			<div class="title">An error has occurred</div>
+			<p>No muxed formats were returned from YouTube</p>
+		</div>
 	</div>
 }