jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

forum: fix topics being incorrectly marked as unread.

Browse Source 
This happened when the user marked all topics as read and so didn't have
any forum topic visits. The OR clause wasn't handled correctly for this
case.
This commit is contained in:
evazion
2020-01-21 14:31:26 -06:00
parent c7b30279b3
commit 71690cacc1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/forum_topic.rb
View File

@@ -59,7 +59,11 @@ class ForumTopic < ApplicationRecord
def read_by_user(user)
return none if user.last_forum_read_at.nil? || user.last_forum_read_at < '2000-01-01'
merge(user.visited_forum_topics.where("forum_topic_visits.last_read_at >= forum_topics.updated_at OR ? >= forum_topics.updated_at", user.last_forum_read_at))
read_topics = user.visited_forum_topics.where("forum_topic_visits.last_read_at >= forum_topics.updated_at")
old_topics = where("? >= forum_topics.updated_at", user.last_forum_read_at)
where(id: read_topics).or(where(id: old_topics))
end
def sticky_first