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

Rework room freeze and implement unfreezing the room #100

Merged
merged 12 commits into from
Jul 22, 2021
Merged

Rework room freeze and implement unfreezing the room #100

Changes from 3 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4f43fa1
Implement the new solution for freezing (and unfreezing) a room
babolivier Jun 2, 2021
6bd4d1e
Rebuild events with a brand new context
babolivier Jun 2, 2021
f946e95
Refactor updating power levels, and tests
babolivier Jun 24, 2021
f268dcd
Don't update PLs on noops
babolivier Jun 24, 2021
63b0fe7
Lint
babolivier Jun 24, 2021
6277481
Lint
babolivier Jun 24, 2021
b19c8e9
Remove unused imports
babolivier Jun 24, 2021
d7dde35
Fix doc and types for check_event_allowed
babolivier Jul 12, 2021
deac580
Merge branch 'dinsic' into babolivier/freeze_unfreeze
babolivier Jul 13, 2021
d5f1f47
Copy the content of the PL events before modifying it
babolivier Jul 13, 2021
44102ca
Incorporate review
babolivier Jul 16, 2021
dcbf794
Update synapse/third_party_rules/access_rules.py
babolivier Jul 16, 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
7 changes: 4 additions & 3 deletions synapse/third_party_rules/access_rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ async def check_event_allowed(
self,
event: EventBase,
state_events: StateMap[EventBase],
) -> bool:
) -> Union[bool, dict]:
"""Implements synapse.events.ThirdPartyEventRules.check_event_allowed.

Checks the event's type and the current rule and calls the right function to
Expand All @@ -334,7 +334,8 @@ async def check_event_allowed(
State events in the room the event originated from.

Returns:
True if the event can be allowed, False otherwise.
True if the event can be allowed, False otherwise, or a dictionary if the
event needs to be rebuilt (containing the event's new content).
"""
if event.type == FROZEN_STATE_TYPE:
return await self._on_frozen_state_change(event, state_events)
Expand Down Expand Up @@ -441,7 +442,7 @@ async def _on_event_when_frozen(
# themselves as admin.
current_power_levels = state_events.get((EventTypes.PowerLevels, ""))
if current_power_levels:
old_content = current_power_levels.content
old_content = current_power_levels.content.copy()
old_content["users_default"] = 0

new_content = unfreeze(event.content)
Expand Down