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

Bugfix make_room_admin fails for users that have left a private room #10367

Merged
merged 2 commits into from
Jul 13, 2021
Merged

Bugfix make_room_admin fails for users that have left a private room #10367

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
e44be20
Bugfix `make_room_admin` fails for users that have left a private room
dklimpel Jul 10, 2021
73edc88
newsfile
dklimpel Jul 10, 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
1 change: 1 addition & 0 deletions changelog.d/10367.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Bugfix `make_room_admin` fails for users that have left a private room.
9 changes: 8 additions & 1 deletion synapse/rest/admin/rooms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,7 @@ def __init__(self, hs: "HomeServer"):
super().__init__(hs)
self.hs = hs
self.auth = hs.get_auth()
self.store = hs.get_datastore()
self.event_creation_handler = hs.get_event_creation_handler()
self.state_handler = hs.get_state_handler()
self.is_mine_id = hs.is_mine_id
Expand Down Expand Up @@ -500,7 +501,13 @@ async def on_POST(
admin_user_id = None

for admin_user in reversed(admin_users):
if room_state.get((EventTypes.Member, admin_user)):
(
current_membership_type,
_,
) = await self.store.get_local_current_membership_for_user_in_room(
admin_user, room_id
)
if current_membership_type == "join":
admin_user_id = admin_user
break

Expand Down