Fetch external links favicon and add to about page

This commit is contained in:
syeopite 2021-04-15 23:20:44 -07:00
parent af385663c4
commit ae07c7694f
No known key found for this signature in database
GPG key ID: 6FA616E5A5294A82
3 changed files with 38 additions and 3 deletions

View file

@ -3879,6 +3879,39 @@ get "/vi/:id/:name" do |env|
end end
end end
get "/fetch_link_favicon" do |env|
url = env.params.query["url"]
url = URI.parse(url)
if url.host.to_s.ends_with?("gstatic.com")
# headers = HTTP::Headers{"Content-Encoding" => "gzip"}
headers = HTTP::Headers{} of String => String
REQUEST_HEADERS_WHITELIST.each do |header|
if env.request.headers[header]?
headers[header] = env.request.headers[header]
end
end
begin
HTTP::Client.get(url.to_s, headers) do |favicon_response|
env.response.status_code = favicon_response.status_code
favicon_response.headers.each do |key, value|
if !RESPONSE_HEADERS_BLACKLIST.includes?(key.downcase)
env.response.headers[key] = value
break
end
end
env.response.headers["Access-Control-Allow-Origin"] = "*"
proxy_file(favicon_response, env)
end
rescue ex
end
end
end
get "/Captcha" do |env| get "/Captcha" do |env|
headers = HTTP::Headers{":authority" => "accounts.google.com"} headers = HTTP::Headers{":authority" => "accounts.google.com"}
response = YT_POOL.client &.get(env.request.resource, headers) response = YT_POOL.client &.get(env.request.resource, headers)

View file

@ -136,7 +136,7 @@ struct AboutChannel
property allowed_regions : Array(String) property allowed_regions : Array(String)
property related_channels : Array(AboutRelatedChannel) property related_channels : Array(AboutRelatedChannel)
property tabs : Array(String) property tabs : Array(String)
property links : Array(Tuple(String, String)) property links : Array(Tuple(String, String, String))
end end
class ChannelRedirect < Exception class ChannelRedirect < Exception
@ -888,7 +888,7 @@ def get_about_info(ucid, locale)
total_views = 0_i64 total_views = 0_i64
joined = Time.unix(0) joined = Time.unix(0)
tabs = [] of String tabs = [] of String
links = [] of {String, String} links = [] of {String, String, String}
tabs_json = initdata["contents"]["twoColumnBrowseResultsRenderer"]["tabs"]?.try &.as_a? tabs_json = initdata["contents"]["twoColumnBrowseResultsRenderer"]["tabs"]?.try &.as_a?
if !tabs_json.nil? if !tabs_json.nil?
@ -910,6 +910,7 @@ def get_about_info(ucid, locale)
channel_about_meta["primaryLinks"]?.try &.as_a.each do |link| channel_about_meta["primaryLinks"]?.try &.as_a.each do |link|
link_title = link["title"]["simpleText"].as_s link_title = link["title"]["simpleText"].as_s
link_url = URI.parse(link["navigationEndpoint"]["urlEndpoint"]["url"].to_s) link_url = URI.parse(link["navigationEndpoint"]["urlEndpoint"]["url"].to_s)
link_icon_url = link["icon"]?.try &.["thumbnails"][0]["url"].to_s || ""
if {"m.youtube.com", "www.youtube.com", "youtu.be"}.includes? link_url.host if {"m.youtube.com", "www.youtube.com", "youtu.be"}.includes? link_url.host
if link_url.path == "/redirect" if link_url.path == "/redirect"
@ -921,7 +922,7 @@ def get_about_info(ucid, locale)
link_url = link_url.to_s link_url = link_url.to_s
end end
links << {link_title, link_url} links << {link_title, link_url, link_icon_url}
end end
country = channel_about_meta["country"]?.try &.["simpleText"].as_s || "" country = channel_about_meta["country"]?.try &.["simpleText"].as_s || ""

View file

@ -27,6 +27,7 @@
<h3> <%= translate(locale, "Links") %> </h3> <h3> <%= translate(locale, "Links") %> </h3>
<% channel.links.each do |link_tuple| %> <% channel.links.each do |link_tuple| %>
<p class="pure-u-11-24"> <p class="pure-u-11-24">
<img src="/fetch_link_favicon?url=<%=link_tuple[2]%>">
<a href="<%=link_tuple[1]%>"><%=link_tuple[0]%></a> <a href="<%=link_tuple[1]%>"><%=link_tuple[0]%></a>
</p> </p>
<% end %> <% end %>