lug/invidious
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't wait on server for subscription count

Browse Source
This commit is contained in:
Omar Roth 2018-11-21 19:26:55 -06:00
parent fd7aa59e0f
commit 95ebfd34c5
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/invidious.cr
View File

@ -1444,8 +1444,6 @@ get "/subscription_ajax" do |env|
redirect ||= "false" redirect ||= "false"
redirect = redirect == "true" redirect = redirect == "true"
count_text = ""
if user if user
user = user.as(User) user = user.as(User)
@ -1508,17 +1506,13 @@ get "/subscription_ajax" do |env|
PG_DB.exec("UPDATE users SET subscriptions = array_remove(subscriptions,$1) WHERE email = $2", channel_id, email) PG_DB.exec("UPDATE users SET subscriptions = array_remove(subscriptions,$1) WHERE email = $2", channel_id, email)
end end
end end
count_text = PG_DB.query_one?("SELECT cardinality(subscriptions) FROM users WHERE email = $1", email, as: Int32)
count_text ||= 0
count_text = "#{number_with_separator(count_text)} subscriptions"
end end
if redirect if redirect
env.redirect referer env.redirect referer
else else
env.response.content_type = "application/json" env.response.content_type = "application/json"
{"countText" => count_text}.to_json "{}"
end end
end end

8
src/invidious/views/subscription_manager.ecr
View File

@ -4,7 +4,7 @@
<div class="pure-g h-box"> <div class="pure-g h-box">
<div class="pure-u-2-3"> <div class="pure-u-2-3">
<h3 id="count"><%= subscriptions.size %> subscriptions</h3> <h3><span id="count"><%= subscriptions.size %></span> subscriptions</h3>
</div> </div>
<div class="pure-u-1-3" style="text-align:right;"> <div class="pure-u-1-3" style="text-align:right;">
<h3> <h3>
@ -44,6 +44,8 @@
function remove_subscription(target) { function remove_subscription(target) {
var row = target.parentNode.parentNode.parentNode.parentNode; var row = target.parentNode.parentNode.parentNode.parentNode;
row.style.display = "none"; row.style.display = "none";
var count = document.getElementById("count")
count.innerText = count.innerText - 1;
var url = "/subscription_ajax?action_remove_subscriptions=1&redirect=false&c=" + target.getAttribute("data-id"); var url = "/subscription_ajax?action_remove_subscriptions=1&redirect=false&c=" + target.getAttribute("data-id");
var xhr = new XMLHttpRequest(); var xhr = new XMLHttpRequest();
@ -54,9 +56,7 @@ function remove_subscription(target) {
xhr.onreadystatechange = function() { xhr.onreadystatechange = function() {
if (xhr.readyState == 4) { if (xhr.readyState == 4) {
if (xhr.status == 200) { if (xhr.status != 200) {
document.getElementById("count").innerHTML = xhr.response.countText;
} else {
row.style.display = ""; row.style.display = "";
} }
} }