chore: update to ameba 1.7.0 and adapt most of the code to it

.ameba.yml

@@ -8,6 +8,12 @@ Lint/UselessAssign:
     - src/invidious.cr
     - src/invidious/helpers/errors.cr
     - src/invidious/routes/*.cr
+    - src/invidious/views/**/**
+
+# Exclude unused arguments for ECR files
+Lint/UnusedArgument:
+  Excluded:
+    - src/invidious/views/**/**
 
 # Ignore false negative (if !db.query_one?...)
 Lint/UnreachableCode:
@@ -27,7 +33,6 @@ Lint/SpecFilename:
   Excluded:
     - spec/parsers_helper.cr
 
-
 #
 # Style
 #
@@ -44,6 +49,15 @@ Style/RedundantNext:
 Style/ParenthesesAroundCondition:
   Enabled: false
 
+# Disable this as it's really useful for functions and variables
+# that belong to a same module, struct or class, and it can be confused
+# by a global function.
+# This is subject to change with https://github.com/iv-org/invidious/pull/6046
+# where there will not be more global variables or functions, well, that's
+# the goal.
+Style/RedundantSelf:
+  Enabled: false
+
 # This requires a rewrite of most data structs (and their usage) in Invidious.
 Naming/QueryBoolMethods:
   Enabled: false
@@ -56,12 +70,11 @@ Naming/BlockParameterName:
 
 # Hides TODO comment warnings.
 #
-# Call `bin/ameba --only Documentation/DocumentationAdmonition` to
+# Call `bin/ameba --only Documentation/Admonition` to
 # list them
-Documentation/DocumentationAdmonition:
+Documentation/Admonition:
   Enabled: false
 
-
 #
 # Metrics
 #

src/invidious.cr

@@ -123,7 +123,7 @@ Kemal.config.extra_options do |parser|
   parser.on("-c THREADS", "--channel-threads=THREADS", "Number of threads for refreshing channels (default: #{CONFIG.channel_threads})") do |number|
     begin
       CONFIG.channel_threads = number.to_i
-    rescue ex
+    rescue
       puts "THREADS must be integer"
       exit
     end
@@ -131,7 +131,7 @@ Kemal.config.extra_options do |parser|
   parser.on("-f THREADS", "--feed-threads=THREADS", "Number of threads for refreshing feeds (default: #{CONFIG.feed_threads})") do |number|
     begin
       CONFIG.feed_threads = number.to_i
-    rescue ex
+    rescue
       puts "THREADS must be integer"
       exit
     end

src/invidious/channels/channels.cr

@@ -107,7 +107,7 @@ class ChannelRedirect < Exception
 end
 
 def get_batch_channels(channels)
-  finished_channel = Channel(String | Nil).new
+  finished_channel = Channel(String?).new
   max_threads = 10
 
   spawn do
@@ -125,7 +125,7 @@ def get_batch_channels(channels)
         begin
           get_channel(ucid)
           finished_channel.send(ucid)
-        rescue ex
+        rescue
           finished_channel.send(nil)
         ensure
           active_channel.send(nil)

src/invidious/comments/links_util.cr

@@ -15,7 +15,7 @@ module Invidious::Comments
 
       if url.host.nil? || url.host.not_nil!.ends_with?("youtube.com") || url.host.not_nil!.ends_with?("youtu.be")
         if url.host.try &.ends_with? "youtu.be"
-          url = "/watch?v=#{url.path.lstrip('/')}#{url.query_params}"
+          anchor["href"] = "/watch?v=#{url.path.lstrip('/')}#{url.query_params}"
         else
           if url.path == "/redirect"
             params = HTTP::Params.parse(url.query.not_nil!)
@@ -27,7 +27,7 @@ module Invidious::Comments
       elsif url.to_s == "#"
         begin
           length_seconds = decode_length_seconds(anchor.content)
-        rescue ex
+        rescue
           length_seconds = decode_time(anchor.content)
         end
 

src/invidious/database/base.cr

@@ -45,7 +45,7 @@ module Invidious::Database
     # Create table if it doesn't exist
     begin
       PG_DB.exec("SELECT * FROM #{table_name} LIMIT 0")
-    rescue ex
+    rescue
       LOGGER.info("check_table: check_table: CREATE TABLE #{table_name}")
 
       PG_DB.using_connection do |conn|

src/invidious/frontend/comments_youtube.cr

@@ -141,7 +141,6 @@ module Invidious::Frontend::Comments
                 <div id="skip-#{child["commentId"]}"></div>
               </section>
               END_HTML
-          else nil # Ignore
           end
         end
 

src/invidious/helpers/crystal_class_overrides.cr

@@ -68,7 +68,7 @@ class HTTP::Server::Response
   class Output
     private def unbuffered_flush
       @io.flush
-    rescue ex : IO::Error
+    rescue IO::Error
       unbuffered_close
     end
   end

src/invidious/helpers/errors.cr

@@ -139,7 +139,7 @@ def error_json_helper(
   env : HTTP::Server::Context,
   status_code : Int32,
   exception : Exception,
-  additional_fields : Hash(String, Object) | Nil = nil,
+  additional_fields : Hash(String, Object)? = nil,
 )
   if exception.is_a?(InfoException)
     return error_json_helper(env, status_code, exception.message || "", additional_fields)
@@ -161,7 +161,7 @@ def error_json_helper(
   env : HTTP::Server::Context,
   status_code : Int32,
   message : String,
-  additional_fields : Hash(String, Object) | Nil = nil,
+  additional_fields : Hash(String, Object)? = nil,
 )
   env.response.content_type = "application/json"
   env.response.status_code = status_code

src/invidious/helpers/handlers.cr

@@ -20,7 +20,7 @@ module HTTP::Handler
 end
 
 class Kemal::RouteHandler
-  {% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %}
+  {% for method in %w[GET POST PUT HEAD DELETE PATCH OPTIONS] %}
     exclude ["/api/v1/*"], {{ method }}
   {% end %}
 
@@ -44,7 +44,7 @@ class Kemal::RouteHandler
 end
 
 class Kemal::ExceptionHandler
-  {% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %}
+  {% for method in %w[GET POST PUT HEAD DELETE PATCH OPTIONS] %}
     exclude ["/api/v1/*"], {{ method }}
   {% end %}
 
@@ -72,7 +72,7 @@ class FilteredCompressHandler < HTTP::CompressHandler
 end
 
 class AuthHandler < Kemal::Handler
-  {% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %}
+  {% for method in %w[GET POST PUT HEAD DELETE PATCH OPTIONS] %}
     only ["/api/v1/auth/*"], {{ method }}
   {% end %}
 
@@ -121,7 +121,7 @@ class AuthHandler < Kemal::Handler
 end
 
 class APIHandler < Kemal::Handler
-  {% for method in %w(GET POST PUT HEAD DELETE PATCH OPTIONS) %}
+  {% for method in %w[GET POST PUT HEAD DELETE PATCH OPTIONS] %}
   only ["/api/v1/*"], {{ method }}
   {% end %}
   exclude ["/api/v1/auth/notifications"], "GET"
@@ -134,9 +134,9 @@ class APIHandler < Kemal::Handler
 end
 
 class DisableAbusableAPIHandler < Kemal::Handler
-  {% for method in %w(GET HEAD) %}
+  {% for method in %w[GET HEAD] %}
     # This endpoints make a video request to Invidious companion.
-    {% for endpoint in %w(videos clips transcripts) %}
+    {% for endpoint in %w[videos clips transcripts] %}
       only ["/api/v1/{{ endpoint.id }}/:id"], {{ method }}
     {% end %}
   {% end %}

src/invidious/helpers/helpers.cr

@@ -93,7 +93,7 @@ module Helpers
             sleep 1.minute
             Fiber.yield
           end
-        rescue ex
+        rescue
         end
       end
     end
@@ -149,7 +149,7 @@ module Helpers
 
           id += 1
         end
-      rescue ex
+      rescue
       ensure
         connection_channel.send({false, connection})
       end
@@ -163,7 +163,7 @@ module Helpers
         env.response.flush
         sleep (20 + rand(11)).seconds
       end
-    rescue ex
+    rescue
     ensure
       connection_channel.send({false, connection})
     end

src/invidious/helpers/i18n.cr

@@ -103,7 +103,7 @@ module I18n
     return locales
   end
 
-  def translate(locale : String?, key : String, text : String | Hash(String, String) | Nil = nil) : String
+  def translate(locale : String?, key : String, text : String? | Hash(String, String)? = nil) : String
     # Log a warning if "key" doesn't exist in en-US locale and return
     # that key as the text, so this is more or less transparent to the user.
     if !LOCALES["en-US"].has_key?(key)

src/invidious/helpers/logger.cr

@@ -55,7 +55,7 @@ class Invidious::LogHandler < Kemal::BaseLogHandler
     end
   end
 
-  {% for level in %w(trace debug info warn error fatal) %}
+  {% for level in %w[trace debug info warn error fatal] %}
     def {{ level.id }}(message : String)
       if LogLevel::{{ level.id.capitalize }} >= @level
         puts("#{Time.utc} [{{ level.id }}] #{message}".colorize(color(LogLevel::{{ level.id.capitalize }})))

src/invidious/helpers/tokens.cr

@@ -116,7 +116,7 @@ def scope_includes_scope(scope, subset)
   subset_endpoint = subset_endpoint.downcase
 
   if methods.empty?
-    methods = %w(GET POST PUT HEAD DELETE PATCH OPTIONS)
+    methods = %w[GET POST PUT HEAD DELETE PATCH OPTIONS]
   end
 
   if methods & subset_methods != subset_methods

src/invidious/helpers/utils.cr

@@ -102,7 +102,7 @@ def decode_date(string : String)
   # Try to parse as format Jul 10, 2000
   begin
     return Time.parse(string, "%b %-d, %Y", Time::Location.local)
-  rescue ex
+  rescue
   end
 
   case string
@@ -110,7 +110,6 @@ def decode_date(string : String)
     return Time.utc
   when "yesterday"
     return Time.utc - 1.day
-  else nil # Continue
   end
 
   # String matches format "20 hours ago", "4 months ago", "20s ago", "15min ago"...
@@ -177,7 +176,7 @@ def short_text_to_number(short_text : String) : Int64
   end
 
   return number.to_i64
-rescue ex
+rescue
   return 0_i64
 end
 

src/invidious/jobs/instance_refresh_job.cr

@@ -69,7 +69,7 @@ class Invidious::Jobs::InstanceListRefreshJob < Invidious::Jobs::BaseJob
 
       raw_instance_list = JSON.parse(instance_api_client.get("/instances.json").body).as_a
       instance_api_client.close
-    rescue ex : Socket::ConnectError | IO::TimeoutError | JSON::ParseException
+    rescue Socket::ConnectError | IO::TimeoutError | JSON::ParseException
       raw_instance_list = [] of JSON::Any
     end
 

src/invidious/jsonify/api_v1/video_json.cr

@@ -138,7 +138,7 @@ module Invidious::JSONify::APIv1
 
               if fmt_info = Invidious::Videos::Formats.itag_to_metadata?(fmt["itag"])
                 json.field "container", fmt_info["ext"]
-                json.field "encoding", fmt_info["vcodec"]? || fmt_info["acodec"]
+                json.field("encoding", fmt_info["vcodec"]? || fmt_info["acodec"])
               end
 
               # Livestream chunk infos
@@ -198,8 +198,8 @@ module Invidious::JSONify::APIv1
               end
 
               if fmt_info = Invidious::Videos::Formats.itag_to_metadata?(fmt["itag"])
-                json.field "container", fmt_info["ext"]
-                json.field "encoding", fmt_info["vcodec"]? || fmt_info["acodec"]
+                json.field("container", fmt_info["ext"])
+                json.field("encoding", fmt_info["vcodec"]? || fmt_info["acodec"])
               end
             end
           end

src/invidious/playlists.cr

@@ -500,10 +500,10 @@ def extract_playlist_videos(playlist_id : String, initial_data : Hash(String, JS
 
       # Find the metadataParts with commandRuns inside, which contains author
       # information.
-      metadata_parts = metadata_rows.try &.find { |row|
+      metadata_parts = metadata_rows.try &.find do |row|
         parts = row["metadataParts"]?.try &.as_a
         parts && parts.any? { |item2| item2.dig?("text", "commandRuns").try &.as_a }
-      }.try &.["metadataParts"].as_a
+      end.try &.["metadataParts"].as_a
 
       if author_info = metadata_parts.try &.find(&.dig?("text", "commandRuns"))
            .try &.["text"]

src/invidious/routes/api/manifest.cr

@@ -19,9 +19,9 @@ module Invidious::Routes::API::Manifest
 
     begin
       video = get_video(id, region: region)
-    rescue ex : NotFoundException
+    rescue NotFoundException
       haltf env, status_code: 404
-    rescue ex
+    rescue
       haltf env, status_code: 403
     end
 

src/invidious/routes/api/v1/authenticated.cr

@@ -42,10 +42,10 @@ module Invidious::Routes::API::V1::Authenticated
     user = env.get("user").as(User)
 
     begin
-      if body = env.request.body
-        body = env.request.body.not_nil!.gets_to_end
+      body = if raw_body = env.request.body
+               raw_body.gets_to_end
              else
-        body = "{}"
+               "{}"
              end
       Invidious::User::Import.from_invidious(user, body)
     rescue

src/invidious/routes/api/v1/channels.cr

@@ -31,7 +31,7 @@ module Invidious::Routes::API::V1::Channels
       begin
         playlist = get_playlist(channel.ucid.sub("UC", "UULF"))
         videos = get_playlist_videos(playlist, offset: 0)
-      rescue ex : InfoException
+      rescue InfoException
         # playlist doesnt exist.
         videos = [] of PlaylistVideo
       end
@@ -118,7 +118,7 @@ module Invidious::Routes::API::V1::Channels
             # Fetch related channels
             begin
               related_channels, _ = fetch_related_channels(channel)
-            rescue ex
+            rescue
               related_channels = [] of SearchChannel
             end
 
@@ -157,7 +157,7 @@ module Invidious::Routes::API::V1::Channels
       begin
         playlist = get_playlist(channel.ucid.sub("UC", "UULF"))
         videos = get_playlist_videos(playlist, offset: 0)
-      rescue ex : InfoException
+      rescue InfoException
         # playlist doesnt exist.
         videos = [] of PlaylistVideo
       end
@@ -203,7 +203,7 @@ module Invidious::Routes::API::V1::Channels
       begin
         playlist = get_playlist(channel.ucid.sub("UC", "UUSH"))
         videos = get_playlist_videos(playlist, offset: 0)
-      rescue ex : InfoException
+      rescue InfoException
         # playlist doesnt exist.
         videos = [] of PlaylistVideo
       end
@@ -249,7 +249,7 @@ module Invidious::Routes::API::V1::Channels
       begin
         playlist = get_playlist(channel.ucid.sub("UC", "UULV"))
         videos = get_playlist_videos(playlist, offset: 0)
-      rescue ex : InfoException
+      rescue InfoException
         # playlist doesnt exist.
         videos = [] of PlaylistVideo
       end

src/invidious/routes/api/v1/misc.cr

@@ -53,7 +53,7 @@ module Invidious::Routes::API::V1::Misc
       playlist = get_playlist(plid)
     rescue ex : InfoException
       return error_json(404, ex)
-    rescue ex
+    rescue
       return error_json(404, "Playlist does not exist.")
     end
 

src/invidious/routes/api/v1/videos.cr

@@ -47,9 +47,9 @@ module Invidious::Routes::API::V1::Videos
 
     begin
       video = get_video(id, region: region)
-    rescue ex : NotFoundException
+    rescue NotFoundException
       haltf env, 404
-    rescue ex
+    rescue
       haltf env, 500
     end
 
@@ -187,9 +187,9 @@ module Invidious::Routes::API::V1::Videos
 
     begin
       video = get_video(id, region: region)
-    rescue ex : NotFoundException
+      rescue : NotFoundException
       haltf env, 404
-    rescue ex
+    rescue
       haltf env, 500
     end
 
@@ -265,8 +265,6 @@ module Invidious::Routes::API::V1::Videos
       haltf env, 400
     end
 
-    annotations = ""
-
     case source
     when "archive"
       if CONFIG.cache_annotations && (cached_annotation = Invidious::Database::Annotations.select(video_id))
@@ -365,7 +363,7 @@ module Invidious::Routes::API::V1::Videos
 
       begin
         comments, reddit_thread = Comments.fetch_reddit(id, sort_by: sort_by)
-      rescue ex
+      rescue
         comments = nil
         reddit_thread = nil
       end

src/invidious/routes/channels.cr

@@ -44,7 +44,7 @@ module Invidious::Routes::Channels
         begin
           playlist = get_playlist(channel.ucid.sub("UC", "UULF"))
           items = get_playlist_videos(playlist, offset: 0)
-        rescue ex : InfoException
+        rescue InfoException
           # playlist doesnt exist.
           items = [] of PlaylistVideo
         end
@@ -79,7 +79,7 @@ module Invidious::Routes::Channels
       begin
         playlist = get_playlist(channel.ucid.sub("UC", "UUSH"))
         items = get_playlist_videos(playlist, offset: 0)
-      rescue ex : InfoException
+      rescue InfoException
         # playlist doesnt exist.
         items = [] of PlaylistVideo
       end
@@ -114,7 +114,7 @@ module Invidious::Routes::Channels
       begin
         playlist = get_playlist(channel.ucid.sub("UC", "UULV"))
         items = get_playlist_videos(playlist, offset: 0)
-      rescue ex : InfoException
+      rescue InfoException
         # playlist doesnt exist.
         items = [] of PlaylistVideo
       end
@@ -353,7 +353,7 @@ module Invidious::Routes::Channels
     begin
       resolved_url = YoutubeAPI.resolve_url("https://www.youtube.com#{env.request.path}#{yt_url_params.size > 0 ? "?#{yt_url_params}" : ""}")
       ucid = resolved_url["endpoint"]["browseEndpoint"]["browseId"]
-    rescue ex : InfoException | KeyError
+    rescue InfoException | KeyError
       return error_template(404, I18n.translate(locale, "This channel does not exist."))
     end
 

src/invidious/routes/companion.cr

@@ -12,7 +12,7 @@ module Invidious::Routes::Companion
           return self.proxy_companion(env, resp)
         end
       end
-    rescue ex
+    rescue
     end
   end
 
@@ -29,7 +29,7 @@ module Invidious::Routes::Companion
           return self.proxy_companion(env, resp)
         end
       end
-    rescue ex
+    rescue
     end
   end
 
@@ -45,7 +45,7 @@ module Invidious::Routes::Companion
           return self.proxy_companion(env, resp)
         end
       end
-    rescue ex
+    rescue
     end
   end
 

src/invidious/routes/embed.cr

@@ -119,7 +119,6 @@ module Invidious::Routes::Embed
       end
 
       return env.redirect url
-    else nil # Continue
     end
 
     params = Invidious::Videos.process_video_params(env.params.query, preferences)
@@ -182,14 +181,14 @@ module Invidious::Routes::Embed
 
     captions = video.captions
 
-    preferred_captions = captions.select { |caption|
+    preferred_captions = captions.select do |caption|
       params.preferred_captions.includes?(caption.name) ||
         params.preferred_captions.includes?(caption.language_code.split("-")[0])
-    }
-    preferred_captions.sort_by! { |caption|
+    end
+    preferred_captions.sort_by! do |caption|
       (params.preferred_captions.index(caption.name) ||
         params.preferred_captions.index(caption.language_code.split("-")[0])).not_nil!
-    }
+    end
     captions = captions - preferred_captions
 
     aspect_ratio = nil

src/invidious/routes/feeds.cr

@@ -327,7 +327,6 @@ module Invidious::Routes::Feeds
           request_target = URI.parse(node[attribute.name]).request_target
           query_string_opt = request_target.starts_with?("/watch?v=") ? ("&#{params}" if !params.empty?) : ""
           node[attribute.name] = "#{HOST_URL}#{request_target}#{query_string_opt}"
-        else nil # Skip
         end
       end
     end

src/invidious/routes/images.cr

@@ -15,7 +15,7 @@ module Invidious::Routes::Images
       GGPHT_POOL.client &.get(url, headers) do |resp|
         return self.proxy_image(env, resp)
       end
-    rescue ex
+    rescue
     end
   end
 
@@ -46,7 +46,7 @@ module Invidious::Routes::Images
         env.response.headers["Connection"] = "close"
         return self.proxy_image(env, resp)
       end
-    rescue ex
+    rescue
     end
   end
 
@@ -68,7 +68,7 @@ module Invidious::Routes::Images
       get_ytimg_pool(authority).client &.get(url, headers) do |resp|
         return self.proxy_image(env, resp)
       end
-    rescue ex
+    rescue
     end
   end
 
@@ -108,7 +108,7 @@ module Invidious::Routes::Images
 
         Helpers.proxy_file(response, env)
       end
-    rescue ex
+    rescue
     end
   end
 
@@ -140,7 +140,7 @@ module Invidious::Routes::Images
       get_ytimg_pool("i").client &.get(url, headers) do |resp|
         return self.proxy_image(env, resp)
       end
-    rescue ex
+    rescue
     end
   end
 

src/invidious/routes/login.cr

@@ -103,7 +103,7 @@ module Invidious::Routes::Login
 
             begin
               validate_request(tokens[0], answer, env.request, HMAC_KEY, locale)
-            rescue ex : InfoException
+            rescue InfoException
               return error_template(400, InfoException.new("Erroneous CAPTCHA"))
             rescue ex
               return error_template(400, ex)

src/invidious/routes/playlists.cr

@@ -164,7 +164,7 @@ module Invidious::Routes::Playlists
 
     begin
       items = get_playlist_videos(playlist, offset: (page - 1) * 100)
-    rescue ex
+    rescue
       items = [] of PlaylistVideo
     end
 
@@ -255,7 +255,7 @@ module Invidious::Routes::Playlists
     begin
       query = Invidious::Search::Query.new(env.params.query, :playlist, region)
       items = query.process.select(SearchVideo).map(&.as(SearchVideo))
-    rescue ex
+    rescue
       items = [] of SearchVideo
     end
 

src/invidious/routes/preferences.cr

@@ -362,7 +362,6 @@ module Invidious::Routes::PreferencesRoute
               response: error_template(415, "Uploaded file is too large")
             )
           end
-        else nil # Ignore
         end
       end
     end

src/invidious/routes/video_playback.cr

@@ -115,7 +115,7 @@ module Invidious::Routes::VideoPlayback
 
           IO.copy(resp.body_io, env.response)
         end
-      rescue ex
+      rescue
       end
     else
       if query_params["title"]? && CONFIG.disabled?("downloads") ||

src/invidious/routes/watch.cr

@@ -82,7 +82,7 @@ module Invidious::Routes::Watch
         if source == "youtube"
           begin
             comment_html = JSON.parse(Comments.fetch_youtube(id, nil, "html", locale, preferences.thin_mode, region))["contentHtml"]
-          rescue ex
+          rescue
             if preferences.comments[1] == "reddit"
               comments, reddit_thread = Comments.fetch_reddit(id)
               comment_html = Frontend::Comments.template_reddit(comments, locale)
@@ -98,7 +98,7 @@ module Invidious::Routes::Watch
 
             comment_html = Comments.fill_links(comment_html, "https", "www.reddit.com")
             comment_html = Comments.replace_links(comment_html)
-          rescue ex
+          rescue
             if preferences.comments[1] == "youtube"
               comment_html = JSON.parse(Comments.fetch_youtube(id, nil, "html", locale, preferences.thin_mode, region))["contentHtml"]
             end
@@ -143,14 +143,14 @@ module Invidious::Routes::Watch
 
     captions = video.captions
 
-    preferred_captions = captions.select { |caption|
+    preferred_captions = captions.select do |caption|
       params.preferred_captions.includes?(caption.name) ||
         params.preferred_captions.includes?(caption.language_code.split("-")[0])
-    }
-    preferred_captions.sort_by! { |caption|
+    end
+    preferred_captions.sort_by! do |caption|
       (params.preferred_captions.index(caption.name) ||
         params.preferred_captions.index(caption.language_code.split("-")[0])).not_nil!
-    }
+    end
     captions = captions - preferred_captions
 
     aspect_ratio = "16:9"

src/invidious/search/processors.cr

@@ -39,7 +39,7 @@ module Invidious::Search
     def subscriptions(query : Query, user : Invidious::User) : Array(ChannelVideo)
       view_name = "subscriptions_#{sha256(user.email)}"
 
-      return PG_DB.query_all("
+      return PG_DB.query_all(<<-SQL,
         SELECT id,title,published,updated,ucid,author,length_seconds
         FROM (
           SELECT *,
@@ -47,7 +47,8 @@ module Invidious::Search
           to_tsvector(#{view_name}.author)
           as document
           FROM #{view_name}
-        ) v_search WHERE v_search.document @@ plainto_tsquery($1) LIMIT 20 OFFSET $2;",
+        ) v_search WHERE v_search.document @@ plainto_tsquery($1) LIMIT 20 OFFSET $2;
+        SQL
         query.text, (query.page - 1) * 20,
         as: ChannelVideo
       )

src/invidious/trending.cr

@@ -2,10 +2,10 @@ def fetch_trending(trending_type, region, locale)
   region ||= "US"
   region = region.upcase
 
+  # 2026-10-12: plid is only used in line 47
+  # so we can remove this later.
   plid = nil
 
-  browse_id = ""
-
   case trending_type.try &.downcase
   when "gaming"
     browse_id = "UCOpNcN46UbXVtpKMrmU4Abg"

src/invidious/user/imports.cr

@@ -56,7 +56,7 @@ struct Invidious::User
 
           begin
             video = get_video(video_id)
-          rescue ex
+          rescue
             next
           end
 
@@ -130,7 +130,7 @@ struct Invidious::User
 
             begin
               video = get_video(video_id, false)
-            rescue ex
+            rescue
               next
             end
 

src/invidious/user/preferences.cr

@@ -73,7 +73,7 @@ struct Preferences
         else
           result
         end
-      rescue ex
+      rescue
         if value.read_bool
           "dark"
         else
@@ -199,7 +199,7 @@ struct Preferences
         value.read_array do
           result << HTML.escape(value.read_string[0, 100])
         end
-      rescue ex
+      rescue
         result = [HTML.escape(value.read_string[0, 100]), ""]
       end
 
@@ -228,7 +228,7 @@ struct Preferences
 
           result << HTML.escape(item.value[0, 100])
         end
-      rescue ex
+      rescue
         if node.is_a?(YAML::Nodes::Scalar)
           result = [HTML.escape(node.value[0, 100]), ""]
         else

src/invidious/user/user.cr

@@ -19,7 +19,7 @@ struct Invidious::User
     def self.from_rs(rs)
       begin
         Preferences.from_json(rs.read(String))
-      rescue ex
+      rescue
         Preferences.from_json("{}")
       end
     end

src/invidious/users.cr

@@ -45,7 +45,6 @@ def get_subscription_feed(user, max_results = 40, page = 1)
       notifications.sort_by!(&.author)
     when "channel name - reverse"
       notifications.sort_by!(&.author).reverse!
-    else nil # Ignore
     end
   else
     if user.preferences.latest_only
@@ -94,7 +93,6 @@ def get_subscription_feed(user, max_results = 40, page = 1)
       videos.sort_by!(&.author)
     when "channel name - reverse"
       videos.sort_by!(&.author).reverse!
-    else nil # Ignore
     end
 
     notifications = Invidious::Database::Users.select_notifications(user)

src/invidious/videos.cr

@@ -48,7 +48,7 @@ struct Video
     end
   end
 
-  def to_json(json : JSON::Builder | Nil = nil)
+  def to_json(json : JSON::Builder? = nil)
     to_json(nil, json)
   end
 
@@ -150,7 +150,7 @@ struct Video
 
   def dash_manifest_url : String?
     raw_dash_url = info.dig?("streamingData", "dashManifestUrl").try &.as_s
-    return nil if raw_dash_url.nil?
+    return if raw_dash_url.nil?
 
     # Use manifest v5 parameter to reduce file size
     # See https://github.com/iv-org/invidious/issues/4186
@@ -183,14 +183,14 @@ struct Video
   end
 
   def music : Array(VideoMusic)
-    info["music"].as_a.map { |music_json|
+    info["music"].as_a.map do |music_json|
       VideoMusic.new(
         music_json["song"].as_s,
         music_json["album"].as_s,
         music_json["artist"].as_s,
         music_json["license"].as_s
       )
-    }
+    end
   end
 
   # Returns true if comments are enabled on the video

src/invidious/videos/parser.cr

@@ -10,7 +10,7 @@ module Invidious::Videos::Parser
   # TODO: "compactRadioRenderer" (Mix) and
   # TODO: Use a proper struct/class instead of a hacky JSON object
   def parse_related_video(related : JSON::Any) : Hash(String, JSON::Any)?
-    return nil if !related["videoId"]?
+    return if !related["videoId"]?
 
     # The compact renderer has video length in seconds, where the end
     # screen rendered has a full text version ("42:40")
@@ -60,7 +60,7 @@ module Invidious::Videos::Parser
     player_response = YoutubeAPI.player(video_id: video_id)
 
     if player_response.nil?
-      return nil
+      return
     end
 
     playability_status = player_response.dig?("playabilityStatus", "status").try &.as_s
@@ -150,7 +150,7 @@ module Invidious::Videos::Parser
     elsif playability_status == "OK"
       return response
     else
-      return nil
+      return
     end
   end
 

src/invidious/views/user/login.ecr

@@ -25,8 +25,7 @@
                         <% end %>
 
                         <% if captcha %>
-                            <% captcha = captcha.not_nil! %>
-                            <img style="width:50%" src='<%= captcha[:question] %>'/>
+                            <img src='<%= captcha[:question] %>' style="width:50%"/>
                             <% captcha[:tokens].each_with_index do |token, i| %>
                                 <input type="hidden" name="token[<%= i %>]" value="<%= HTML.escape(token) %>">
                             <% end %>

src/invidious/yt_backend/connection_pool.cr

@@ -20,7 +20,7 @@ struct YoutubeConnectionPool
 
     begin
       response = yield conn
-    rescue ex
+    rescue
       conn.close
       conn = make_client(url, force_resolve: true)
 
@@ -88,7 +88,7 @@ struct CompanionConnectionPool
 
     begin
       response = yield wrapper
-    rescue ex
+    rescue
       wrapper.close
 
       companion = CONFIG.invidious_companion.sample

src/invidious/yt_backend/extractors.cr

@@ -152,7 +152,6 @@ private module Parsers
         when "Premium"
           # TODO: Potentially available as item_contents["topStandaloneBadge"]["metadataBadgeRenderer"]
           badges |= VideoBadges::Premium
-        else nil # Ignore
         end
       end
 
@@ -655,6 +654,10 @@ private module Parsers
         thumbnail_view_model = item_contents.dig(
           "contentImage", "thumbnailViewModel"
         )
+        # TODO: This is an useless assignment, is not used anywhere
+        # so check if it can be used somewhere later.
+        #
+        # ameba:disable Lint/UselessAssign
         thumbnail = thumbnail_view_model.dig("image", "sources", 0, "url").as_s
 
         video_id = item_contents["contentId"].as_s
@@ -739,9 +742,9 @@ private module Parsers
         video_count = thumbnail_view_model.dig("overlays").as_a
           .compact_map(&.dig?("thumbnailOverlayBadgeViewModel", "thumbnailBadges").try &.as_a)
           .flatten
-          .find(nil, &.dig?("thumbnailBadgeViewModel", "text").try { |node|
+          .find(nil, &.dig?("thumbnailBadgeViewModel", "text").try do |node|
             {"episodes", "videos", "lessons"}.any? { |str| node.as_s.ends_with?(str) }
-          })
+          end)
           .try &.dig("thumbnailBadgeViewModel", "text").as_s.to_i(strict: false)
 
         metadata = item_contents.dig("metadata", "lockupMetadataViewModel")
@@ -790,10 +793,10 @@ private module Parsers
         # ]
         #
         metadata_rows = metadata.dig?("metadata", "contentMetadataViewModel", "metadataRows").try &.as_a
-        metadata_parts = metadata_rows.try &.find { |row|
+        metadata_parts = metadata_rows.try &.find do |row|
           parts = row["metadataParts"]?.try &.as_a
           parts && !parts.any? { |item| item.dig?("text", "content").try &.as_s == "View full playlist" }
-        }.try &.["metadataParts"].as_a
+        end.try &.["metadataParts"].as_a
 
         if author_info = metadata_parts.try &.find(&.dig?("text", "commandRuns"))
              .try &.["text"]

src/invidious/yt_backend/extractors_utils.cr

@@ -17,15 +17,13 @@
 # another nil will be returned.
 def extract_text(item : JSON::Any?) : String?
   if item.nil?
-    return nil
+    return
   end
 
   if text_container = item["simpleText"]?
     return text_container.as_s
   elsif text_container = item["runs"]?
     return text_container.as_a.map(&.["text"].as_s).join("")
-  else
-    nil
   end
 end
 

src/invidious/yt_backend/url_sanitizer.cr

@@ -46,7 +46,7 @@ module UrlSanitizer
     when "results", "search"
       return :search
     else # hashtag, post, trending, brand URLs, etc..
-      return nil
+      return
     end
   end
 

src/invidious/yt_backend/youtube_api.cr

@@ -210,7 +210,7 @@ module YoutubeAPI
 
     # Region to provide to youtube, e.g to alter search results
     # (this is passed as the `gl` parameter).
-    property region : String | Nil
+    property region : String?
 
     # Initialization function
     def initialize(
@@ -286,7 +286,7 @@ module YoutubeAPI
   # Return, as a Hash, the "context" data required to request the
   # youtube API endpoints.
   #
-  private def make_context(client_config : ClientConfig | Nil, video_id = "dQw4w9WgXcQ") : Hash
+  private def make_context(client_config : ClientConfig?, video_id = "dQw4w9WgXcQ") : Hash
     # Use the default client config if nil is passed
     client_config ||= DEFAULT_CLIENT_CONFIG
 
@@ -356,7 +356,7 @@ module YoutubeAPI
   #
   #  - A playlist ID (parameters MUST be an empty string)
   #
-  def browse(continuation : String, client_config : ClientConfig | Nil = nil)
+  def browse(continuation : String, client_config : ClientConfig? = nil)
     # JSON Request data, required by the API
     data = {
       "context"      => self.make_context(client_config),
@@ -371,7 +371,7 @@ module YoutubeAPI
     browse_id : String,
     *, # Force the following parameters to be passed by name
     params : String,
-    client_config : ClientConfig | Nil = nil,
+    client_config : ClientConfig? = nil,
   )
     # JSON Request data, required by the API
     data = {
@@ -424,7 +424,7 @@ module YoutubeAPI
   #    })
   #    ```
   #
-  def next(continuation : String, *, client_config : ClientConfig | Nil = nil)
+  def next(continuation : String, *, client_config : ClientConfig? = nil)
     # JSON Request data, required by the API
     data = {
       "context"      => self.make_context(client_config),
@@ -435,7 +435,7 @@ module YoutubeAPI
   end
 
   # :ditto:
-  def next(data : Hash, *, client_config : ClientConfig | Nil = nil)
+  def next(data : Hash, *, client_config : ClientConfig? = nil)
     # JSON Request data, required by the API
     data2 = data.merge({
       "context" => self.make_context(client_config),
@@ -445,7 +445,7 @@ module YoutubeAPI
   end
 
   # Allow a NamedTuple to be passed, too.
-  def next(data : NamedTuple, *, client_config : ClientConfig | Nil = nil)
+  def next(data : NamedTuple, *, client_config : ClientConfig? = nil)
     return self.next(data.to_h, client_config: client_config)
   end
 
@@ -466,7 +466,7 @@ module YoutubeAPI
     if CONFIG.invidious_companion.present?
       return self._post_invidious_companion("/youtubei/v1/player", data)
     else
-      return nil
+      return
     end
   end
 
@@ -498,7 +498,7 @@ module YoutubeAPI
   # channel_b = YoutubeAPI.resolve_url("https://www.youtube.com/c/invalid")
   # ```
   #
-  def resolve_url(url : String, client_config : ClientConfig | Nil = nil)
+  def resolve_url(url : String, client_config : ClientConfig? = nil)
     data = {
       "context" => self.make_context(nil),
       "url"     => url,
@@ -524,7 +524,7 @@ module YoutubeAPI
   def search(
     search_query : String,
     params : String,
-    client_config : ClientConfig | Nil = nil,
+    client_config : ClientConfig? = nil,
   )
     # JSON Request data, required by the API
     data = {
@@ -550,7 +550,7 @@ module YoutubeAPI
 
   def get_transcript(
     params : String,
-    client_config : ClientConfig | Nil = nil,
+    client_config : ClientConfig? = nil,
   ) : Hash(String, JSON::Any)
     data = {
       "context" => self.make_context(client_config),
@@ -572,7 +572,7 @@ module YoutubeAPI
   def _post_json(
     endpoint : String,
     data : Hash,
-    client_config : ClientConfig | Nil,
+    client_config : ClientConfig?,
   ) : Hash(String, JSON::Any)
     # Use the default client config if nil is passed
     client_config ||= DEFAULT_CLIENT_CONFIG