iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor fetch_random_instance

This commit is contained in:
syeopite 2021-06-14 02:53:53 -07:00
parent eb911de928
commit 45e57f1ad3
No known key found for this signature in database
GPG Key ID: 6FA616E5A5294A82
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/invidious/helpers/utils.cr
View File

@ -430,16 +430,15 @@ def fetch_random_instance
# TODO Check if current URL is onion instance and use .onion types if so. # TODO Check if current URL is onion instance and use .onion types if so.
if data[1]["type"] == "https" if data[1]["type"] == "https"
# Instances can have statisitics disabled, which is an requirement of version validation. # Instances can have statisitics disabled, which is an requirement of version validation.
# as_nil? doesn't exist. Thus we'll have to handle the error rasied if as_nil fails.
begin begin
data[1]["stats"].as_nil data[1]["stats"].as_nil
statistics_disabled = true
next next
rescue TypeCastError rescue TypeCastError
statistics_disabled = false
end end
# stats endpoint could also lack the software dict. # stats endpoint could also lack the software dict.
next if statistics_disabled || data[1]["stats"]["software"]?.nil? next if data[1]["stats"]["software"]?.nil?
# Makes sure the instance isn't too outdated. # Makes sure the instance isn't too outdated.
if remote_version = data[1]["stats"]?.try &.["software"]?.try &.["version"] if remote_version = data[1]["stats"]?.try &.["software"]?.try &.["version"]
@ -451,10 +450,8 @@ def fetch_random_instance
next if (remote_commit_date - local_commit_date).abs.days > 30 next if (remote_commit_date - local_commit_date).abs.days > 30
# as_nil? doesn't exist. Thus we'll have to handle the error rasied if
# as_nil fails.
begin begin
broken_health_monitoring = data[1]["monitor"].as_nil data[1]["monitor"].as_nil
health = data[1]["monitor"].as_h["dailyRatios"][0].as_h["ratio"] health = data[1]["monitor"].as_h["dailyRatios"][0].as_h["ratio"]
filtered_instance_list << data[0].as_s if health.to_s.to_f > 90 filtered_instance_list << data[0].as_s if health.to_s.to_f > 90
rescue TypeCastError rescue TypeCastError