diff --git a/synapse/event_auth.py b/synapse/event_auth.py index b55550eab9..64de3f7ef8 100644 --- a/synapse/event_auth.py +++ b/synapse/event_auth.py @@ -65,8 +65,8 @@ from synapse.api.room_versions import ( RoomVersion, RoomVersions, ) -from synapse.state import CREATE_KEY from synapse.events import is_creator +from synapse.state import CREATE_KEY from synapse.storage.databases.main.events_worker import EventRedactBehaviour from synapse.types import ( MutableStateMap, diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index b8cb357c97..a8b29debd9 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -584,6 +584,7 @@ class RoomCreationHandler: old_room_create_event, tombstone_event_id, new_room_version, + additional_creators=additional_creators, ) initial_state = {} diff --git a/tests/storage/test_redaction.py b/tests/storage/test_redaction.py index c7ae5c815f..e2e48a5295 100644 --- a/tests/storage/test_redaction.py +++ b/tests/storage/test_redaction.py @@ -244,7 +244,6 @@ class RedactionTestCase(unittest.HomeserverTestCase): def __init__(self, base_builder: EventBuilder, event_id: str): self._base_builder = base_builder self._event_id = event_id - self.room_version = base_builder.room_version async def build( self,