From d1f60254a6960ca527d477fc5391b21f12d8cc1a Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Thu, 11 May 2023 13:23:22 -0500
Subject: [PATCH] add new followers from last month to site profiles

---
 models/site.rb  |  4 ++++
 views/_news.erb | 19 ++++++++++++++++++-
 views/site.erb  |  4 ++--
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/models/site.rb b/models/site.rb
index 5c9df0f9..35714c26 100644
--- a/models/site.rb
+++ b/models/site.rb
@@ -1448,6 +1448,10 @@ class Site < Sequel::Model
     paginate(current_page, limit)
   end
 
+  def newest_follows
+    follows_dataset.where(:follows__created_at => (1.month.ago..Time.now)).all
+  end
+
   def host
     !domain.empty? ? domain : "#{username}.neocities.org"
   end
diff --git a/views/_news.erb b/views/_news.erb
index 15631481..1f6815ed 100644
--- a/views/_news.erb
+++ b/views/_news.erb
@@ -10,6 +10,23 @@
 <script src="/js/news/event.js"></script>
 <script src="/js/news/site.js"></script>
 
+<% follow_events = site.newest_follows %>
+<% unless follow_events.empty? %>
+  <div class="news-item follow">
+    <div class="icon"><a href="/site/<%= site.username %>" title="<%= site.username %>" class="avatar" style="background-image: url(<%= site.screenshot_url 'index.html', '50x50' %>);"></a></div>
+
+    <div class="text">
+      <strong>New Followers</strong>
+    </div>
+
+    <div class="content">
+      <% follow_events.first.site.newest_follows.each_with_index do |event,i| %>
+        <a href="/site/<%= event.actioning_site.username %>" class="user" title="<%= event.actioning_site.title %>"><i class="fa fa-user"><% if event.actioning_site.supporter? %><i class="fa fa-heart"></i><% end %></i><%= event.actioning_site.username %></a><% unless follow_events.length == i+1 %>, <% end %>
+      <% end %>
+    </div>
+  </div>
+<% end %>
+
 <% events.each do |event| %>
   <% if event.profile_comment_id %>
     <div class="news-item comment" id="event_<%= event.id %>">
@@ -39,7 +56,7 @@
             <% end %>
 
             sent a <strong><%= tip.amount_string %></strong> tip to
-
+site/actioning_site.username
             <% if current_site && event_site.id == current_site.id %>
               <a href="/site/<%= current_site.username %>" class="you">you</a>!
             <% else %>
diff --git a/views/site.erb b/views/site.erb
index b8df7627..bbbd2c35 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -74,9 +74,9 @@
           </p>
         <% end %>
       </div>
-      <%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %>
+      <%== erb :'_news', layout: false, locals: {site: site, events: @latest_events} %>
     <% else %>
-      <div class="site-profile-padding"><%== erb :'_news', layout: false, locals: {site: @site, events: @latest_events} %></div>
+      <div class="site-profile-padding"><%== erb :'_news', layout: false, locals: {site: site, events: @latest_events} %></div>
     <% end %>
   </div>