From 264e4beceac8028967dfc3d0098e096c50bac6bd Mon Sep 17 00:00:00 2001
From: Kyle Drake <kyle@kyledrake.net>
Date: Mon, 19 May 2014 18:31:46 +0200
Subject: [PATCH] follow/followings fixes, general cleanups

---
 app.rb             |  2 ++
 models/tag.rb      | 11 ++++++++++-
 views/_follows.erb | 19 ++++++++++++++++---
 views/_tags.erb    |  4 ++--
 views/home.erb     | 14 +++++++-------
 views/site.erb     | 15 ++++-----------
 6 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/app.rb b/app.rb
index 3d1b9295..26976881 100644
--- a/app.rb
+++ b/app.rb
@@ -76,6 +76,8 @@ end
 post '/site/:sitename/comment' do |sitename|
   require_login
 
+  redirect "/site/#{sitename}" if params[:message].empty?
+
   site = Site[username: sitename]
 
   DB.transaction do
diff --git a/models/tag.rb b/models/tag.rb
index 4dd917f6..ecffdbaf 100644
--- a/models/tag.rb
+++ b/models/tag.rb
@@ -1,3 +1,12 @@
 class Tag < Sequel::Model
   many_to_many :sites
-end
\ No newline at end of file
+
+  def before_create
+    super
+    values[:name].downcase!
+  end
+
+  def self.create_unless_exists(name)
+    dataset.filter(name: name).first || create(name: name)
+  end
+end
diff --git a/views/_follows.erb b/views/_follows.erb
index 8a6a229b..8cfdb49e 100644
--- a/views/_follows.erb
+++ b/views/_follows.erb
@@ -1,12 +1,25 @@
 <% if (!is_current_site && site.followings_dataset.count > 0) || is_current_site %>
-  <h3>Following</h3>
+  <h3><%= is_current_site ? 'You follow' : 'This site follows' %></h3>
   <div class="following">
     <% if site.followings_dataset.count == 0 %>
       <p>You are not following any sites yet. Add some by <a href="/browse">browsing sites</a> or looking at your tags.
     <% else %>
       <% site.followings.each do |following| %>
-        <a href="/site/<%= site.username %>"><img src="<%= site.screenshot_path 'index.html', '37x37' %>" class="avatar"></a>
+        <a href="/site/<%= following.site.username %>"><img src="<%= site.screenshot_path 'index.html', '37x37' %>" class="avatar"></a>
       <% end %>
     <% end %>
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
+
+<% if (!is_current_site && site.follows_dataset.count > 0) || is_current_site %>
+  <h3>Followers</h3>
+  <div class="following">
+    <% if site.follows_dataset.count == 0 %>
+      No followers yet.
+    <% else %>
+      <% site.follows.each do |follow| %>
+      <a href="/site/<%= follow.actioning_site.username %>"><img src="<%= follow.actioning_site.screenshot_path 'index.html', '37x37' %>" class="avatar"></a>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>
diff --git a/views/_tags.erb b/views/_tags.erb
index 2644bd15..dc49993c 100644
--- a/views/_tags.erb
+++ b/views/_tags.erb
@@ -4,7 +4,7 @@
     <p>You don't have any tags yet. <a href="#">Add some!</a>
   <% else %>
     <% site.tags.each do |tag| %>
-    <a class="tag" href="/tags/<%= tag.name %>"><%= tag.name %></a>
+      <a class="tag" href="/browse?tag=<%== Rack::Utils.escape tag.name %>"><%= tag.name %></a>
     <% end %>
   <% end %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/views/home.erb b/views/home.erb
index 643808de..528a2d1c 100644
--- a/views/home.erb
+++ b/views/home.erb
@@ -33,7 +33,7 @@
       <a class="tag" href="http://neocities.org">Art</a>
       <a class="tag" href="http://neocities.org">Cooking</a>
     </div>
-    
+
     <div class="site-suggestion">
       <div class="site-portrait">
         <a href="http://dragonquest.neocities.org">
@@ -45,7 +45,7 @@
       <a class="tag" href="http://neocities.org">Anime</a>
       <a class="tag" href="http://neocities.org">Art</a>
     </div>
-    
+
     <div class="site-suggestion">
       <div class="site-portrait">
         <a href="http://dragonquest.neocities.org">
@@ -56,7 +56,7 @@
       <a class="tag" href="http://neocities.org">Games</a>
       <a class="tag" href="http://neocities.org">Anime</a>
     </div>
-    
+
     <div class="site-suggestion">
       <div class="site-portrait">
         <a href="http://dragonquest.neocities.org">
@@ -66,7 +66,7 @@
       </div>
       <a class="tag" href="http://neocities.org">Games</a>
     </div>
-    
+
     <div class="site-suggestion">
       <div class="site-portrait">
         <a href="http://dragonquest.neocities.org">
@@ -77,7 +77,7 @@
       <a class="tag" href="http://neocities.org">Games</a>
       <a class="tag" href="http://neocities.org">Anime</a>
     </div>
-    
+
     <div class="site-suggestion">
       <div class="site-portrait">
         <a href="http://dragonquest.neocities.org">
@@ -92,7 +92,7 @@
       </div>
 
       <div class="col col-33">
-        <p class="site-url"><a href="//<%= site.username %>.neocities.org" target="_blank"><%= site.username %>.neocities.org</a></p>
+        <p class="site-url"><a href="//<%= current_site.username %>.neocities.org" target="_blank"><%= site.username %>.neocities.org</a></p>
         <div class="stats">
           <div class="col col-50">
             <% if site.updated_at %>
@@ -120,4 +120,4 @@
       </div>
     </div>
   </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/site.erb b/views/site.erb
index ff8a7519..b8fe6c36 100644
--- a/views/site.erb
+++ b/views/site.erb
@@ -69,16 +69,17 @@
         <span>Last updated</span>
         <strong>
           <% if site.updated_at.nil? %>
-            Just Created
+            <%= site.created_at.ago.downcase %>
           <% else %>
             <%= site.updated_at.ago.downcase %>
           <% end %>
         </strong>
       </div>
-      <div class="stat"><span>Total updates</span><strong><%= site.changed_count %></strong></div>
+      <div class="stat"><span>Number of updates</span><strong><%= site.changed_count %></strong></div>
       <div class="stat"><span>Created</span><strong><%= site.created_at.strftime('%B %-d, %Y') %></strong></div>
     </div>
 
+    <!-- 
     <h3>Archives</h3>
     <div class="archives">
     <a href=""><img src="http://neocities.org/site_screenshots/codeventurer.jpg"></a>
@@ -87,15 +88,7 @@
     <a href=""><img src="http://neocities.org/site_screenshots/codeventurer.jpg"></a>
     <a href="" class="more">See all versions</a>
     </div>
-
-    <% if site.followings_dataset.count < 0 %>
-      <h3>Following</h3>
-      <div class="following">
-        <% site.followings.each do |following| %>
-          <a href="#"><img src="<%= site.screenshot_path 'index.html', '37x37' %>" class="avatar"></a>
-        <% end %>
-      </div>
-    <% end %>
+    -->
 
     <%== erb :'_follows', layout: false, locals: {site: site, is_current_site: site == current_site} %>