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

Add format=json for reddit comments

This commit is contained in:
Omar Roth 2018-09-06 10:19:28 -05:00
parent 3ec684ae71
commit 454b1662b7
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/invidious.cr
View File

@ -2014,16 +2014,24 @@ get "/api/v1/comments/:id" do |env|
content_html = fill_links(content_html, "https", "www.reddit.com") content_html = fill_links(content_html, "https", "www.reddit.com")
content_html = replace_links(content_html) content_html = replace_links(content_html)
rescue ex rescue ex
comments = nil
reddit_thread = nil reddit_thread = nil
content_html = "" content_html = ""
end end
if !reddit_thread if !reddit_thread || !comments
halt env, status_code: 404 halt env, status_code: 404
end end
env.response.content_type = "application/json" env.response.content_type = "application/json"
next {"title" => reddit_thread.title,
if format == "json"
reddit_thread = JSON.parse(reddit_thread.to_json).as_h
reddit_thread["comments"] = JSON.parse(comments.to_json)
next reddit_thread.to_json
else
next {
"title" => reddit_thread.title,
"permalink" => reddit_thread.permalink, "permalink" => reddit_thread.permalink,
"contentHtml" => content_html, "contentHtml" => content_html,
}.to_json }.to_json

2
src/invidious/views/watch.ecr
View File

@ -191,7 +191,7 @@ function get_youtube_replies(target) {
} }
function get_reddit_comments() { function get_reddit_comments() {
var url = "/api/v1/comments/<%= video.id %>?source=reddit"; var url = "/api/v1/comments/<%= video.id %>?source=reddit&format=html";
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
xhr.responseType = "json"; xhr.responseType = "json";
xhr.timeout = 20000; xhr.timeout = 20000;