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

user_status: Add UserInfoDict.

Browse Source 
The shared fields of `RawUserInfoDict` and `UserInfoDict` could have
been reused if they both require all keys or none. This is unfortunately
not the case, because subclassing does not override `__total__`.

Signed-off-by: Zixuan James Li <p359101898@gmail.com>
This commit is contained in:
Zixuan James Li 2022-07-21 09:19:40 -04:00 committed by Tim Abbott
parent e347005a0a
commit ebfd2b25b1
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
zerver/lib/user_status.py
View File

@ -1,4 +1,4 @@
from typing import Any, Dict, Optional
from typing import Dict, Optional, TypedDict
from django.db.models import Q
from django.utils.timezone import now as timezone_now
@ -6,14 +6,32 @@ from django.utils.timezone import now as timezone_now
from zerver.models import UserStatus
def format_user_status(row: Dict[str, Any]) -> Dict[str, Any]:
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
status: int
status_text: str
emoji_name: str
emoji_code: str
reaction_type: str
def format_user_status(row: RawUserInfoDict) -> UserInfoDict:
away = row["status"] == UserStatus.AWAY
status_text = row["status_text"]
emoji_name = row["emoji_name"]
emoji_code = row["emoji_code"]
reaction_type = row["reaction_type"]
dct = {}
dct: UserInfoDict = {}
if away:
dct["away"] = away
if status_text:
@ -26,7 +44,7 @@ def format_user_status(row: Dict[str, Any]) -> Dict[str, Any]:
return dct
def get_user_info_dict(realm_id: int) -> Dict[str, Dict[str, Any]]:
def get_user_info_dict(realm_id: int) -> Dict[str, UserInfoDict]:
rows = (
UserStatus.objects.filter(
user_profile__realm_id=realm_id,
@ -49,7 +67,7 @@ def get_user_info_dict(realm_id: int) -> Dict[str, Dict[str, Any]]:
)
)
user_dict: Dict[str, Dict[str, Any]] = {}
user_dict: Dict[str, UserInfoDict] = {}
for row in rows:
user_id = row["user_profile_id"]
user_dict[str(user_id)] = format_user_status(row)

4
zerver/tests/test_user_status.py
View File

@ -3,7 +3,7 @@ from typing import Any, Dict, List, Mapping, Set
import orjson
from zerver.lib.test_classes import ZulipTestCase
from zerver.lib.user_status import get_user_info_dict, update_user_status
from zerver.lib.user_status import UserInfoDict, get_user_info_dict, update_user_status
from zerver.models import UserProfile, UserStatus, get_client
@ -13,7 +13,7 @@ def get_away_user_ids(realm_id: int) -> Set[int]:
return {int(user_id) for user_id in user_dict if user_dict[user_id].get("away")}
def user_info(user: UserProfile) -> Dict[str, Any]:
def user_info(user: UserProfile) -> UserInfoDict:
user_dict = get_user_info_dict(user.realm_id)
return user_dict.get(str(user.id), {})