Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Extract filter_by_topic_name_via_message.

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
Show Stats 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.stream_topic import StreamTopicTarget
from zerver.lib.topic import ( from zerver.lib.topic import (
filter_by_exact_message_topic, filter_by_exact_message_topic,
filter_by_topic_name_via_message,
) )
from zerver.lib.topic_mutes import ( from zerver.lib.topic_mutes import (
get_topic_mutes, get_topic_mutes,
@ -3652,7 +3653,10 @@ def do_mark_stream_messages_as_read(user_profile: UserProfile,
msgs = msgs.filter(message__recipient=recipient) msgs = msgs.filter(message__recipient=recipient)
if topic_name: 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( msgs = msgs.extra(
where=[UserMessage.where_unread()] where=[UserMessage.where_unread()]

3
zerver/lib/topic.py
View File

@ -13,6 +13,9 @@ def filter_by_exact_message_topic(query: QuerySet, message: Message) -> QuerySet
topic_name = message.topic_name() topic_name = message.topic_name()
return query.filter(subject=topic_name) return query.filter(subject=topic_name)
def filter_by_topic_name_via_message(query: QuerySet, topic_name: str) -> QuerySet:
return query.filter(message__subject__iexact=topic_name)
def generate_topic_history_from_db_rows(rows: List[Tuple[str, int]]) -> List[Dict[str, Any]]: def generate_topic_history_from_db_rows(rows: List[Tuple[str, int]]) -> List[Dict[str, Any]]:
canonical_topic_names = {} # type: Dict[str, Tuple[int, str]] canonical_topic_names = {} # type: Dict[str, Tuple[int, str]]