github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 06:41:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: TopicQuery.list_private_messages_unread ignore notification level

Browse Source
This commit is contained in:
Guo Xiang Tan
2020-09-15 12:55:50 +08:00
parent d83e3f9ce8
commit 2ff16b3650
2 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/topic_query.rb
View File

@ -328,7 +328,15 @@ class TopicQuery
def list_private_messages_unread(user)
list = private_messages_for(user, :user)
list = list.where("tu.last_read_post_number IS NULL OR tu.last_read_post_number < topics.highest_post_number")
list = TopicQuery.unread_filter(
list,
user.id,
staff: user.staff?
)
first_unread_pm_at = UserStat.where(user_id: user.id).pluck(:first_unread_pm_at).first
list = list.where("topics.updated_at >= ?", first_unread_pm_at) if first_unread_pm_at
create_list(:private_messages, {}, list)
end