Temporary fix until InnerTube protobuf is ready (#128)

lighttube-org · Feb 20, 2024 · 3621264 · 3621264
1 parent 723deda
commit 3621264
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/LightTube/Contexts/WatchContext.cs b/LightTube/Contexts/WatchContext.cs
@@ -10,19 +10,21 @@ public class WatchContext : BaseContext
  public InnerTubePlaylistInfo? Playlist;
  public InnerTubeContinuationResponse? Comments;
  public int Dislikes;
+ public int Likes;
  public SponsorBlockSegment[] Sponsors;
 
  public WatchContext(HttpContext context, InnerTubePlayer innerTubePlayer,
  InnerTubeNextResponse innerTubeNextResponse,
  InnerTubeContinuationResponse? comments,
- bool compatibility, int dislikes, SponsorBlockSegment[] sponsors) : base(context)
+ bool compatibility, int dislikes, int likes, SponsorBlockSegment[] sponsors) : base(context)
  {
  Player = new PlayerContext(context, innerTubePlayer, innerTubeNextResponse, "embed", compatibility,
  context.Request.Query["q"], sponsors);
  Video = innerTubeNextResponse;
  Playlist = Video.Playlist;
  Comments = comments;
  Dislikes = dislikes;
+ Likes = likes;
  Sponsors = sponsors;
  GuideHidden = true;
 
@@ -49,13 +51,14 @@ public class WatchContext : BaseContext
  }
 
  public WatchContext(HttpContext context, Exception e, InnerTubeNextResponse innerTubeNextResponse,
- InnerTubeContinuationResponse? comments, int dislikes) : base(context)
+ InnerTubeContinuationResponse? comments, int dislikes, int likes) : base(context)
  {
  Player = new PlayerContext(context, e);
  Video = innerTubeNextResponse;
  Playlist = Video.Playlist;
  Comments = comments;
  Dislikes = dislikes;
+ Likes = likes;
  Sponsors = Array.Empty<SponsorBlockSegment>();
  GuideHidden = true;
 
@@ -78,7 +81,7 @@ public class WatchContext : BaseContext
  public WatchContext(HttpContext context, InnerTubePlayer innerTubePlayer,
  InnerTubeNextResponse innerTubeNextResponse, DatabasePlaylist? playlist,
  InnerTubeContinuationResponse? comments,
- bool compatibility, int dislikes, SponsorBlockSegment[] sponsors) : base(context)
+ bool compatibility, int dislikes, int likes, SponsorBlockSegment[] sponsors) : base(context)
  {
  Player = new PlayerContext(context, innerTubePlayer, innerTubeNextResponse, "embed", compatibility,
  context.Request.Query["q"], sponsors);
@@ -89,6 +92,7 @@ public class WatchContext : BaseContext
  Playlist = null;
  Comments = comments;
  Dislikes = dislikes;
+ Likes = likes;
  Sponsors = sponsors;
  GuideHidden = true;
 
@@ -116,7 +120,7 @@ public class WatchContext : BaseContext
 
  public WatchContext(HttpContext context, Exception e, InnerTubeNextResponse innerTubeNextResponse,
  DatabasePlaylist? playlist,
- InnerTubeContinuationResponse? comments, int dislikes) : base(context)
+ InnerTubeContinuationResponse? comments, int dislikes, int likes) : base(context)
  {
  Player = new PlayerContext(context, e);
  Video = innerTubeNextResponse;
@@ -126,6 +130,7 @@ public class WatchContext : BaseContext
  Playlist = null;
  Comments = comments;
  Dislikes = dislikes;
+ Likes = likes;
  Sponsors = Array.Empty<SponsorBlockSegment>();
  GuideHidden = true;
 

diff --git a/LightTube/Controllers/YoutubeController.cs b/LightTube/Controllers/YoutubeController.cs
@@ -89,7 +89,7 @@ public async Task<IActionResult> Watch(string v, string? list, bool contentCheck
  region: HttpContext.GetRegion());
  } catch { /* comments arent enabled, ignore */ }
 
- int dislikes;
+ int dislikes, likes;
  try
  {
  HttpResponseMessage rydResponse =
@@ -98,10 +98,12 @@ public async Task<IActionResult> Watch(string v, string? list, bool contentCheck
  JsonSerializer.Deserialize<Dictionary<string, JsonElement>>(
  await rydResponse.Content.ReadAsStringAsync())!;
  dislikes = rydJson["dislikes"].GetInt32();
+ likes = rydJson["likes"].GetInt32();
  }
  catch
  {
  dislikes = -1;
+ likes = -1;
  } 
 
  SponsorBlockSegment[] sponsors;
@@ -122,15 +124,15 @@ public async Task<IActionResult> Watch(string v, string? list, bool contentCheck
  DatabasePlaylist? pl = DatabaseManager.Playlists.GetPlaylist(list);
  if (player is null || e is not null)
  return View(new WatchContext(HttpContext, e ?? new Exception("player is null"), video, pl, comments,
- dislikes));
- return View(new WatchContext(HttpContext, player, video, pl, comments, compatibility, dislikes, sponsors));
+ dislikes, likes));
+ return View(new WatchContext(HttpContext, player, video, pl, comments, compatibility, dislikes, likes, sponsors));
  }
  else
  {
  if (player is null || e is not null)
  return View(new WatchContext(HttpContext, e ?? new Exception("player is null"), video, comments,
- dislikes));
- return View(new WatchContext(HttpContext, player, video, comments, compatibility, dislikes, sponsors));
+ dislikes, likes));
+ return View(new WatchContext(HttpContext, player, video, comments, compatibility, dislikes, likes, sponsors));
  }
  }
 

diff --git a/LightTube/Views/Youtube/Watch.cshtml b/LightTube/Views/Youtube/Watch.cshtml
@@ -43,7 +43,7 @@
  <use xlink:href="/svg/bootstrap-icons.svg#hand-thumbs-up"/>
  </svg>
  <div class="interaction-button__text">
- @Model.Video.LikeCount
+ @(Model.Likes == -1 ? "Like" : Model.Likes.ToKMB())
  </div>
  </div>
  <vr></vr>