Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

tolerate ranges of power levels for logged-in users to avoid conflicts #263

Merged
merged 2 commits into from
Jun 4, 2022
Merged

tolerate ranges of power levels for logged-in users to avoid conflicts #263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3620c84
tolerate ranges of power levels for logged-in users to avoid conflicts
maltee1 May 25, 2022
8c12148
Update mautrix_signal/portal.py
maltee1 May 30, 2022
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
17 changes: 15 additions & 2 deletions mautrix_signal/portal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1679,6 +1679,7 @@ async def _get_power_levels(
is_initial: bool = False,
) -> PowerLevelStateEventContent:
levels = levels or PowerLevelStateEventContent()
bot_pl = levels.get_user_level(self.az.bot_mxid)
levels.events_default = 0
if self.is_direct:
levels.ban = 99
Expand All @@ -1691,8 +1692,20 @@ async def _get_power_levels(
ac = info.access_control
for detail in info.member_detail + info.pending_member_detail:
puppet = await p.Puppet.get_by_address(Address(uuid=detail.uuid))
level = 50 if detail.role == GroupMemberRole.ADMINISTRATOR else 0
levels.users[puppet.intent_for(self).mxid] = level
puppet_mxid = puppet.intent_for(self).mxid
current_level = levels.get_user_level(puppet_mxid)
if bot_pl > current_level and bot_pl >= 50:
level = current_level
if puppet.is_real_user:
if current_level >= 50 and detail.role == GroupMemberRole.DEFAULT:
level = 0
elif (
current_level < 50 and detail.role == GroupMemberRole.ADMINISTRATOR
):
level = 50
else:
level = 50 if detail.role == GroupMemberRole.ADMINISTRATOR else 0
levels.users[puppet_mxid] = level
announcements = info.announcements
else:
ac = GroupAccessControl()
Expand Down