mirror of
https://github.com/iv-org/invidious.git
synced 2024-09-08 02:22:43 +00:00
Replace duplicate link to YouTube
This commit is contained in:
parent
fa2ba807a3
commit
71aa4d0347
@ -1685,7 +1685,7 @@ get "/api/v1/comments/:id" do |env|
|
||||
if format == "json"
|
||||
next {"comments" => [] of String}.to_json
|
||||
else
|
||||
next {"content_html" => ""}.to_json
|
||||
next {"contentHtml" => ""}.to_json
|
||||
end
|
||||
end
|
||||
ctoken = ctoken["ctoken"]
|
||||
@ -1723,7 +1723,7 @@ get "/api/v1/comments/:id" do |env|
|
||||
if format == "json"
|
||||
next {"comments" => [] of String}.to_json
|
||||
else
|
||||
next {"content_html" => ""}.to_json
|
||||
next {"contentHtml" => ""}.to_json
|
||||
end
|
||||
end
|
||||
|
||||
@ -1823,7 +1823,8 @@ get "/api/v1/comments/:id" do |env|
|
||||
comments = JSON.parse(comments)
|
||||
content_html = template_youtube_comments(comments)
|
||||
|
||||
next {"content_html" => content_html}.to_json
|
||||
next {"contentHtml" => content_html,
|
||||
"commentCount" => comments["commentCount"]}.to_json
|
||||
end
|
||||
elsif source == "reddit"
|
||||
client = make_client(REDDIT_URL)
|
||||
@ -1844,9 +1845,9 @@ get "/api/v1/comments/:id" do |env|
|
||||
end
|
||||
|
||||
env.response.content_type = "application/json"
|
||||
next {"title" => reddit_thread.title,
|
||||
"permalink" => reddit_thread.permalink,
|
||||
"content_html" => content_html}.to_json
|
||||
next {"title" => reddit_thread.title,
|
||||
"permalink" => reddit_thread.permalink,
|
||||
"contentHtml" => content_html}.to_json
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -72,7 +72,7 @@ function load_comments(target) {
|
||||
xhr.onreadystatechange = function() {
|
||||
if (xhr.readyState == 4) {
|
||||
if (xhr.status == 200) {
|
||||
body.innerHTML = xhr.response.content_html;
|
||||
body.innerHTML = xhr.response.contentHtml;
|
||||
} else {
|
||||
body.innerHTML = fallback;
|
||||
}
|
||||
@ -106,12 +106,12 @@ function get_reddit_comments() {
|
||||
<a target="_blank" href="https://reddit.com{permalink}">View more comments on Reddit</a>
|
||||
</b>
|
||||
</div>
|
||||
<div>{content_html}</div>
|
||||
<div>{contentHtml}</div>
|
||||
|
||||
<hr>`.supplant({
|
||||
title: xhr.response.title,
|
||||
permalink: xhr.response.permalink,
|
||||
content_html: xhr.response.content_html
|
||||
contentHtml: xhr.response.contentHtml
|
||||
});
|
||||
} else {
|
||||
get_youtube_comments();
|
||||
@ -139,12 +139,13 @@ function get_youtube_comments() {
|
||||
<div>
|
||||
<h3>
|
||||
<a href="javascript:void(0)" onclick="toggle_comments(this)">[ - ]</a>
|
||||
<a target="_blank" href="https://www.youtube.com/watch?v=<%= video.id %>">View more comments on YouTube</a>
|
||||
View {commentCount} comments
|
||||
</h3>
|
||||
</div>
|
||||
<div>{content_html}</div>
|
||||
<div>{contentHtml}</div>
|
||||
<hr>`.supplant({
|
||||
content_html: xhr.response.content_html
|
||||
contentHtml: xhr.response.contentHtml,
|
||||
commentCount: commaSeparateNumber(xhr.response.commentCount)
|
||||
});
|
||||
} else {
|
||||
comments = document.getElementById("comments");
|
||||
@ -160,6 +161,13 @@ function get_youtube_comments() {
|
||||
};
|
||||
}
|
||||
|
||||
function commaSeparateNumber(val){
|
||||
while (/(\d+)(\d{3})/.test(val.toString())){
|
||||
val = val.toString().replace(/(\d+)(\d{3})/, '$1'+','+'$2');
|
||||
}
|
||||
return val;
|
||||
}
|
||||
|
||||
String.prototype.supplant = function(o) {
|
||||
return this.replace(/{([^{}]*)}/g, function(a, b) {
|
||||
var r = o[b];
|
||||
|
Loading…
Reference in New Issue
Block a user