From 3871188bde178c86330c5ab1d2e276b56a4f9ae6 Mon Sep 17 00:00:00 2001
From: albert <r888888888@gmail.com>
Date: Thu, 27 Oct 2011 19:03:07 -0400
Subject: [PATCH] reverts old behavior of forum topic highlighting

---
 app/assets/javascripts/forum_posts.js      | 20 --------------------
 app/controllers/forum_topics_controller.rb | 16 +++++-----------
 app/views/forum_topics/index.html.erb      |  6 +-----
 3 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/forum_posts.js b/app/assets/javascripts/forum_posts.js
index 8205a4665..b5e3f811d 100644
--- a/app/assets/javascripts/forum_posts.js
+++ b/app/assets/javascripts/forum_posts.js
@@ -1,23 +1,3 @@
 (function() {
   Danbooru.ForumPost = {};
-  
-  Danbooru.ForumPost.initialize_all = function() {
-    this.initialize_last_forum_read_at();
-  }
-  
-  Danbooru.ForumPost.initialize_last_forum_read_at = function() {
-    var last_forum_read_at = Date.parse(Danbooru.meta("last-forum-read-at"));
-    
-    $("#c-forum-topics #a-index time").each(function(i, x) {
-      var $x = $(x);
-      var $date = Date.parse($x.attr("datetime"));
-      if (Date.parse($x.attr("datetime")) > last_forum_read_at) {
-        $x.closest("tr").addClass("new-topic");
-      }
-    });
-  }
 })();
-
-$(document).ready(function() {
-  Danbooru.ForumPost.initialize_all();
-});
diff --git a/app/controllers/forum_topics_controller.rb b/app/controllers/forum_topics_controller.rb
index 7f79aacdb..37984062a 100644
--- a/app/controllers/forum_topics_controller.rb
+++ b/app/controllers/forum_topics_controller.rb
@@ -2,7 +2,7 @@ class ForumTopicsController < ApplicationController
   respond_to :html, :xml, :json
   before_filter :member_only, :except => [:index, :show]
   before_filter :normalize_search, :only => :index
-  before_filter :update_last_forum_read_at, :only => [:index, :show]
+  after_filter :update_last_forum_read_at, :only => [:show]
   rescue_from User::PrivilegeError, :with => "static/access_denied"
 
   def new
@@ -37,7 +37,6 @@ class ForumTopicsController < ApplicationController
   def update
     @forum_topic = ForumTopic.find(params[:id])
     check_privilege(@forum_topic)
-    assign_special_attributes(@forum_topic)
     @forum_topic.update_attributes(params[:forum_topic], :as => CurrentUser.role)
     respond_with(@forum_topic)
   end
@@ -50,17 +49,12 @@ class ForumTopicsController < ApplicationController
   end
 
 private
-  def assign_special_attributes(forum_topic)
-    return unless CurrentUser.is_moderator?
-    
-    forum_topic.is_locked = params[:forum_topic][:is_locked]
-    forum_topic.is_sticky = params[:forum_topic][:is_sticky]
-  end
-  
   def update_last_forum_read_at
-    return if CurrentUser.last_forum_read_at.present? && CurrentUser.last_forum_read_at > 1.day.ago
+    return if CurrentUser.is_anonymous?
     
-    CurrentUser.update_column(:last_forum_read_at, Time.now)
+    if CurrentUser.last_forum_read_at.nil? || CurrentUser.last_forum_read_at < @forum_topic.updated_at
+      CurrentUser.update_column(:last_forum_read_at, @forum_topic.updated_at)
+    end
   end
   
   def normalize_search
diff --git a/app/views/forum_topics/index.html.erb b/app/views/forum_topics/index.html.erb
index 2a5edb76e..e1501c874 100644
--- a/app/views/forum_topics/index.html.erb
+++ b/app/views/forum_topics/index.html.erb
@@ -13,7 +13,7 @@
       </thead>
       <tbody>
         <% @forum_topics.each do |topic| %>
-          <tr>
+          <tr class="forum-topic-row <% if topic.updated_at > (CurrentUser.last_forum_read_at || Time.now) %>new-topic<% end %>">
             <td>
               <% if topic.is_sticky? %>
                 <span class="sticky">Sticky:</span>
@@ -43,10 +43,6 @@
 
 <%= render "secondary_links" %>
 
-<%= content_for(:html_header) do %>
-  <meta name="last-forum-read-at" content="<%= CurrentUser.last_forum_read_at.to_date %>">
-<% end %>
-
 <% content_for(:page_title) do %>
   Forum - <%= Danbooru.config.app_name %>
 <% end %>