CodeCow/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2026-07-15 21:03:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

user_topics: Refactor build_topic_mute_checker to support each policy.

Browse Source 
This prep commit renames the 'build_topic_mute_checker' function
to 'build_get_topic_visibility_policy' and updates it to support
all the visibility policies.

The function prefetches the visibility policies the user has
configured for various topics and prepares a dict named
'topic_to_visibility_policy' to be used later on.
This commit is contained in:
Prakhar Pratyush 2023-09-25 12:39:53 +05:30 committed by Tim Abbott
parent b5232c56ad
commit faa98317bc
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zerver/lib/message.py
View File

@ -53,7 +53,7 @@ from zerver.lib.topic import DB_TOPIC_NAME, MESSAGE__TOPIC, TOPIC_LINKS, TOPIC_N
from zerver.lib.types import DisplayRecipientT, EditHistoryEvent, UserDisplayRecipient
from zerver.lib.url_preview.types import UrlEmbedData
from zerver.lib.user_groups import is_user_in_group
from zerver.lib.user_topics import build_topic_mute_checker, topic_has_visibility_policy
from zerver.lib.user_topics import build_get_topic_visibility_policy, topic_has_visibility_policy
from zerver.models import (
MAX_TOPIC_NAME_LENGTH,
Message,
@ -1111,13 +1111,14 @@ def extract_unread_data_from_um_rows(
muted_stream_ids = get_muted_stream_ids(user_profile)
raw_unread_messages["muted_stream_ids"] = muted_stream_ids
topic_mute_checker = build_topic_mute_checker(user_profile)
get_topic_visibility_policy = build_get_topic_visibility_policy(user_profile)
def is_row_muted(stream_id: int, recipient_id: int, topic: str) -> bool:
if stream_id in muted_stream_ids:
return True
if topic_mute_checker(recipient_id, topic):
visibility_policy = get_topic_visibility_policy(recipient_id, topic)
if visibility_policy == UserTopic.VisibilityPolicy.MUTED:
return True
# Messages sent by muted users are never unread, so we don't

29
zerver/lib/user_topics.py
View File

@ -1,6 +1,7 @@
import datetime
import logging
from typing import Callable, List, Optional, Tuple, TypedDict
from collections import defaultdict
from typing import Callable, Dict, List, Optional, Tuple, TypedDict
from django.db import transaction
from django.db.models import QuerySet
@ -233,24 +234,32 @@ def exclude_topic_mutes(
return [*conditions, condition]
def build_topic_mute_checker(user_profile: UserProfile) -> Callable[[int, str], bool]:
rows = UserTopic.objects.filter(
user_profile=user_profile, visibility_policy=UserTopic.VisibilityPolicy.MUTED
).values(
def build_get_topic_visibility_policy(
user_profile: UserProfile,
) -> Callable[[int, str], int]:
"""Prefetch the visibility policies the user has configured for
various topics.
The prefetching helps to avoid the db queries later in the loop
to determine the user's visibility policy for a topic.
"""
rows = UserTopic.objects.filter(user_profile=user_profile).values(
"recipient_id",
"topic_name",
"visibility_policy",
)
tups = set()
topic_to_visiblity_policy: Dict[Tuple[int, str], int] = defaultdict(int)
for row in rows:
recipient_id = row["recipient_id"]
topic_name = row["topic_name"]
tups.add((recipient_id, topic_name.lower()))
visibility_policy = row["visibility_policy"]
topic_to_visiblity_policy[(recipient_id, topic_name)] = visibility_policy
def is_muted(recipient_id: int, topic: str) -> bool:
return (recipient_id, topic.lower()) in tups
def get_topic_visibility_policy(recipient_id: int, topic: str) -> int:
return topic_to_visiblity_policy[(recipient_id, topic.lower())]
return is_muted
return get_topic_visibility_policy
def get_users_with_user_topic_visibility_policy(