8000 Return whether a user is an admin within a group by lukebarnard1 · Pull Request #2647 · matrix-org/synapse · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Return whether a user is an admin within a group #2647

Merged
merged 2 commits into from
Nov 7, 2017
Merged

Return whether a user is an admin within a group #2647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5561c09
Return whether a user is an admin within a group
lukebarnard1 Nov 7, 2017
38b265c
Remember to pick is_admin out of the db
lukebarnard1 Nov 7, 2017
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
5 changes: 3 additions & 2 deletions synapse/groups/groups_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,14 +426,15 @@ def get_users_in_group(self, group_id, requester_user_id):
for user_result in user_results:
g_user_id = user_result["user_id"]
is_public = user_result["is_public"]
is_privileged = user_result["is_admin"]

entry = {"user_id": g_user_id}

profile = yield self.profile_handler.get_profile_from_cache(g_user_id)
entry.update(profile)

if not is_public:
entry["is_public"] = False
entry["is_public"] = bool(is_public)
entry["is_privileged"] = bool(is_privileged)

if not self.is_mine_id(g_user_id):
attestation = yield self.store.get_remote_attestation(group_id, g_user_id)
Expand Down
2 changes: 1 addition & 1 deletion synapse/storage/group_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def get_users_in_group(self, group_id, include_private=False):
return self._simple_select_list(
table="group_users",
keyvalues=keyvalues,
retcols=("user_id", "is_public",),
retcols=("user_id", "is_public", "is_admin",),
desc="get_users_in_group",
)

Expand Down
0