PrivateCoffee/invidious
4
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Ameba: Fix Lint/NotNilAfterNoBang

Browse source
This commit is contained in:
syeopite 2024-07-15 17:36:00 -07:00
parent bad92093bf
commit 8258062ec5
No known key found for this signature in database
GPG key ID: A73C186DA3955A1A
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/invidious/helpers/signatures.cr
View file

@ -13,20 +13,20 @@ struct DecryptFunction
private def fetch_decrypt_function(id = "CvFH_6DNRCY") private def fetch_decrypt_function(id = "CvFH_6DNRCY")
document = YT_POOL.client &.get("/watch?v=#{id}&gl=US&hl=en").body document = YT_POOL.client &.get("/watch?v=#{id}&gl=US&hl=en").body
url = document.match(/src="(?<url>\/s\/player\/[^\/]+\/player_ias[^\/]+\/en_US\/base.js)"/).not_nil!["url"] url = document.match!(/src="(?<url>\/s\/player\/[^\/]+\/player_ias[^\/]+\/en_US\/base.js)"/)["url"]
player = YT_POOL.client &.get(url).body player = YT_POOL.client &.get(url).body
function_name = player.match(/^(?<name>[^=]+)=function\(\w\){\w=\w\.split\(""\);[^\. ]+\.[^( ]+/m).not_nil!["name"] function_name = player.match!(/^(?<name>[^=]+)=function\(\w\){\w=\w\.split\(""\);[^\. ]+\.[^( ]+/m)["name"]
function_body = player.match(/^#{Regex.escape(function_name)}=function\(\w\){(?<body>[^}]+)}/m).not_nil!["body"] function_body = player.match!(/^#{Regex.escape(function_name)}=function\(\w\){(?<body>[^}]+)}/m)["body"]
function_body = function_body.split(";")[1..-2] function_body = function_body.split(";")[1..-2]
var_name = function_body[0][0, 2] var_name = function_body[0][0, 2]
var_body = player.delete("\n").match(/var #{Regex.escape(var_name)}={(?<body>(.*?))};/).not_nil!["body"] var_body = player.delete("\n").match!(/var #{Regex.escape(var_name)}={(?<body>(.*?))};/)["body"]
operations = {} of String => SigProc operations = {} of String => SigProc
var_body.split("},").each do |operation| var_body.split("},").each do |operation|
op_name = operation.match(/^[^:]+/).not_nil![0] op_name = operation.match!(/^[^:]+/)[0]
op_body = operation.match(/\{[^}]+/).not_nil![0] op_body = operation.match!(/\{[^}]+/)[0]
case op_body case op_body
when "{a.reverse()" when "{a.reverse()"
@ -42,8 +42,8 @@ struct DecryptFunction
function_body.each do |function| function_body.each do |function|
function = function.lchop(var_name).delete("[].") function = function.lchop(var_name).delete("[].")
op_name = function.match(/[^\(]+/).not_nil![0] op_name = function.match!(/[^\(]+/)[0]
value = function.match(/\(\w,(?<value>[\d]+)\)/).not_nil!["value"].to_i value = function.match!(/\(\w,(?<value>[\d]+)\)/)["value"].to_i
decrypt_function << {operations[op_name], value} decrypt_function << {operations[op_name], value}
end end

4
src/invidious/routes/api/v1/videos.cr
View file

@ -215,7 +215,7 @@ module Invidious::Routes::API::V1::Videos
storyboard[:storyboard_count].times do |i| storyboard[:storyboard_count].times do |i|
url = storyboard[:url] url = storyboard[:url]
authority = /(i\d?).ytimg.com/.match(url).not_nil![1]? authority = /(i\d?).ytimg.com/.match!(url)[1]?
url = url.gsub("$M", i).gsub(%r(https://i\d?.ytimg.com/sb/), "") url = url.gsub("$M", i).gsub(%r(https://i\d?.ytimg.com/sb/), "")
url = "#{HOST_URL}/sb/#{authority}/#{url}" url = "#{HOST_URL}/sb/#{authority}/#{url}"
@ -250,7 +250,7 @@ module Invidious::Routes::API::V1::Videos
if CONFIG.cache_annotations && (cached_annotation = Invidious::Database::Annotations.select(id)) if CONFIG.cache_annotations && (cached_annotation = Invidious::Database::Annotations.select(id))
annotations = cached_annotation.annotations annotations = cached_annotation.annotations
else else
index = CHARS_SAFE.index(id[0]).not_nil!.to_s.rjust(2, '0') index = CHARS_SAFE.index!(id[0]).to_s.rjust(2, '0')
# IA doesn't handle leading hyphens, # IA doesn't handle leading hyphens,
# so we use https://archive.org/details/youtubeannotations_64 # so we use https://archive.org/details/youtubeannotations_64

2
src/invidious/user/imports.cr
View file

@ -182,7 +182,7 @@ struct Invidious::User
if is_opml?(type, extension) if is_opml?(type, extension)
subscriptions = XML.parse(body) subscriptions = XML.parse(body)
user.subscriptions += subscriptions.xpath_nodes(%q(//outline[@type="rss"])).map do |channel| user.subscriptions += subscriptions.xpath_nodes(%q(//outline[@type="rss"])).map do |channel|
channel["xmlUrl"].match(/UC[a-zA-Z0-9_-]{22}/).not_nil![0] channel["xmlUrl"].match!(/UC[a-zA-Z0-9_-]{22}/)[0]
end end
elsif extension == "json" || type == "application/json" elsif extension == "json" || type == "application/json"
subscriptions = JSON.parse(body) subscriptions = JSON.parse(body)