Git-Mirrors/invidious
1
0
Fork 0
mirror of https://github.com/iv-org/invidious.git synced 2025-04-20 23:46:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge b086cf24bbcc7197f0aefc719e19c77c6cde054e into 0c07e9d27ac773d8423143c11bbcd36eaae0f8e4

Browse Source
This commit is contained in:
epicsam123 2025-04-19 18:24:35 +00:00 committed by GitHub
commit 6fde6d9003
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 83 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
assets/js/comments.js
View File

@ -1,5 +1,8 @@
var video_data = JSON.parse(document.getElementById('video_data').textContent);
// Arabic, Persian, Hebrew
var isRTL = ["ar", "fa", "he"].includes(video_data.preferences.locale);
var spinnerHTML = '<h3 style="text-align:center"><div class="loading"><i class="icon ion-ios-refresh"></i></div></h3>';
var spinnerHTMLwithHR = spinnerHTML + '<hr>';
@ -55,7 +58,7 @@ function show_youtube_replies(event) {
function get_youtube_comments() {
var comments = document.getElementById('comments');
var fallback = comments.innerHTML;
var originalHTML = comments.innerHTML;
comments.innerHTML = spinnerHTML;
var baseUrl = video_data.base_url || '/api/v1/comments/'+ video_data.id
@ -65,10 +68,10 @@ function get_youtube_comments() {
'&thin_mode=' + video_data.preferences.thin_mode;
if (video_data.ucid) {
url += '&ucid=' + video_data.ucid
url += '&ucid=' + video_data.ucid;
}
var onNon200 = function (xhr) { comments.innerHTML = fallback; };
var onNon200 = function (xhr) { comments.innerHTML = originalHTML; };
if (video_data.params.comments[1] === 'youtube')
onNon200 = function (xhr) {};
@ -119,13 +122,49 @@ function get_youtube_comments() {
});
}
function format_count_load_more(content, current_count, total_count) {
var load_more_end_str = content.split('data-load-more');
if (load_more_end_str.length === 1)
return [content, false]; // no Load More button, return false for has_more_replies
load_more_end_str = load_more_end_str[1].split('\n')[0]; // ' >("Load more" translated string)</a>'
var slice_index = content.indexOf(load_more_end_str) + load_more_end_str.length - 4; // backtrace </a>
var num_remaining = total_count - current_count;
return [
// More replies may have been added since initally loading parent comment
content.slice(0, slice_index) + ' (+' + (num_remaining > 0 ? num_remaining : '?') + ')' + content.slice(slice_index),
true // Load More button present, return true for has_more_replies
];
}
function format_count_toggle_replies_button(toggle_reply_button, current_count, total_count, has_more_replies) {
if (!has_more_replies) {
// Accept the final current count as the total (comments may have been added or removed since loading)
total_count = current_count;
} else if (current_count >= total_count) {
// An unknown number of new replies have been added since retrieving data
total_count = '?';
}
if (isRTL) [current_count, total_count] = [total_count, current_count];
['data-sub-text', 'data-inner-text'].forEach(attr => {
toggle_reply_button.setAttribute(attr,
toggle_reply_button.getAttribute(attr)
.replace(/\d+\/\d+/, total_count === current_count
? total_count
: current_count + '/' + total_count
)
);
});
toggle_reply_button.textContent = toggle_reply_button.title = toggle_reply_button.getAttribute('data-sub-text');
}
function get_youtube_replies(target, load_more, load_replies) {
var continuation = target.getAttribute('data-continuation');
var body = target.parentNode.parentNode;
var fallback = body.innerHTML;
var originalHTML = body.innerHTML;
body.innerHTML = spinnerHTML;
var baseUrl = video_data.base_url || '/api/v1/comments/'+ video_data.id
var baseUrl = video_data.base_url || '/api/v1/comments/' + video_data.id
var url = baseUrl +
'?format=html' +
'&hl=' + video_data.preferences.locale +
@ -133,18 +172,35 @@ function get_youtube_replies(target, load_more, load_replies) {
'&continuation=' + continuation;
if (video_data.ucid) {
url += '&ucid=' + video_data.ucid
url += '&ucid=' + video_data.ucid;
}
if (load_replies) url += '&action=action_get_comment_replies';
helpers.xhr('GET', url, {}, {
on200: function (response) {
var num_incoming_replies = response.contentHtml.split('channel-profile').length - 1;
if (load_more) {
body = body.parentNode.parentNode;
body.removeChild(body.lastElementChild);
body.insertAdjacentHTML('beforeend', response.contentHtml);
body.removeChild(body.lastElementChild); // Remove spinner
var toggle_replies_button = body.parentNode.firstChild.firstChild;
if (!toggle_replies_button) {
body.insertAdjacentHTML('beforeend', response.contentHtml); 
return;
}
var [prev_num_replies, num_total_replies] = toggle_replies_button.textContent.match(/\d+/g);
if (isRTL) [prev_num_replies, num_total_replies] = [num_total_replies, prev_num_replies];
prev_num_replies -= 0; num_total_replies -= 0; // convert to integers
var num_current_replies = prev_num_replies + num_incoming_replies;
var [newHTML, has_more_replies] = format_count_load_more(response.contentHtml, num_current_replies, num_total_replies);
format_count_toggle_replies_button(toggle_replies_button, num_current_replies, num_total_replies, has_more_replies);
body.insertAdjacentHTML('beforeend', newHTML);
} else {
body.removeChild(body.lastElementChild);
// loads only once for each comment when first opening their replies
body.removeChild(body.lastElementChild); // Remove spinner
var p = document.createElement('p');
var a = document.createElement('a');
@ -152,23 +208,31 @@ function get_youtube_replies(target, load_more, load_replies) {
a.href = 'javascript:void(0)';
a.onclick = hide_youtube_replies;
a.setAttribute('data-sub-text', video_data.hide_replies_text);
a.setAttribute('data-inner-text', video_data.show_replies_text);
a.textContent = video_data.hide_replies_text;
var num_total_replies = originalHTML.split('data-load-replies')[1].match(/\d+/)[0] - 0;
// Replaced later with real counts
var num_replies_text = ' (0/0 ' + video_data.replies_loaded_text + ')';
var hide_replies_text = video_data.hide_replies_text + num_replies_text;
a.setAttribute('data-sub-text', hide_replies_text);
a.setAttribute('data-inner-text', video_data.show_replies_text + num_replies_text);
a.textContent = hide_replies_text;
var div = document.createElement('div');
div.innerHTML = response.contentHtml;
var [newHTML, has_more_replies] = format_count_load_more(response.contentHtml, num_incoming_replies, num_total_replies);
format_count_toggle_replies_button(a, num_incoming_replies, num_total_replies, has_more_replies);
div.innerHTML = newHTML;
body.appendChild(p);
body.appendChild(div);
}
},
onNon200: function (xhr) {
body.innerHTML = fallback;
body.innerHTML = originalHTML;
},
onTimeout: function (xhr) {
console.warn('Pulling comments failed');
body.innerHTML = fallback;
body.innerHTML = originalHTML;
}
});
}

1
locales/en-US.json
View File

@ -220,6 +220,7 @@
"View Reddit comments": "View Reddit comments",
"Hide replies": "Hide replies",
"Show replies": "Show replies",
"Replies loaded": "loaded",
"Incorrect password": "Incorrect password",
"Wrong answer": "Wrong answer",
"Erroneous CAPTCHA": "Erroneous CAPTCHA",

1
src/invidious/views/community.ecr
View File

@ -39,6 +39,7 @@
"comments_text" => HTML.escape(translate(locale, "View `x` comments", "{commentCount}")),
"hide_replies_text" => HTML.escape(translate(locale, "Hide replies")),
"show_replies_text" => HTML.escape(translate(locale, "Show replies")),
"replies_loaded_text" => HTML.escape(translate(locale, "Replies loaded")),
"preferences" => env.get("preferences").as(Preferences)
}.to_pretty_json
%>

1
src/invidious/views/post.ecr
View File

@ -35,6 +35,7 @@
"comments_text" => HTML.escape(translate(locale, "View `x` comments", "{commentCount}")),
"hide_replies_text" => HTML.escape(translate(locale, "Hide replies")),
"show_replies_text" => HTML.escape(translate(locale, "Show replies")),
"replies_loaded_text" => HTML.escape(translate(locale, "Replies loaded")),
"params" => {
"comments": ["youtube"]
},

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

@ -59,6 +59,7 @@ we're going to need to do it here in order to allow for translations.
"comments_text" => HTML.escape(translate(locale, "View `x` comments", "{commentCount}")),
"hide_replies_text" => HTML.escape(translate(locale, "Hide replies")),
"show_replies_text" => HTML.escape(translate(locale, "Show replies")),
"replies_loaded_text" => HTML.escape(translate(locale, "Replies loaded")),
"params" => params,
"preferences" => preferences,
"premiere_timestamp" => video.premiere_timestamp.try &.to_unix,