mirror of
https://github.com/iv-org/invidious.git
synced 2024-12-02 03:31:20 +05:30
Clean up handling for callback endpoint
This commit is contained in:
parent
aa63c3f70e
commit
6375a62465
@ -2352,19 +2352,24 @@ get "/feed/webhook/:token" do |env|
|
|||||||
end
|
end
|
||||||
|
|
||||||
post "/feed/webhook/:token" do |env|
|
post "/feed/webhook/:token" do |env|
|
||||||
|
token = env.params.url["token"]
|
||||||
body = env.request.body.not_nil!.gets_to_end
|
body = env.request.body.not_nil!.gets_to_end
|
||||||
signature = env.request.headers["X-Hub-Signature"].lchop("sha1=")
|
signature = env.request.headers["X-Hub-Signature"].lchop("sha1=")
|
||||||
|
|
||||||
if signature != OpenSSL::HMAC.hexdigest(:sha1, HMAC_KEY, body)
|
if signature != OpenSSL::HMAC.hexdigest(:sha1, HMAC_KEY, body)
|
||||||
|
logger.write("#{token} : Invalid signature")
|
||||||
halt env, status_code: 200
|
halt env, status_code: 200
|
||||||
end
|
end
|
||||||
|
|
||||||
|
spawn do
|
||||||
rss = XML.parse_html(body)
|
rss = XML.parse_html(body)
|
||||||
rss.xpath_nodes("//feed/entry").each do |entry|
|
rss.xpath_nodes("//feed/entry").each do |entry|
|
||||||
id = entry.xpath_node("videoid").not_nil!.content
|
id = entry.xpath_node("videoid").not_nil!.content
|
||||||
|
published = Time.parse(entry.xpath_node("published").not_nil!.content, "%FT%X%z", Time::Location.local)
|
||||||
|
updated = Time.parse(entry.xpath_node("updated").not_nil!.content, "%FT%X%z", Time::Location.local)
|
||||||
|
|
||||||
video = get_video(id, PG_DB, proxies, region: nil)
|
video = get_video(id, PG_DB, proxies, region: nil)
|
||||||
video = ChannelVideo.new(id, video.title, video.published, Time.now, video.ucid, video.author, video.length_seconds)
|
video = ChannelVideo.new(id, video.title, published, updated, video.ucid, video.author, video.length_seconds)
|
||||||
|
|
||||||
PG_DB.exec("UPDATE users SET notifications = notifications || $1 \
|
PG_DB.exec("UPDATE users SET notifications = notifications || $1 \
|
||||||
WHERE updated < $2 AND $3 = ANY(subscriptions) AND $1 <> ALL(notifications)", video.id, video.published, video.ucid)
|
WHERE updated < $2 AND $3 = ANY(subscriptions) AND $1 <> ALL(notifications)", video.id, video.published, video.ucid)
|
||||||
@ -2376,6 +2381,7 @@ post "/feed/webhook/:token" do |env|
|
|||||||
ON CONFLICT (id) DO UPDATE SET title = $2, published = $3, \
|
ON CONFLICT (id) DO UPDATE SET title = $2, published = $3, \
|
||||||
updated = $4, ucid = $5, author = $6, length_seconds = $7", video_array)
|
updated = $4, ucid = $5, author = $6, length_seconds = $7", video_array)
|
||||||
end
|
end
|
||||||
|
end
|
||||||
|
|
||||||
halt env, status_code: 200
|
halt env, status_code: 200
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user