fixes #2197

app/controllers/forum_topics_controller.rb

@@ -18,8 +18,7 @@ class ForumTopicsController < ApplicationController
 
   def index
     @query = ForumTopic.active.search(params[:search])
-    @forum_topics = @query.order("is_sticky DESC, updated_at DESC").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
-    @read_forum_topic_ids = read_forum_topic_ids
+    @forum_topics = @query.includes([:creator, :updater]).order("is_sticky DESC, updated_at DESC").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
     respond_with(@forum_topics) do |format|
       format.xml do
         render :xml => @forum_topics.to_xml(:root => "forum-topics")
@@ -29,12 +28,10 @@ class ForumTopicsController < ApplicationController
 
   def show
     @forum_topic = ForumTopic.find(params[:id])
+    @forum_topic.mark_as_read!(CurrentUser.user)
     @forum_posts = ForumPost.search(:topic_id => @forum_topic.id).order("forum_posts.id").paginate(params[:page])
     @forum_posts.each # hack to force rails to eager load
     respond_with(@forum_topic)
-    unless CurrentUser.user.is_anonymous?
-      session[:read_forum_topics] = @forum_topic.mark_as_read(read_forum_topic_ids)
-    end
   end
 
   def create
@@ -67,7 +64,7 @@ class ForumTopicsController < ApplicationController
 
   def mark_all_as_read
     CurrentUser.user.update_attribute(:last_forum_read_at, Time.now)
-    session[:read_forum_topics] = ""
+    ForumTopicVisit.prune!(CurrentUser.user)
     redirect_to forum_topics_path, :notice => "All topics marked as read"
   end
 
@@ -95,14 +92,6 @@ private
     end
   end
 
-  def read_forum_topics
-    session[:read_forum_topics].to_s
-  end
-
-  def read_forum_topic_ids
-    read_forum_topics.scan(/(\S+) (\S+)/)
-  end
-
   def check_privilege(forum_topic)
     if !forum_topic.editable_by?(CurrentUser.user)
       raise User::PrivilegeError

app/logical/session_loader.rb

@@ -13,10 +13,6 @@ class SessionLoader
       load_session_user
     elsif cookie_password_hash_valid?
       load_cookie_user
-
-      # this means a new session is being created, so assume
-      # all the old forum topics can be marked as read
-      update_forum_last_read_at
     else
       load_session_for_api
     end
@@ -104,16 +100,5 @@ private
   def set_time_zone
     Time.zone = CurrentUser.user.time_zone
   end
-
-  def update_forum_last_read_at
-    unless CurrentUser.user.is_anonymous?
-      if CurrentUser.user.last_forum_read_at && CurrentUser.user.last_forum_read_at < CurrentUser.user.last_logged_in_at
-        CurrentUser.user.update_column(:last_forum_read_at, CurrentUser.user.last_logged_in_at)
-      elsif CurrentUser.user.last_forum_read_at.nil?
-        CurrentUser.user.update_column(:last_forum_read_at, CurrentUser.user.last_logged_in_at)
-      end
-      CurrentUser.user.update_column(:last_logged_in_at, Time.now)
-    end
-  end
 end
 

app/models/forum_topic.rb

@@ -74,8 +74,34 @@ class ForumTopic < ActiveRecord::Base
     end
   end
 
+  module VisitMethods
+    def read_by?(user = nil)
+      user ||= CurrentUser.user
+
+      if user.last_forum_read_at && updated_at <= user.last_forum_read_at
+        return true
+      end
+
+      ForumTopicVisit.where("user_id = ? and forum_topic_id = ? and last_read_at >= ?", user.id, id, updated_at).exists?
+    end
+
+    def mark_as_read!(user = nil)
+      user ||= CurrentUser.user
+      
+      match = ForumTopicVisit.where(:user_id => user.id, :forum_topic_id => id).first
+      if match
+        match.update_attribute(:last_read_at, updated_at)
+      else
+        ForumTopicVisit.create(:user_id => user.id, :forum_topic_id => id, :last_read_at => updated_at)
+      end
+
+      # user.update_attribute(:last';¬≥÷_forum_read_at, ForumTopicVisit.where(:user_id => user.id, :forum_topic_id => id).minimum(:last_read_at) || updated_at)
+    end
+  end
+
   extend SearchMethods
   include CategoryMethods
+  include VisitMethods
 
   def editable_by?(user)
     creator_id == user.id || user.is_janitor?
@@ -94,7 +120,7 @@ class ForumTopic < ActiveRecord::Base
   end
 
   def last_page
-    (posts.count / Danbooru.config.posts_per_page.to_f).ceil
+    (response_count / Danbooru.config.posts_per_page.to_f).ceil
   end
 
   def presenter(forum_posts)
@@ -105,42 +131,6 @@ class ForumTopic < ActiveRecord::Base
     super + [:text_index]
   end
 
-  def check!(user)
-    ForumTopicVisit.check!(user, self)
-  end
-
-  def mark_as_read(read_forum_topic_ids)
-    hash = read_forum_topic_ids.inject({}) do |hash, x|
-      hash[x[0].to_s] = x[1].to_s
-      hash
-    end
-    hash[id.to_s] = updated_at.to_i.to_s
-    result = hash.to_a.flatten.join(" ")
-    while result.size > 500
-      ids = result.scan(/\S+/)
-      result = ids[(ids.size / 2)..-1].join(" ")
-    end
-    update_last_forum_read_at(hash.keys)
-    result
-  end
-
-  def update_last_forum_read_at(read_forum_topic_ids)
-    query = ForumTopic.where("true")
-    if CurrentUser.user.last_forum_read_at.present?
-      query = query.where("updated_at >= ?", CurrentUser.last_forum_read_at)
-    end
-    if read_forum_topic_ids.any?
-      query = query.where("id not in (?)", read_forum_topic_ids)
-    end
-    query = query.order("updated_at asc")
-    topic = query.first
-    if topic
-      CurrentUser.user.update_attribute(:last_forum_read_at, topic.updated_at)
-    else
-      CurrentUser.user.update_attribute(:last_forum_read_at, Time.now)
-    end
-  end
-
   def merge(topic)
     ForumPost.where(:id => topic.posts.map(&:id)).update_all(:topic_id => id)
     update_attribute(:is_deleted, true)

app/models/forum_topic_visit.rb

@@ -1,30 +1,9 @@
 class ForumTopicVisit < ActiveRecord::Base
-  def self.check!(user, topic)
-    match = where(:user_id => user.id, :forum_topic_id => topic.id).first
-    result = false
-    if match
-      if match.last_read_at < topic.updated_at
-        result = true
-      end
-      match.update_attribute(:last_read_at, topic.updated_at)
-    else
-      create(:user_id => user.id, :forum_topic_id => topic.id, :last_read_at => topic.updated_at)
-    end
-    result
-  end
+  belongs_to :user
+  belongs_to :forum_topic
+  attr_accessible :user_id, :user, :forum_topic_id, :forum_topic, :last_read_at
 
-  def self.check_list!(user, topics)
-    matches = where(:user_id => user.id, :forum_topic_id => topics.map(&:id)).to_a.inject({}) do |hash, x|
-      hash[x.forum_topic_id] = x
-      hash
-    end
-    topics.each do |topic|
-      if matches[topic.id]
-        matches[topic.id].update_attribute(:last_read_at, topic.updated_at)
-      else
-        create(:user_id => user.id,, :forum_topic_id => topic.id, :last_read_at => topic.updated_at)
-      end
-    end
-    matches
+  def self.prune!(user)
+    where("last_read_at < ?", user.last_forum_read_at).delete_all
   end
 end

app/models/user.rb

@@ -428,10 +428,10 @@ class User < ActiveRecord::Base
   module ForumMethods
     def has_forum_been_updated?
       return false unless is_gold?
-      newest_topic = ForumTopic.order("updated_at desc").first
-      return false if newest_topic.nil?
+      max_updated_at = ForumTopic.maximum(:updated_at)
+      return false if max_updated_at.nil?
       return true if last_forum_read_at.nil?
-      return newest_topic.updated_at > last_forum_read_at
+      return max_updated_at > last_forum_read_at
     end
   end
 

app/views/forum_topics/index.html.erb

@@ -24,7 +24,7 @@
                 <span class="sticky">Sticky:</span>
               <% end %>
 
-              <% unless topic.read_by?(CurrentUser.user, @read_forum_topic_ids) %>
+              <% unless topic.read_by?(CurrentUser.user) %>
                 <span class="new">NEW</span>
               <% end %>