mirror of
https://github.com/zulip/zulip.git
synced 2025-10-28 18:43:52 +00:00
e36cfdb0a7
We stop sending the `away=True` based on the user's `UserStatus` object having `status=AWAY`, and instead send that value if `!presence_enabled` for the user. Third step in making user status `away` a deprecated way to access `presence_enabled` for clients supporting older servers. Part of transitioning from 'unavailable' user status feature to 'invisible mode' user presence feature.
117 lines
2.9 KiB
Python
117 lines
2.9 KiB
Python
from typing import Dict, Optional, TypedDict
|
|
|
|
from django.db.models import Q
|
|
from django.utils.timezone import now as timezone_now
|
|
|
|
from zerver.models import UserStatus
|
|
|
|
|
|
class UserInfoDict(TypedDict, total=False):
|
|
status: int
|
|
status_text: str
|
|
emoji_name: str
|
|
emoji_code: str
|
|
reaction_type: str
|
|
away: bool
|
|
|
|
|
|
class RawUserInfoDict(TypedDict):
|
|
user_profile_id: int
|
|
user_profile__presence_enabled: bool
|
|
status_text: str
|
|
emoji_name: str
|
|
emoji_code: str
|
|
reaction_type: str
|
|
|
|
|
|
def format_user_status(row: RawUserInfoDict) -> UserInfoDict:
|
|
# Deprecated way for clients to access the user's `presence_enabled`
|
|
# setting, with away != presence_enabled.
|
|
presence_enabled = row["user_profile__presence_enabled"]
|
|
away = not presence_enabled
|
|
status_text = row["status_text"]
|
|
emoji_name = row["emoji_name"]
|
|
emoji_code = row["emoji_code"]
|
|
reaction_type = row["reaction_type"]
|
|
|
|
dct: UserInfoDict = {}
|
|
if away:
|
|
dct["away"] = away
|
|
if status_text:
|
|
dct["status_text"] = status_text
|
|
if emoji_name:
|
|
dct["emoji_name"] = emoji_name
|
|
dct["emoji_code"] = emoji_code
|
|
dct["reaction_type"] = reaction_type
|
|
|
|
return dct
|
|
|
|
|
|
def get_user_status_dict(realm_id: int) -> Dict[str, UserInfoDict]:
|
|
rows = (
|
|
UserStatus.objects.filter(
|
|
user_profile__realm_id=realm_id,
|
|
user_profile__is_active=True,
|
|
)
|
|
.exclude(
|
|
Q(user_profile__presence_enabled=True)
|
|
& Q(status_text="")
|
|
& Q(emoji_name="")
|
|
& Q(emoji_code="")
|
|
& Q(reaction_type=UserStatus.UNICODE_EMOJI),
|
|
)
|
|
.values(
|
|
"user_profile_id",
|
|
"user_profile__presence_enabled",
|
|
"status_text",
|
|
"emoji_name",
|
|
"emoji_code",
|
|
"reaction_type",
|
|
)
|
|
)
|
|
|
|
user_dict: Dict[str, UserInfoDict] = {}
|
|
for row in rows:
|
|
user_id = row["user_profile_id"]
|
|
user_dict[str(user_id)] = format_user_status(row)
|
|
|
|
return user_dict
|
|
|
|
|
|
def update_user_status(
|
|
user_profile_id: int,
|
|
status: Optional[int],
|
|
status_text: Optional[str],
|
|
client_id: int,
|
|
emoji_name: Optional[str],
|
|
emoji_code: Optional[str],
|
|
reaction_type: Optional[str],
|
|
) -> None:
|
|
|
|
timestamp = timezone_now()
|
|
|
|
defaults = dict(
|
|
client_id=client_id,
|
|
timestamp=timestamp,
|
|
)
|
|
|
|
if status is not None:
|
|
defaults["status"] = status
|
|
|
|
if status_text is not None:
|
|
defaults["status_text"] = status_text
|
|
|
|
if emoji_name is not None:
|
|
defaults["emoji_name"] = emoji_name
|
|
|
|
if emoji_code is not None:
|
|
defaults["emoji_code"] = emoji_code
|
|
|
|
if reaction_type is not None:
|
|
defaults["reaction_type"] = reaction_type
|
|
|
|
UserStatus.objects.update_or_create(
|
|
user_profile_id=user_profile_id,
|
|
defaults=defaults,
|
|
)
|