Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Group inbox new filter not accounting for dismissed topics. 

Follow-up to 2c046cc670
This commit is contained in:
Alan Guo Xiang Tan 2021-08-05 16:36:52 +08:00
parent 3f59ccefd7
commit 0bf27242ec
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/topic_query/private_message_lists.rb
View File

@ -104,6 +104,7 @@ class TopicQuery
def list_private_messages_group_new(user) def list_private_messages_group_new(user)
list = filter_private_message_new(user, :group) list = filter_private_message_new(user, :group)
list = remove_dismissed(list, user)
publish_read_state = !!group.publish_read_state publish_read_state = !!group.publish_read_state
list = append_read_state(list, group) if publish_read_state list = append_read_state(list, group) if publish_read_state
create_list(:private_messages, { publish_read_state: publish_read_state }, list) create_list(:private_messages, { publish_read_state: publish_read_state }, list)

10
spec/lib/topic_query/private_message_lists_spec.rb
View File

@ -203,6 +203,16 @@ describe TopicQuery::PrivateMessageLists do
expect(topics).to contain_exactly(group_message) expect(topics).to contain_exactly(group_message)
end end
it 'returns a list of new private messages for a group accounting for dismissed topics' do
Fabricate(:dismissed_topic_user, topic: group_message, user: user_2)
topics = TopicQuery.new(nil, group_name: group.name)
.list_private_messages_group_new(user_2)
.topics
expect(topics).to eq([])
end
end end
describe '#list_private_messages_group_unread' do describe '#list_private_messages_group_unread' do