paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 22:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract filter_by_topic_name_via_message.

Browse Source
This commit is contained in:
Steve Howell
2018-11-01 17:06:55 +00:00
committed by Tim Abbott
parent 2fd0cfe708
commit 7252861785
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
zerver/lib/actions.py
View File

@@ -57,6 +57,7 @@ from zerver.lib.stream_subscription import (
from zerver.lib.stream_topic import StreamTopicTarget
from zerver.lib.topic import (
filter_by_exact_message_topic,
filter_by_topic_name_via_message,
)
from zerver.lib.topic_mutes import (
get_topic_mutes,
@@ -3652,7 +3653,10 @@ def do_mark_stream_messages_as_read(user_profile: UserProfile,
msgs = msgs.filter(message__recipient=recipient)
if topic_name:
msgs = msgs.filter(message__subject__iexact=topic_name)
msgs = filter_by_topic_name_via_message(
query=msgs,
topic_name=topic_name,
)
msgs = msgs.extra(
where=[UserMessage.where_unread()]