kaslo/synapse
1
0
Fork 0
Code Packages Releases 124 Wiki Activity

Merge remote-tracking branch 'private/release-v1.135-hydra' into release-v1.135

Browse Source
This commit is contained in:
Devon Hudson
2025-08-11 11:50:12 -06:00
parent 848949a727 fdd63882b1
commit 9244948750
3 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
synapse/event_auth.py
View File

@@ -65,8 +65,8 @@ from synapse.api.room_versions import (
RoomVersion, RoomVersion,
RoomVersions, RoomVersions,
) )
from synapse.state import CREATE_KEY
from synapse.events import is_creator from synapse.events import is_creator
from synapse.state import CREATE_KEY
from synapse.storage.databases.main.events_worker import EventRedactBehaviour from synapse.storage.databases.main.events_worker import EventRedactBehaviour
from synapse.types import ( from synapse.types import (
MutableStateMap, MutableStateMap,

1
synapse/handlers/room.py
View File

@@ -584,6 +584,7 @@ class RoomCreationHandler:
old_room_create_event, old_room_create_event,
tombstone_event_id, tombstone_event_id,
new_room_version, new_room_version,
additional_creators=additional_creators,
) )
initial_state = {} initial_state = {}

1
tests/storage/test_redaction.py
View File

@@ -244,7 +244,6 @@ class RedactionTestCase(unittest.HomeserverTestCase):
def __init__(self, base_builder: EventBuilder, event_id: str): def __init__(self, base_builder: EventBuilder, event_id: str):
self._base_builder = base_builder self._base_builder = base_builder
self._event_id = event_id self._event_id = event_id
self.room_version = base_builder.room_version
async def build( async def build(
self, self,