Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Add get_userinfo_by_id method to ModuleApi #9581

Merged
merged 17 commits into from
Aug 4, 2021
Merged

Add get_userinfo_by_id method to ModuleApi #9581

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
ace5488
Add get_user_by_id method to ModuleApi
jaywink Mar 10, 2021
3ea20a7
Merge branch 'develop' into jaywink/get-user-from-module-api
jaywink Jul 21, 2021
598bbe6
Introduce a User type
jaywink Jul 21, 2021
449c354
Actually commit tests for User type
jaywink Jul 21, 2021
692aef9
Appease linting
jaywink Jul 21, 2021
af95fed
Merge branch 'develop' into jaywink/get-user-from-module-api
jaywink Aug 3, 2021
6d225a0
User -> UserInfo
jaywink Aug 3, 2021
b9f5bf3
get_user_by_id -> get_userinfo_by_id
jaywink Aug 3, 2021
6dc1240
Linter autofix
jaywink Aug 3, 2021
c0a9082
Make mypy happy
jaywink Aug 3, 2021
a990355
Make get_userinfo_by_id re-use cache of get_user_by_id
jaywink Aug 4, 2021
e28a6e3
Mark registration store `get_user_by_id` as deprecated
jaywink Aug 4, 2021
b41aede
Don't use .get() when compiling UserInfo
jaywink Aug 4, 2021
bf8bbad
Merge branch 'develop' into jaywink/get-user-from-module-api
jaywink Aug 4, 2021
71744f0
Update UserInfo docstring
jaywink Aug 4, 2021
52c1a0a
Add docstring for get_userinfo_by_id
jaywink Aug 4, 2021
c68f4a3
Update changelog.d/9581.feature
jaywink Aug 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions synapse/storage/databases/main/registration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,17 +188,17 @@ async def get_userinfo_by_id(self, user_id: str) -> Optional[UserInfo]:
desc="get_userinfo_by_id",
)
if not user_data:
return
return None
return UserInfo(
appservice_id=user_data.get("appservice_id"),
consent_server_notice_sent=user_data.get("consent_server_notice_sent"),
consent_version=user_data.get("consent_version"),
creation_ts=user_data.get("creation_ts"),
creation_ts=user_data.get("creation_ts", 0),
is_admin=bool(user_data.get("admin")),
is_deactivated=bool(user_data.get("deactivated")),
is_guest=bool(user_data.get("is_guest")),
is_shadow_banned=bool(user_data.get("shadow_banned")),
user_id=UserID.from_string(user_data.get("name")),
user_id=UserID.from_string(str(user_data.get("name"))),
user_type=user_data.get("user_type"),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The fixes seem a bit hacky just to fix the type checks, as the return types are Any from the selects.

It's because you're using user_data.get. .get returns None if the dict doesn't contain that property. In this case, we know that the dict will contain each of these properties, so you should do user_data["appservice_id"] instead, which I think will also keep mypy happy.

)

Expand Down