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

narrow: Extract function for calculating huddle recipients. 

Extracts the code from `by_group_pm_with` that calculates the
huddle recipients. Prep commit for implementing new `by_*`
method for "dm-including".
This commit is contained in:
Lauryn Menard 2023-04-05 14:46:41 +02:00 committed by Tim Abbott
parent 665e435b58
commit 29832de5f6
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
zerver/lib/narrow.py
View File

@ -12,6 +12,7 @@ from typing import (
Mapping,
Optional,
Sequence,
Set,
Tuple,
TypeVar,
Union,
@ -585,6 +586,24 @@ class NarrowBuilder:
)
return query.where(maybe_negate(cond))
def _get_huddle_recipients(self, other_user: UserProfile) -> Set[int]:
self_recipient_ids = [
recipient_tuple["recipient_id"]
for recipient_tuple in Subscription.objects.filter(
user_profile=self.user_profile,
recipient__type=Recipient.HUDDLE,
).values("recipient_id")
]
narrow_recipient_ids = [
recipient_tuple["recipient_id"]
for recipient_tuple in Subscription.objects.filter(
user_profile=other_user,
recipient__type=Recipient.HUDDLE,
).values("recipient_id")
]
return set(self_recipient_ids) & set(narrow_recipient_ids)
def by_group_pm_with(
self, query: Select, operand: Union[str, int], maybe_negate: ConditionTransform
) -> Select:
@ -600,22 +619,7 @@ class NarrowBuilder:
except UserProfile.DoesNotExist:
raise BadNarrowOperatorError("unknown user " + str(operand))
self_recipient_ids = [
recipient_tuple["recipient_id"]
for recipient_tuple in Subscription.objects.filter(
user_profile=self.user_profile,
recipient__type=Recipient.HUDDLE,
).values("recipient_id")
]
narrow_recipient_ids = [
recipient_tuple["recipient_id"]
for recipient_tuple in Subscription.objects.filter(
user_profile=narrow_profile,
recipient__type=Recipient.HUDDLE,
).values("recipient_id")
]
recipient_ids = set(self_recipient_ids) & set(narrow_recipient_ids)
recipient_ids = self._get_huddle_recipients(narrow_profile)
cond = column("recipient_id", Integer).in_(recipient_ids)
return query.where(maybe_negate(cond))