From 7557ffcda1c06d5a87fddfff8b3935c8e98ccb23 Mon Sep 17 00:00:00 2001
From: Omar Roth <omarroth@hotmail.com>
Date: Wed, 6 Mar 2019 09:54:56 -0600
Subject: Mark deleted channels in /subscription_manager

---
 src/invidious.cr                             |  9 +--------
 src/invidious/views/subscription_manager.ecr | 10 ++++++----
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/invidious.cr b/src/invidious.cr
index fa4f4a17..bbf9b4c9 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -1583,14 +1583,7 @@ post "/data_control" do |env|
           user.subscriptions += body["subscriptions"].as_a.map { |a| a.as_s }
           user.subscriptions.uniq!
 
-          user.subscriptions.select! do |ucid|
-            begin
-              get_channel(ucid, PG_DB, false, false)
-              true
-            rescue ex
-              false
-            end
-          end
+          user.subscriptions = get_batch_channels(user.subscriptions, PG_DB, false, false)
 
           PG_DB.exec("UPDATE users SET subscriptions = $1 WHERE email = $2", user.subscriptions, user.email)
         end
diff --git a/src/invidious/views/subscription_manager.ecr b/src/invidious/views/subscription_manager.ecr
index 3c0836ea..0f9762f9 100644
--- a/src/invidious/views/subscription_manager.ecr
+++ b/src/invidious/views/subscription_manager.ecr
@@ -4,7 +4,9 @@
 
 <div class="pure-g h-box">
     <div class="pure-u-1-3">
-        <h3><%= translate(locale, "`x` subscriptions", %(<span id="count">#{subscriptions.size}</span>)) %></h3>
+        <h3>
+            <a href="/feed/subscriptions"><%= translate(locale, "`x` subscriptions", %(<span id="count">#{subscriptions.size}</span>)) %></a>
+        </h3>
     </div>
     <div class="pure-u-1-3" style="text-align:center;">
         <h3>
@@ -20,15 +22,15 @@
 
 <% subscriptions.each do |channel| %>
 <div class="h-box">
-    <div class="pure-g">
+    <div class="pure-g<% if channel.deleted %> deleted <% end%>">
         <div class="pure-u-2-5">
-            <h3>
+            <h3 style="padding-left: 0.5em">
                 <a href="/channel/<%= channel.id %>"><%= channel.author %></a>
             </h3>
         </div>
         <div class="pure-u-2-5"></div>
         <div class="pure-u-1-5" style="text-align: right;">
-            <h3>
+            <h3 style="padding-right: 0.5em">
                 <a onclick="remove_subscription(this)"
                     data-id="<%= channel.id %>"
                     onmouseenter='this["href"]="javascript:void(0)"'
-- 
cgit v1.2.3