Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

RSS: Channel + Playlist improvements #4298

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

RSS: Channel + Playlist improvements #4298

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1b40e0
RSS: return 404 if youtube playlist doesnt exist
ChunkyProgrammer Nov 30, 2023
a2c1cf3
Channel RSS: deprecate author thumbnail, make less requests to youtube
ChunkyProgrammer Nov 30, 2023
10f0432
do a sanity check on the provided ucid
ChunkyProgrammer Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
51 changes: 24 additions & 27 deletions src/invidious/routes/feeds.cr
View file
Open in desktop
Expand Up @@ -143,32 +143,25 @@ module Invidious::Routes::Feeds
# RSS feeds

def self.rss_channel(env)
locale = env.get("preferences").as(Preferences).locale

env.response.headers["Content-Type"] = "application/atom+xml"
env.response.content_type = "application/atom+xml"

ucid = env.params.url["ucid"]
if env.params.url["ucid"].matches?(/^[\w-]+$/)
ucid = env.params.url["ucid"]
else
return error_atom(400, InfoException.new("Invalid channel ucid provided."))
end

params = HTTP::Params.parse(env.params.query["params"]? || "")

begin
channel = get_about_info(ucid, locale)
rescue ex : ChannelRedirect
return env.redirect env.request.resource.gsub(ucid, ex.channel_id)
rescue ex : NotFoundException
return error_atom(404, ex)
rescue ex
return error_atom(500, ex)
end

namespaces = {
"yt" => "http://www.youtube.com/xml/schemas/2015",
"media" => "http://search.yahoo.com/mrss/",
"default" => "http://www.w3.org/2005/Atom",
}

response = YT_POOL.client &.get("/feeds/videos.xml?channel_id=#{channel.ucid}")
response = YT_POOL.client &.get("/feeds/videos.xml?channel_id=#{ucid}")
return error_atom(404, NotFoundException.new("Channel does not exist.")) if response.status_code == 404
rss = XML.parse(response.body)

videos = rss.xpath_nodes("//default:feed/default:entry", namespaces).map do |entry|
Expand All @@ -179,15 +172,15 @@ module Invidious::Routes::Feeds
updated = Time.parse_rfc3339(entry.xpath_node("default:updated", namespaces).not_nil!.content)

author = entry.xpath_node("default:author/default:name", namespaces).not_nil!.content
ucid = entry.xpath_node("yt:channelId", namespaces).not_nil!.content
video_ucid = entry.xpath_node("yt:channelId", namespaces).not_nil!.content
description_html = entry.xpath_node("media:group/media:description", namespaces).not_nil!.to_s
views = entry.xpath_node("media:group/media:community/media:statistics", namespaces).not_nil!.["views"].to_i64

SearchVideo.new({
title: title,
id: video_id,
author: author,
ucid: ucid,
ucid: video_ucid,
published: published,
views: views,
description_html: description_html,
Expand All @@ -200,30 +193,33 @@ module Invidious::Routes::Feeds
})
end

author = ""
author = videos[0].author if videos.size > 0

XML.build(indent: " ", encoding: "UTF-8") do |xml|
xml.element("feed", "xmlns:yt": "http://www.youtube.com/xml/schemas/2015",
"xmlns:media": "http://search.yahoo.com/mrss/", xmlns: "http://www.w3.org/2005/Atom",
"xml:lang": "en-US") do
xml.element("link", rel: "self", href: "#{HOST_URL}#{env.request.resource}")
xml.element("id") { xml.text "yt:channel:#{channel.ucid}" }
xml.element("yt:channelId") { xml.text channel.ucid }
xml.element("icon") { xml.text channel.author_thumbnail }
xml.element("title") { xml.text channel.author }
xml.element("link", rel: "alternate", href: "#{HOST_URL}/channel/#{channel.ucid}")
xml.element("id") { xml.text "yt:channel:#{ucid}" }
xml.element("yt:channelId") { xml.text ucid }
xml.element("icon") { xml.text "" }
xml.element("title") { author }
xml.element("link", rel: "alternate", href: "#{HOST_URL}/channel/#{ucid}")

xml.element("author") do
xml.element("name") { xml.text channel.author }
xml.element("uri") { xml.text "#{HOST_URL}/channel/#{channel.ucid}" }
xml.element("name") { xml.text author }
xml.element("uri") { xml.text "#{HOST_URL}/channel/#{ucid}" }
end

xml.element("image") do
xml.element("url") { xml.text channel.author_thumbnail }
xml.element("title") { xml.text channel.author }
xml.element("url") { xml.text "" }
xml.element("title") { xml.text author }
xml.element("link", rel: "self", href: "#{HOST_URL}#{env.request.resource}")
end

videos.each do |video|
video.to_xml(channel.auto_generated, params, xml)
video.to_xml(false, params, xml)
end
end
end
Expand Down Expand Up @@ -311,8 +307,9 @@ module Invidious::Routes::Feeds
end

response = YT_POOL.client &.get("/feeds/videos.xml?playlist_id=#{plid}")
document = XML.parse(response.body)
return error_atom(404, NotFoundException.new("Playlist does not exist.")) if response.status_code == 404

document = XML.parse(response.body)
document.xpath_nodes(%q(//*[@href]|//*[@url])).each do |node|
node.attributes.each do |attribute|
case attribute.name
Expand Down