Merge branch 'iv-org:master' into main

2026-01-17 01:02:40 +00:00 · 2023-10-08 17:26:55 +00:00
parent cd3256fcff 60fae015d8
commit fa50e5dff6
52 changed files with 2184 additions and 763 deletions
--- a/src/invidious/channels/community.cr
+++ b/src/invidious/channels/community.cr
@@ -24,7 +24,33 @@ def fetch_channel_community(ucid, cursor, locale, format, thin_mode)
  return extract_channel_community(items, ucid: ucid, locale: locale, format: format, thin_mode: thin_mode)
 end

-def extract_channel_community(items, *, ucid, locale, format, thin_mode)
+def fetch_channel_community_post(ucid, post_id, locale, format, thin_mode)
+  object = {
+    "2:string"    => "community",
+    "25:embedded" => {
+      "22:string" => post_id.to_s,
+    },
+    "45:embedded" => {
+      "2:varint" => 1_i64,
+      "3:varint" => 1_i64,
+    },
+  }
+  params = object.try { |i| Protodec::Any.cast_json(i) }
+    .try { |i| Protodec::Any.from_json(i) }
+    .try { |i| Base64.urlsafe_encode(i) }
+    .try { |i| URI.encode_www_form(i) }
+
+  initial_data = YoutubeAPI.browse(ucid, params: params)
+
+  items = [] of JSON::Any
+  extract_items(initial_data) do |item|
+    items << item
+  end
+
+  return extract_channel_community(items, ucid: ucid, locale: locale, format: format, thin_mode: thin_mode, is_single_post: true)
+end
+
+def extract_channel_community(items, *, ucid, locale, format, thin_mode, is_single_post : Bool = false)
  if message = items[0]["messageRenderer"]?
    error_message = (message["text"]["simpleText"]? ||
                     message["text"]["runs"]?.try &.[0]?.try &.["text"]?)
@@ -39,6 +65,9 @@ def extract_channel_community(items, *, ucid, locale, format, thin_mode)
  response = JSON.build do |json|
    json.object do
      json.field "authorId", ucid
+      if is_single_post
+        json.field "singlePost", true
+      end
      json.field "comments" do
        json.array do
          items.each do |post|
@@ -240,8 +269,10 @@ def extract_channel_community(items, *, ucid, locale, format, thin_mode)
          end
        end
      end
-      if cont = items.dig?(-1, "continuationItemRenderer", "continuationEndpoint", "continuationCommand", "token")
-        json.field "continuation", extract_channel_community_cursor(cont.as_s)
+      if !is_single_post
+        if cont = items.dig?(-1, "continuationItemRenderer", "continuationEndpoint", "continuationCommand", "token")
+          json.field "continuation", extract_channel_community_cursor(cont.as_s)
+        end
      end
    end
  end
--- a/src/invidious/comments/youtube.cr
+++ b/src/invidious/comments/youtube.cr
@@ -13,6 +13,51 @@ module Invidious::Comments

    client_config = YoutubeAPI::ClientConfig.new(region: region)
    response = YoutubeAPI.next(continuation: ctoken, client_config: client_config)
+    return parse_youtube(id, response, format, locale, thin_mode, sort_by)
+  end
+
+  def fetch_community_post_comments(ucid, post_id)
+    object = {
+      "2:string"    => "community",
+      "25:embedded" => {
+        "22:string" => post_id,
+      },
+      "45:embedded" => {
+        "2:varint" => 1_i64,
+        "3:varint" => 1_i64,
+      },
+      "53:embedded" => {
+        "4:embedded" => {
+          "6:varint"  => 0_i64,
+          "27:varint" => 1_i64,
+          "29:string" => post_id,
+          "30:string" => ucid,
+        },
+        "8:string" => "comments-section",
+      },
+    }
+
+    object_parsed = object.try { |i| Protodec::Any.cast_json(i) }
+      .try { |i| Protodec::Any.from_json(i) }
+      .try { |i| Base64.urlsafe_encode(i) }
+
+    object2 = {
+      "80226972:embedded" => {
+        "2:string" => ucid,
+        "3:string" => object_parsed,
+      },
+    }
+
+    continuation = object2.try { |i| Protodec::Any.cast_json(i) }
+      .try { |i| Protodec::Any.from_json(i) }
+      .try { |i| Base64.urlsafe_encode(i) }
+      .try { |i| URI.encode_www_form(i) }
+
+    initial_data = YoutubeAPI.browse(continuation: continuation)
+    return initial_data
+  end
+
+  def parse_youtube(id, response, format, locale, thin_mode, sort_by = "top", isPost = false)
    contents = nil

    if on_response_received_endpoints = response["onResponseReceivedEndpoints"]?
@@ -68,7 +113,11 @@ module Invidious::Comments
          json.field "commentCount", comment_count
        end

-        json.field "videoId", id
+        if isPost
+          json.field "postId", id
+        else
+          json.field "videoId", id
+        end

        json.field "comments" do
          json.array do
--- a/src/invidious/frontend/comments_youtube.cr
+++ b/src/invidious/frontend/comments_youtube.cr
@@ -23,6 +23,24 @@ module Invidious::Frontend::Comments
            </div>
          </div>
          END_HTML
+        elsif comments["authorId"]? && !comments["singlePost"]?
+          # for posts we should display a link to the post
+          replies_count_text = translate_count(locale,
+            "comments_view_x_replies",
+            child["replyCount"].as_i64 || 0,
+            NumberFormatting::Separator
+          )
+
+          replies_html = <<-END_HTML
+          <div class="pure-g">
+            <div class="pure-u-1-24"></div>
+            <div class="pure-u-23-24">
+              <p>
+                <a href="/post/#{child["commentId"]}?ucid=#{comments["authorId"]}">#{replies_count_text}</a>
+              </p>
+            </div>
+          </div>
+          END_HTML
        end

        if !thin_mode
--- a/src/invidious/helpers/i18next.cr
+++ b/src/invidious/helpers/i18next.cr
@@ -35,19 +35,27 @@ module I18next::Plurals
    Special_Slovenian        = 21
    Special_Hebrew           = 22
    Special_Odia             = 23
+
+    # Mixed v3/v4 rules in Weblate
+    # `es`, `pt` and `pt-PT` doesn't seem to have been refreshed
+    # by weblate yet, but I suspect it will happen one day.
+    # See: https://github.com/translate/translate/issues/4873
+    Special_French_Portuguese
+    Special_Hungarian_Serbian
+    Special_Spanish_Italian
  end

  private PLURAL_SETS = {
    PluralForms::Single_gt_one => [
-      "ach", "ak", "am", "arn", "br", "fil", "fr", "gun", "ln", "mfe", "mg",
-      "mi", "oc", "pt", "pt-BR", "tg", "tl", "ti", "tr", "uz", "wa",
+      "ach", "ak", "am", "arn", "br", "fil", "gun", "ln", "mfe", "mg",
+      "mi", "oc", "pt", "tg", "tl", "ti", "tr", "uz", "wa",
    ],
    PluralForms::Single_not_one => [
      "af", "an", "ast", "az", "bg", "bn", "ca", "da", "de", "dev", "el", "en",
      "eo", "es", "et", "eu", "fi", "fo", "fur", "fy", "gl", "gu", "ha", "hi",
-      "hu", "hy", "ia", "it", "kk", "kn", "ku", "lb", "mai", "ml", "mn", "mr",
+      "hu", "hy", "ia", "kk", "kn", "ku", "lb", "mai", "ml", "mn", "mr",
      "nah", "nap", "nb", "ne", "nl", "nn", "no", "nso", "pa", "pap", "pms",
-      "ps", "pt-PT", "rm", "sco", "se", "si", "so", "son", "sq", "sv", "sw",
+      "ps", "rm", "sco", "se", "si", "so", "son", "sq", "sv", "sw",
      "ta", "te", "tk", "ur", "yo",
    ],
    PluralForms::None => [
@@ -55,7 +63,7 @@ module I18next::Plurals
      "lo", "ms", "sah", "su", "th", "tt", "ug", "vi", "wo", "zh",
    ],
    PluralForms::Dual_Slavic => [
-      "be", "bs", "cnr", "dz", "hr", "ru", "sr", "uk",
+      "be", "bs", "cnr", "dz", "ru", "uk",
    ],
  }

@@ -81,6 +89,12 @@ module I18next::Plurals
    "ro"  => PluralForms::Special_Romanian,
    "sk"  => PluralForms::Special_Czech_Slovak,
    "sl"  => PluralForms::Special_Slovenian,
+    # Mixed v3/v4 rules
+    "fr"    => PluralForms::Special_French_Portuguese,
+    "hr"    => PluralForms::Special_Hungarian_Serbian,
+    "it"    => PluralForms::Special_Spanish_Italian,
+    "pt-BR" => PluralForms::Special_French_Portuguese,
+    "sr"    => PluralForms::Special_Hungarian_Serbian,
  }

  # These are the v1 and v2 compatible suffixes.
@@ -150,9 +164,8 @@ module I18next::Plurals
    end

    def get_plural_form(locale : String) : PluralForms
-      # Extract the ISO 639-1 or 639-2 code from an RFC 5646 language code,
-      # except for pt-BR and pt-PT which needs to be kept as-is.
-      if !locale.matches?(/^pt-(BR|PT)$/)
+      # Extract the ISO 639-1 or 639-2 code from an RFC 5646 language code
+      if !locale.matches?(/^pt-BR$/)
        locale = locale.split('-')[0]
      end

@@ -246,6 +259,10 @@ module I18next::Plurals
      when .special_slovenian?        then return special_slovenian(count)
      when .special_hebrew?           then return special_hebrew(count)
      when .special_odia?             then return special_odia(count)
+        # Mixed v3/v4 forms
+      when .special_spanish_italian?   then return special_cldr_Spanish_Italian(count)
+      when .special_french_portuguese? then return special_cldr_French_Portuguese(count)
+      when .special_hungarian_serbian? then return special_cldr_Hungarian_Serbian(count)
      else
        # default, if nothing matched above
        return 0_u8
@@ -507,5 +524,42 @@ module I18next::Plurals
    def self.special_odia(count : Int) : UInt8
      return (count == 1) ? 0_u8 : 1_u8
    end
+
+    # -------------------
+    # "v3.5" rules
+    # -------------------
+
+    # Plural form for Spanish & Italian languages
+    #
+    # This rule is mostly compliant to CLDR v42
+    #
+    def self.special_cldr_Spanish_Italian(count : Int) : UInt8
+      return 0_u8 if (count == 1)                           # one
+      return 1_u8 if (count != 0 && count % 1_000_000 == 0) # many
+      return 2_u8                                           # other
+    end
+
+    # Plural form for French and Portuguese
+    #
+    # This rule is mostly compliant to CLDR v42
+    #
+    def self.special_cldr_French_Portuguese(count : Int) : UInt8
+      return 0_u8 if (count == 0 || count == 1) # one
+      return 1_u8 if (count % 1_000_000 == 0)   # many
+      return 2_u8                               # other
+    end
+
+    # Plural form for Hungarian and Serbian
+    #
+    # This rule is mostly compliant to CLDR v42
+    #
+    def self.special_cldr_Hungarian_Serbian(count : Int) : UInt8
+      n_mod_10 = count % 10
+      n_mod_100 = count % 100
+
+      return 0_u8 if (n_mod_10 == 1 && n_mod_100 != 11)                         # one
+      return 1_u8 if (2 <= n_mod_10 <= 4 && (n_mod_100 < 12 || 14 < n_mod_100)) # few
+      return 2_u8                                                               # other
+    end
  end
 end
--- a/src/invidious/helpers/serialized_yt_data.cr
+++ b/src/invidious/helpers/serialized_yt_data.cr
@@ -186,6 +186,7 @@ struct SearchChannel
  property author_thumbnail : String
  property subscriber_count : Int32
  property video_count : Int32
+  property channel_handle : String?
  property description_html : String
  property auto_generated : Bool
  property author_verified : Bool
@@ -214,6 +215,7 @@ struct SearchChannel
      json.field "autoGenerated", self.auto_generated
      json.field "subCount", self.subscriber_count
      json.field "videoCount", self.video_count
+      json.field "channelHandle", self.channel_handle

      json.field "description", html_to_content(self.description_html)
      json.field "descriptionHtml", self.description_html
--- a/src/invidious/helpers/webvtt.cr
+++ b/src/invidious/helpers/webvtt.cr
@@ -0,0 +1,67 @@
+# Namespace for logic relating to generating WebVTT files
+#
+# Probably not compliant to WebVTT's specs but it is enough for Invidious.
+module WebVTT
+  # A WebVTT builder generates WebVTT files
+  private class Builder
+    def initialize(@io : IO)
+    end
+
+    # Writes an vtt cue with the specified time stamp and contents
+    def cue(start_time : Time::Span, end_time : Time::Span, text : String)
+      timestamp(start_time, end_time)
+      @io << text
+      @io << "\n\n"
+    end
+
+    private def timestamp(start_time : Time::Span, end_time : Time::Span)
+      timestamp_component(start_time)
+      @io << " --> "
+      timestamp_component(end_time)
+
+      @io << '\n'
+    end
+
+    private def timestamp_component(timestamp : Time::Span)
+      @io << timestamp.hours.to_s.rjust(2, '0')
+      @io << ':' << timestamp.minutes.to_s.rjust(2, '0')
+      @io << ':' << timestamp.seconds.to_s.rjust(2, '0')
+      @io << '.' << timestamp.milliseconds.to_s.rjust(3, '0')
+    end
+
+    def document(setting_fields : Hash(String, String)? = nil, &)
+      @io << "WEBVTT\n"
+
+      if setting_fields
+        setting_fields.each do |name, value|
+          @io << name << ": " << value << '\n'
+        end
+      end
+
+      @io << '\n'
+
+      yield
+    end
+  end
+
+  # Returns the resulting `String` of writing WebVTT to the yielded `WebVTT::Builder`
+  #
+  # ```
+  # string = WebVTT.build do |vtt|
+  #   vtt.cue(Time::Span.new(seconds: 1), Time::Span.new(seconds: 2), "Line 1")
+  #   vtt.cue(Time::Span.new(seconds: 2), Time::Span.new(seconds: 3), "Line 2")
+  # end
+  #
+  # string # => "WEBVTT\n\n00:00:01.000 --> 00:00:02.000\nLine 1\n\n00:00:02.000 --> 00:00:03.000\nLine 2\n\n"
+  # ```
+  #
+  # Accepts an optional settings fields hash to add settings attribute to the resulting vtt file.
+  def self.build(setting_fields : Hash(String, String)? = nil, &)
+    String.build do |str|
+      builder = Builder.new(str)
+      builder.document(setting_fields) do
+        yield builder
+      end
+    end
+  end
+end
--- a/src/invidious/routes/api/v1/channels.cr
+++ b/src/invidious/routes/api/v1/channels.cr
@@ -343,6 +343,59 @@ module Invidious::Routes::API::V1::Channels
    end
  end

+  def self.post(env)
+    locale = env.get("preferences").as(Preferences).locale
+
+    env.response.content_type = "application/json"
+    id = env.params.url["id"].to_s
+    ucid = env.params.query["ucid"]?
+
+    thin_mode = env.params.query["thin_mode"]?
+    thin_mode = thin_mode == "true"
+
+    format = env.params.query["format"]?
+    format ||= "json"
+
+    if ucid.nil?
+      response = YoutubeAPI.resolve_url("https://www.youtube.com/post/#{id}")
+      return error_json(400, "Invalid post ID") if response["error"]?
+      ucid = response.dig("endpoint", "browseEndpoint", "browseId").as_s
+    else
+      ucid = ucid.to_s
+    end
+
+    begin
+      fetch_channel_community_post(ucid, id, locale, format, thin_mode)
+    rescue ex
+      return error_json(500, ex)
+    end
+  end
+
+  def self.post_comments(env)
+    locale = env.get("preferences").as(Preferences).locale
+
+    env.response.content_type = "application/json"
+
+    id = env.params.url["id"]
+
+    thin_mode = env.params.query["thin_mode"]?
+    thin_mode = thin_mode == "true"
+
+    format = env.params.query["format"]?
+    format ||= "json"
+
+    continuation = env.params.query["continuation"]?
+
+    case continuation
+    when nil, ""
+      ucid = env.params.query["ucid"]
+      comments = Comments.fetch_community_post_comments(ucid, id)
+    else
+      comments = YoutubeAPI.browse(continuation: continuation)
+    end
+    return Comments.parse_youtube(id, comments, format, locale, thin_mode, isPost: true)
+  end
+
  def self.channels(env)
    locale = env.get("preferences").as(Preferences).locale
    ucid = env.params.url["ucid"]
--- a/src/invidious/routes/api/v1/misc.cr
+++ b/src/invidious/routes/api/v1/misc.cr
@@ -228,17 +228,20 @@ module Invidious::Routes::API::V1::Misc
      resolved_url = YoutubeAPI.resolve_url(url.as(String))
      endpoint = resolved_url["endpoint"]
      pageType = endpoint.dig?("commandMetadata", "webCommandMetadata", "webPageType").try &.as_s || ""
-      if resolved_ucid = endpoint.dig?("watchEndpoint", "videoId")
-      elsif resolved_ucid = endpoint.dig?("browseEndpoint", "browseId")
-      elsif pageType == "WEB_PAGE_TYPE_UNKNOWN"
+      if pageType == "WEB_PAGE_TYPE_UNKNOWN"
        return error_json(400, "Unknown url")
      end
+
+      sub_endpoint = endpoint["watchEndpoint"]? || endpoint["browseEndpoint"]? || endpoint
+      params = sub_endpoint.try &.dig?("params")
    rescue ex
      return error_json(500, ex)
    end
    JSON.build do |json|
      json.object do
-        json.field "ucid", resolved_ucid.try &.as_s || ""
+        json.field "ucid", sub_endpoint["browseId"].as_s if sub_endpoint["browseId"]?
+        json.field "videoId", sub_endpoint["videoId"].as_s if sub_endpoint["videoId"]?
+        json.field "params", params.try &.as_s
        json.field "pageType", pageType
      end
    end
--- a/src/invidious/routes/api/v1/videos.cr
+++ b/src/invidious/routes/api/v1/videos.cr
@@ -101,20 +101,17 @@ module Invidious::Routes::API::V1::Videos
      if caption.name.includes? "auto-generated"
        caption_xml = YT_POOL.client &.get(url).body

+        settings_field = {
+          "Kind"     => "captions",
+          "Language" => "#{tlang || caption.language_code}",
+        }
+
        if caption_xml.starts_with?("<?xml")
          webvtt = caption.timedtext_to_vtt(caption_xml, tlang)
        else
          caption_xml = XML.parse(caption_xml)

-          webvtt = String.build do |str|
-            str << <<-END_VTT
-            WEBVTT
-            Kind: captions
-            Language: #{tlang || caption.language_code}
-
-
-            END_VTT
-
+          webvtt = WebVTT.build(settings_field) do |webvtt|
            caption_nodes = caption_xml.xpath_nodes("//transcript/text")
            caption_nodes.each_with_index do |node, i|
              start_time = node["start"].to_f.seconds
@@ -127,9 +124,6 @@ module Invidious::Routes::API::V1::Videos
                end_time = start_time + duration
              end

-              start_time = "#{start_time.hours.to_s.rjust(2, '0')}:#{start_time.minutes.to_s.rjust(2, '0')}:#{start_time.seconds.to_s.rjust(2, '0')}.#{start_time.milliseconds.to_s.rjust(3, '0')}"
-              end_time = "#{end_time.hours.to_s.rjust(2, '0')}:#{end_time.minutes.to_s.rjust(2, '0')}:#{end_time.seconds.to_s.rjust(2, '0')}.#{end_time.milliseconds.to_s.rjust(3, '0')}"
-
              text = HTML.unescape(node.content)
              text = text.gsub(/<font color="#[a-fA-F0-9]{6}">/, "")
              text = text.gsub(/<\/font>/, "")
@@ -137,12 +131,7 @@ module Invidious::Routes::API::V1::Videos
                text = "<v #{md["name"]}>#{md["text"]}</v>"
              end

-              str << <<-END_CUE
-              #{start_time} --> #{end_time}
-              #{text}
-
-
-              END_CUE
+              webvtt.cue(start_time, end_time, text)
            end
          end
        end
@@ -215,11 +204,7 @@ module Invidious::Routes::API::V1::Videos
      storyboard = storyboard[0]
    end

-    String.build do |str|
-      str << <<-END_VTT
-      WEBVTT
-      END_VTT
-
+    WebVTT.build do |vtt|
      start_time = 0.milliseconds
      end_time = storyboard[:interval].milliseconds

@@ -231,12 +216,8 @@ module Invidious::Routes::API::V1::Videos

        storyboard[:storyboard_height].times do |j|
          storyboard[:storyboard_width].times do |k|
-            str << <<-END_CUE
-            #{start_time}.000 --> #{end_time}.000
-            #{url}#xywh=#{storyboard[:width] * k},#{storyboard[:height] * j},#{storyboard[:width] - 2},#{storyboard[:height]}
-
-
-            END_CUE
+            current_cue_url = "#{url}#xywh=#{storyboard[:width] * k},#{storyboard[:height] * j},#{storyboard[:width] - 2},#{storyboard[:height]}"
+            vtt.cue(start_time, end_time, current_cue_url)

            start_time += storyboard[:interval].milliseconds
            end_time += storyboard[:interval].milliseconds
--- a/src/invidious/routes/channels.cr
+++ b/src/invidious/routes/channels.cr
@@ -1,6 +1,12 @@
 {% skip_file if flag?(:api_only) %}

 module Invidious::Routes::Channels
+  # Redirection for unsupported routes ("tabs")
+  def self.redirect_home(env)
+    ucid = env.params.url["ucid"]
+    return env.redirect "/channel/#{URI.encode_www_form(ucid)}"
+  end
+
  def self.home(env)
    self.videos(env)
  end
@@ -159,6 +165,11 @@ module Invidious::Routes::Channels
    end
    locale, user, subscriptions, continuation, ucid, channel = data

+    # redirect to post page
+    if lb = env.params.query["lb"]?
+      env.redirect "/post/#{URI.encode_www_form(lb)}?ucid=#{URI.encode_www_form(ucid)}"
+    end
+
    thin_mode = env.params.query["thin_mode"]? || env.get("preferences").as(Preferences).thin_mode
    thin_mode = thin_mode == "true"

@@ -187,6 +198,44 @@ module Invidious::Routes::Channels
    templated "community"
  end

+  def self.post(env)
+    # /post/{postId}
+    id = env.params.url["id"]
+    ucid = env.params.query["ucid"]?
+
+    prefs = env.get("preferences").as(Preferences)
+
+    locale = prefs.locale
+
+    thin_mode = env.params.query["thin_mode"]? || prefs.thin_mode
+    thin_mode = thin_mode == "true"
+
+    nojs = env.params.query["nojs"]?
+
+    nojs ||= "0"
+    nojs = nojs == "1"
+
+    if !ucid.nil?
+      ucid = ucid.to_s
+      post_response = fetch_channel_community_post(ucid, id, locale, "json", thin_mode)
+    else
+      # resolve the url to get the author's UCID
+      response = YoutubeAPI.resolve_url("https://www.youtube.com/post/#{id}")
+      return error_template(400, "Invalid post ID") if response["error"]?
+
+      ucid = response.dig("endpoint", "browseEndpoint", "browseId").as_s
+      post_response = fetch_channel_community_post(ucid, id, locale, "json", thin_mode)
+    end
+
+    post_response = JSON.parse(post_response)
+
+    if nojs
+      comments = Comments.fetch_community_post_comments(ucid, id)
+      comment_html = JSON.parse(Comments.parse_youtube(id, comments, "html", locale, thin_mode, isPost: true))["contentHtml"]
+    end
+    templated "post"
+  end
+
  def self.channels(env)
    data = self.fetch_basic_information(env)
    return data if !data.is_a?(Tuple)
@@ -217,6 +266,11 @@ module Invidious::Routes::Channels
    env.redirect "/channel/#{ucid}"
  end

+  private KNOWN_TABS = {
+    "home", "videos", "shorts", "streams", "podcasts",
+    "releases", "playlists", "community", "channels", "about",
+  }
+
  # Redirects brand url channels to a normal /channel/:ucid route
  def self.brand_redirect(env)
    locale = env.get("preferences").as(Preferences).locale
@@ -227,7 +281,10 @@ module Invidious::Routes::Channels
    yt_url_params = URI::Params.encode(env.params.query.to_h.select(["a", "u", "user"]))

    # Retrieves URL params that only Invidious uses
-    invidious_url_params = URI::Params.encode(env.params.query.to_h.select!(["a", "u", "user"]))
+    invidious_url_params = env.params.query.dup
+    invidious_url_params.delete_all("a")
+    invidious_url_params.delete_all("u")
+    invidious_url_params.delete_all("user")

    begin
      resolved_url = YoutubeAPI.resolve_url("https://youtube.com#{env.request.path}#{yt_url_params.size > 0 ? "?#{yt_url_params}" : ""}")
@@ -236,14 +293,17 @@ module Invidious::Routes::Channels
      return error_template(404, translate(locale, "This channel does not exist."))
    end

-    selected_tab = env.request.path.split("/")[-1]
-    if {"home", "videos", "shorts", "streams", "playlists", "community", "channels", "about"}.includes? selected_tab
+    selected_tab = env.params.url["tab"]?
+
+    if KNOWN_TABS.includes? selected_tab
      url = "/channel/#{ucid}/#{selected_tab}"
    else
      url = "/channel/#{ucid}"
    end

-    env.redirect url
+    url += "?#{invidious_url_params}" if !invidious_url_params.empty?
+
+    return env.redirect url
  end

  # Handles redirects for the /profile endpoint
--- a/src/invidious/routing.cr
+++ b/src/invidious/routing.cr
@@ -136,28 +136,42 @@ module Invidious::Routing
    get "/channel/:ucid/community", Routes::Channels, :community
    get "/channel/:ucid/channels", Routes::Channels, :channels
    get "/channel/:ucid/about", Routes::Channels, :about
+
    get "/channel/:ucid/live", Routes::Channels, :live
    get "/user/:user/live", Routes::Channels, :live
    get "/c/:user/live", Routes::Channels, :live
+    get "/post/:id", Routes::Channels, :post

-    {"", "/videos", "/shorts", "/streams", "/playlists", "/community", "/about"}.each do |path|
-      # /c/LinusTechTips
-      get "/c/:user#{path}", Routes::Channels, :brand_redirect
-      # /user/linustechtips | Not always the same as /c/
-      get "/user/:user#{path}", Routes::Channels, :brand_redirect
-      # /@LinusTechTips | Handle
-      get "/@:user#{path}", Routes::Channels, :brand_redirect
-      # /attribution_link?a=anything&u=/channel/UCZYTClx2T1of7BRZ86-8fow
-      get "/attribution_link#{path}", Routes::Channels, :brand_redirect
-      # /profile?user=linustechtips
-      get "/profile/#{path}", Routes::Channels, :profile
-    end
+    # Channel catch-all, to redirect future routes to the channel's home
+    # NOTE: defined last in order to be processed after the other routes
+    get "/channel/:ucid/*", Routes::Channels, :redirect_home
+
+    # /c/LinusTechTips
+    get "/c/:user", Routes::Channels, :brand_redirect
+    get "/c/:user/:tab", Routes::Channels, :brand_redirect
+
+    # /user/linustechtips (Not always the same as /c/)
+    get "/user/:user", Routes::Channels, :brand_redirect
+    get "/user/:user/:tab", Routes::Channels, :brand_redirect
+
+    # /@LinusTechTips (Handle)
+    get "/@:user", Routes::Channels, :brand_redirect
+    get "/@:user/:tab", Routes::Channels, :brand_redirect
+
+    # /attribution_link?a=anything&u=/channel/UCZYTClx2T1of7BRZ86-8fow
+    get "/attribution_link", Routes::Channels, :brand_redirect
+    get "/attribution_link/:tab", Routes::Channels, :brand_redirect
+
+    # /profile?user=linustechtips
+    get "/profile", Routes::Channels, :profile
+    get "/profile/*", Routes::Channels, :profile
  end

  def register_watch_routes
    get "/watch", Routes::Watch, :handle
    post "/watch_ajax", Routes::Watch, :mark_watched
    get "/watch/:id", Routes::Watch, :redirect
+    get "/live/:id", Routes::Watch, :redirect
    get "/shorts/:id", Routes::Watch, :redirect
    get "/clip/:clip", Routes::Watch, :clip
    get "/w/:id", Routes::Watch, :redirect
@@ -256,6 +270,10 @@ module Invidious::Routing
        get "/api/v1/channels/:ucid/#{{{route}}}", {{namespace}}::Channels, :{{route}}
      {% end %}

+      # Posts
+      get "/api/v1/post/:id", {{namespace}}::Channels, :post
+      get "/api/v1/post/:id/comments", {{namespace}}::Channels, :post_comments
+
      # 301 redirects to new /api/v1/channels/community/:ucid and /:ucid/community
      get "/api/v1/channels/comments/:ucid", {{namespace}}::Channels, :channel_comments_redirect
      get "/api/v1/channels/:ucid/comments", {{namespace}}::Channels, :channel_comments_redirect
@@ -265,6 +283,7 @@ module Invidious::Routing
      get "/api/v1/search/suggestions", {{namespace}}::Search, :search_suggestions
      get "/api/v1/hashtag/:hashtag", {{namespace}}::Search, :hashtag

+
      # Authenticated

      # The notification APIs cannot be extracted yet! They require the *local* notifications constant defined in invidious.cr
--- a/src/invidious/videos/caption.cr
+++ b/src/invidious/videos/caption.cr
@@ -52,17 +52,13 @@ module Invidious::Videos
            break
          end
        end
-        result = String.build do |result|
-          result << <<-END_VTT
-          WEBVTT
-          Kind: captions
-          Language: #{tlang || @language_code}

+        settings_field = {
+          "Kind"     => "captions",
+          "Language" => "#{tlang || @language_code}",
+        }

-          END_VTT
-
-          result << "\n\n"
-
+        result = WebVTT.build(settings_field) do |vtt|
          cues.each_with_index do |node, i|
            start_time = node["t"].to_f.milliseconds

@@ -76,29 +72,16 @@ module Invidious::Videos
              end_time = start_time + duration
            end

-            # start_time
-            result << start_time.hours.to_s.rjust(2, '0')
-            result << ':' << start_time.minutes.to_s.rjust(2, '0')
-            result << ':' << start_time.seconds.to_s.rjust(2, '0')
-            result << '.' << start_time.milliseconds.to_s.rjust(3, '0')
-
-            result << " --> "
-
-            # end_time
-            result << end_time.hours.to_s.rjust(2, '0')
-            result << ':' << end_time.minutes.to_s.rjust(2, '0')
-            result << ':' << end_time.seconds.to_s.rjust(2, '0')
-            result << '.' << end_time.milliseconds.to_s.rjust(3, '0')
-
-            result << "\n"
-
-            node.children.each do |s|
-              result << s.content
+            text = String.build do |io|
+              node.children.each do |s|
+                io << s.content
+              end
            end
-            result << "\n"
-            result << "\n"
+
+            vtt.cue(start_time, end_time, text)
          end
        end
+
        return result
      end
    end
--- a/src/invidious/videos/transcript.cr
+++ b/src/invidious/videos/transcript.cr
@@ -34,41 +34,15 @@ module Invidious::Videos
      # Convert into array of TranscriptLine
      lines = self.parse(initial_data)

+      settings_field = {
+        "Kind"     => "captions",
+        "Language" => target_language,
+      }
+
      # Taken from Invidious::Videos::Captions::Metadata.timedtext_to_vtt()
-      vtt = String.build do |vtt|
-        vtt << <<-END_VTT
-        WEBVTT
-        Kind: captions
-        Language: #{target_language}
-
-
-        END_VTT
-
-        vtt << "\n\n"
-
+      vtt = WebVTT.build(settings_field) do |vtt|
        lines.each do |line|
-          start_time = line.start_ms
-          end_time = line.end_ms
-
-          # start_time
-          vtt << start_time.hours.to_s.rjust(2, '0')
-          vtt << ':' << start_time.minutes.to_s.rjust(2, '0')
-          vtt << ':' << start_time.seconds.to_s.rjust(2, '0')
-          vtt << '.' << start_time.milliseconds.to_s.rjust(3, '0')
-
-          vtt << " --> "
-
-          # end_time
-          vtt << end_time.hours.to_s.rjust(2, '0')
-          vtt << ':' << end_time.minutes.to_s.rjust(2, '0')
-          vtt << ':' << end_time.seconds.to_s.rjust(2, '0')
-          vtt << '.' << end_time.milliseconds.to_s.rjust(3, '0')
-
-          vtt << "\n"
-          vtt << line.line
-
-          vtt << "\n"
-          vtt << "\n"
+          vtt.cue(line.start_ms, line.end_ms, line.line)
        end
      end

--- a/src/invidious/views/community.ecr
+++ b/src/invidious/views/community.ecr
@@ -26,7 +26,7 @@
        <p><%= error_message %></p>
    </div>
 <% else %>
-    <div class="h-box pure-g" id="comments">
+    <div class="h-box pure-g comments" id="comments">
        <%= IV::Frontend::Comments.template_youtube(items.not_nil!, locale, thin_mode) %>
    </div>
 <% end %>
--- a/src/invidious/views/components/item.ecr
+++ b/src/invidious/views/components/item.ecr
@@ -26,8 +26,9 @@
                </a></div>
            </div>

+            <% if !item.channel_handle.nil? %><p class="channel-name" dir="auto"><%= item.channel_handle %></p><% end %>
            <p><%= translate_count(locale, "generic_subscribers_count", item.subscriber_count, NumberFormatting::Separator) %></p>
-            <% if !item.auto_generated %><p><%= translate_count(locale, "generic_videos_count", item.video_count, NumberFormatting::Separator) %></p><% end %>
+            <% if !item.auto_generated && item.channel_handle.nil? %><p><%= translate_count(locale, "generic_videos_count", item.video_count, NumberFormatting::Separator) %></p><% end %>
            <h5><%= item.description_html %></h5>
        <% when SearchHashtag %>
            <% if !thin_mode %>
--- a/src/invidious/views/post.ecr
+++ b/src/invidious/views/post.ecr
@@ -0,0 +1,48 @@
+<% content_for "header" do %>
+<title>Invidious</title>
+<% end %>
+
+<div>
+    <div id="post" class="comments post-comments">
+        <%= IV::Frontend::Comments.template_youtube(post_response.not_nil!, locale, thin_mode) %>
+    </div>
+
+    <% if nojs %>
+        <hr>
+    <% end %>
+    <br />
+
+    <div id="comments" class="comments post-comments">
+        <% if nojs %>
+            <%= comment_html %>
+        <% else %>
+            <noscript>
+                <a href="/post/<%= id %>?ucid=<%= ucid %>&nojs=1">
+                    <%= translate(locale, "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.") %>
+                </a>
+            </noscript>
+        <% end %>
+    </div>
+</div>
+
+<script id="video_data" type="application/json">
+<%=
+{
+    "id" => id,
+    "youtube_comments_text" => HTML.escape(translate(locale, "View YouTube comments")),
+    "reddit_comments_text" => "",
+    "reddit_permalink_text" => "",
+    "comments_text" => HTML.escape(translate(locale, "View `x` comments", "{commentCount}")),
+    "hide_replies_text" => HTML.escape(translate(locale, "Hide replies")),
+    "show_replies_text" => HTML.escape(translate(locale, "Show replies")),
+    "params" => {
+        "comments": ["youtube"]
+    },
+    "preferences" => prefs,
+    "base_url" => "/api/v1/post/#{URI.encode_www_form(id)}/comments",
+    "ucid" => ucid
+}.to_pretty_json
+%>
+</script>
+<script src="/js/comments.js?v=<%= ASSET_COMMIT %>"></script>
+<script src="/js/post.js?v=<%= ASSET_COMMIT %>"></script>
--- a/src/invidious/views/watch.ecr
+++ b/src/invidious/views/watch.ecr
@@ -67,7 +67,8 @@ we're going to need to do it here in order to allow for translations.
    "premiere_timestamp" => video.premiere_timestamp.try &.to_unix,
    "vr" => video.is_vr,
    "projection_type" => video.projection_type,
-    "local_disabled" => CONFIG.disabled?("local")
+    "local_disabled" => CONFIG.disabled?("local"),
+    "support_reddit" => true
 }.to_pretty_json
 %>
 </script>
@@ -301,7 +302,7 @@ we're going to need to do it here in order to allow for translations.
            <hr>

            <% end %>
-            <div id="comments">
+            <div id="comments" class="comments">
                <% if nojs %>
                    <%= comment_html %>
                <% else %>
@@ -385,4 +386,5 @@ we're going to need to do it here in order to allow for translations.
        </div>
    <% end %>
 </div>
+<script src="/js/comments.js?v=<%= ASSET_COMMIT %>"></script>
 <script src="/js/watch.js?v=<%= ASSET_COMMIT %>"></script>
--- a/src/invidious/yt_backend/extractors.cr
+++ b/src/invidious/yt_backend/extractors.cr
@@ -175,17 +175,18 @@ private module Parsers
      # Always simpleText
      # TODO change default value to nil

-      subscriber_count = item_contents.dig?("subscriberCountText", "simpleText")
+      subscriber_count = item_contents.dig?("subscriberCountText", "simpleText").try &.as_s
+      channel_handle = subscriber_count if (subscriber_count.try &.starts_with? "@")

      # Since youtube added channel handles, `VideoCountText` holds the number of
      # subscribers and `subscriberCountText` holds the handle, except when the
      # channel doesn't have a handle (e.g: some topic music channels).
      # See https://github.com/iv-org/invidious/issues/3394#issuecomment-1321261688
-      if !subscriber_count || !subscriber_count.as_s.includes? " subscriber"
-        subscriber_count = item_contents.dig?("videoCountText", "simpleText")
+      if !subscriber_count || !subscriber_count.includes? " subscriber"
+        subscriber_count = item_contents.dig?("videoCountText", "simpleText").try &.as_s
      end
      subscriber_count = subscriber_count
-        .try { |s| short_text_to_number(s.as_s.split(" ")[0]).to_i32 } || 0
+        .try { |s| short_text_to_number(s.split(" ")[0]).to_i32 } || 0

      # Auto-generated channels doesn't have videoCountText
      # Taken from: https://github.com/iv-org/invidious/pull/2228#discussion_r717620922
@@ -200,6 +201,7 @@ private module Parsers
        author_thumbnail: author_thumbnail,
        subscriber_count: subscriber_count,
        video_count:      video_count,
+        channel_handle:   channel_handle,
        description_html: description_html,
        auto_generated:   auto_generated,
        author_verified:  author_verified,