From 1073ed8c2a32b0df2b42b5b53a9e9d2ec3df6ff9 Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Fri, 28 Feb 2020 21:55:43 -0500
Subject: [PATCH] Don't show/count follows/followers for
 banned/deleted/disabled profile sites

---
 models/site.rb       | 12 ++++++++----
 views/home.erb       |  4 ++--
 views/site.erb       |  2 +-
 views/site/stats.erb |  2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/models/site.rb b/models/site.rb
index 2c39b6de..ee5e95b4 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -533,14 +533,18 @@ class Site < Sequel::Model
     }
   end
 
-  # Who this site follows
+  # Who this site is following
   def followings_dataset
-    super.select_all(:follows).inner_join(:sites, :id=>:site_id).exclude(:sites__is_deleted => true).exclude(:sites__is_banned => true)
+    super.select_all(:follows).inner_join(:sites, :id=>:site_id).exclude(:sites__is_deleted => true).exclude(:sites__is_banned => true).exclude(:sites__profile_enabled => false).order(:score.desc)
   end
 
-  # Who this site is following
+  # Who this site follows
   def follows_dataset
-    super.select_all(:follows).inner_join(:sites, :id=>:actioning_site_id).exclude(:sites__is_deleted => true).order(:score.desc)
+    super.select_all(:follows).inner_join(:sites, :id=>:actioning_site_id).exclude(:sites__is_deleted => true).exclude(:sites__is_banned => true).exclude(:sites__profile_enabled => false).order(:score.desc)
+  end
+
+  def followings
+    followings_dataset.all
   end
 
   def follows
diff --git a/views/home.erb b/views/home.erb
index 42c95515..cc58673b 100644
--- a/views/home.erb
+++ b/views/home.erb
@@ -71,7 +71,7 @@
                   </a>
                 </div>
                 <div class="site-tags">
-                  <% if suggested_site.tags.count > 0 %>
+                  <% if suggested_site.tags_dataset.count > 0 %>
                     <i class="fa fa-tag"></i>
                     <% suggested_site.tags.each_with_index do |tag, index| %>
                       <a class="" href="/browse?tag=<%= Rack::Utils.escape tag.name %>"><%= tag.name %></a><% if index != suggested_site.tags.length - 1 %>,<% end %>
@@ -98,7 +98,7 @@
               <% end %>
             </div>
             <div class="col col-50">
-              <% follow_count = site.follows.count %>
+              <% follow_count = site.follows_dataset.count %>
               <div><strong><%= site.views.format_large_number %></strong> views</div>
               <div><strong><%= follow_count.format_large_number %></strong> follower<%= follow_count == 1 ? '' : 's' %></div>
             </div>
diff --git a/views/site.erb b/views/site.erb
index 7a00d3fb..d2259eeb 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -24,7 +24,7 @@
         <p><a href="<%= site.latest_archive.url %>" style="margin-right: 5px"><%= site.latest_archive.ipfs_hash %></a><small style="font-size: 7pt"><a href="/permanent-web">(what is this?)</a></small></p>
       <% end %>
       -->
-      <% follow_count = site.follows.count %>
+      <% follow_count = site.follows_dataset.count %>
       <div class="stats">
         <div class="stat"><strong><%= site.views.format_large_number %></strong> <span>view<%= site.views == 1 ? '' : 's' %></span></div>
         <div class="stat"><strong><%= follow_count.format_large_number %></strong> <span>follower<%= follow_count == 1 ? '' : 's' %></span></div>
diff --git a/views/site/stats.erb b/views/site/stats.erb
index 59e99161..903c762c 100644
--- a/views/site/stats.erb
+++ b/views/site/stats.erb
@@ -258,7 +258,7 @@
               <% end %>
             </div>
             <div class="col col-50">
-              <% follow_count = site.follows.count %>
+              <% follow_count = site.follows_dataset.count %>
               <div><strong><%= site.views.format_large_number %></strong> views</div>
               <div><strong><%= follow_count.format_large_number %></strong> follower<%= follow_count == 1 ? '' : 's' %></div>
             </div>