From 4d512d908dfaf9b726602c77bcf555d36445f88f Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Thu, 7 Jan 2021 19:01:13 +0100 Subject: [PATCH 1/2] Remove some mentions of omarroth --- kubernetes/Chart.yaml | 4 ++-- kubernetes/values.yaml | 2 +- shard.yml | 1 + src/invidious/helpers/helpers.cr | 2 +- src/invidious/users.cr | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/kubernetes/Chart.yaml b/kubernetes/Chart.yaml index bb0838ad0..9e4b793e6 100644 --- a/kubernetes/Chart.yaml +++ b/kubernetes/Chart.yaml @@ -9,9 +9,9 @@ keywords: - video - privacy home: https://invidio.us/ -icon: https://raw.githubusercontent.com/omarroth/invidious/05988c1c49851b7d0094fca16aeaf6382a7f64ab/assets/favicon-32x32.png +icon: https://raw.githubusercontent.com/iv-org/invidious/05988c1c49851b7d0094fca16aeaf6382a7f64ab/assets/favicon-32x32.png sources: -- https://github.com/omarroth/invidious +- https://github.com/iv-org/invidious maintainers: - name: Leon Klingele email: mail@leonklingele.de diff --git a/kubernetes/values.yaml b/kubernetes/values.yaml index 4d0370229..08def6e47 100644 --- a/kubernetes/values.yaml +++ b/kubernetes/values.yaml @@ -1,7 +1,7 @@ name: invidious image: - repository: omarroth/invidious + repository: iv-org/invidious tag: latest pullPolicy: Always diff --git a/shard.yml b/shard.yml index 2b59786e3..e0fa1d251 100644 --- a/shard.yml +++ b/shard.yml @@ -3,6 +3,7 @@ version: 0.20.1 authors: - Omar Roth + - Invidous team targets: invidious: diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr index e41f83173..a4101ef13 100644 --- a/src/invidious/helpers/helpers.cr +++ b/src/invidious/helpers/helpers.cr @@ -95,7 +95,7 @@ class Config property port : Int32 = 3000 # Port to listen for connections (overrided by command line argument) property host_binding : String = "0.0.0.0" # Host to bind (overrided by command line argument) property pool_size : Int32 = 100 # Pool size for HTTP requests to youtube.com and ytimg.com (each domain has a separate pool of `pool_size`) - property admin_email : String = "omarroth@protonmail.com" # Email for bug reports + property admin_email : String = "FIXME" # Email for bug reports @[YAML::Field(converter: Preferences::StringToCookies)] property cookies : HTTP::Cookies = HTTP::Cookies.new # Saved cookies in "name1=value1; name2=value2..." format diff --git a/src/invidious/users.cr b/src/invidious/users.cr index 6bc2acd20..4b16affcb 100644 --- a/src/invidious/users.cr +++ b/src/invidious/users.cr @@ -427,7 +427,7 @@ def generate_captcha(key, db) end def generate_text_captcha(key, db) - response = make_client(TEXTCAPTCHA_URL, &.get("/omarroth@protonmail.com.json").body) + response = make_client(TEXTCAPTCHA_URL, &.get("/FIXME.json").body) response = JSON.parse(response) tokens = response["a"].as_a.map do |answer| From 606dd11b4f9fb6fc2aaca85e18e6a2d750d5ad6c Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Thu, 7 Jan 2021 21:09:24 +0100 Subject: [PATCH 2/2] Remove admin_email. Use repos url for captcha ID and reddit header. Add note about not updating changelog --- CHANGELOG.md | 2 ++ src/invidious/comments.cr | 2 +- src/invidious/helpers/helpers.cr | 1 - src/invidious/users.cr | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 314a134f3..8aa416ec5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# Note: This is no longer updated and links to omarroths repo, which doesn't exist anymore. + # 0.20.0 (2019-011-06) # Version 0.20.0: Custom Playlists diff --git a/src/invidious/comments.cr b/src/invidious/comments.cr index 8849c87fa..0ac99ba57 100644 --- a/src/invidious/comments.cr +++ b/src/invidious/comments.cr @@ -242,7 +242,7 @@ end def fetch_reddit_comments(id, sort_by = "confidence") client = make_client(REDDIT_URL) - headers = HTTP::Headers{"User-Agent" => "web:invidious:v#{CURRENT_VERSION} (by /u/omarroth)"} + headers = HTTP::Headers{"User-Agent" => "web:invidious:v#{CURRENT_VERSION} (by github.com/iv-org/invidious)"} # TODO: Use something like #479 for a static list of instances to use here query = "(url:3D#{id}%20OR%20url:#{id})%20(site:invidio.us%20OR%20site:youtube.com%20OR%20site:youtu.be)" diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr index a4101ef13..1f56ec926 100644 --- a/src/invidious/helpers/helpers.cr +++ b/src/invidious/helpers/helpers.cr @@ -95,7 +95,6 @@ class Config property port : Int32 = 3000 # Port to listen for connections (overrided by command line argument) property host_binding : String = "0.0.0.0" # Host to bind (overrided by command line argument) property pool_size : Int32 = 100 # Pool size for HTTP requests to youtube.com and ytimg.com (each domain has a separate pool of `pool_size`) - property admin_email : String = "FIXME" # Email for bug reports @[YAML::Field(converter: Preferences::StringToCookies)] property cookies : HTTP::Cookies = HTTP::Cookies.new # Saved cookies in "name1=value1; name2=value2..." format diff --git a/src/invidious/users.cr b/src/invidious/users.cr index 4b16affcb..153e3b6af 100644 --- a/src/invidious/users.cr +++ b/src/invidious/users.cr @@ -427,7 +427,7 @@ def generate_captcha(key, db) end def generate_text_captcha(key, db) - response = make_client(TEXTCAPTCHA_URL, &.get("/FIXME.json").body) + response = make_client(TEXTCAPTCHA_URL, &.get("/github.com/iv.org/invidious.json").body) response = JSON.parse(response) tokens = response["a"].as_a.map do |answer|