diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2023-04-06 16:26:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-06 16:26:28 -0400 |
| commit | d07d2558305057cba6a7e2cb7644c24cf2dcf9be (patch) | |
| tree | 7d12d884981d2ffc275c5d10cf811606ce18ba97 /synapse/handlers/federation_event.py | |
| parent | Bump pyopenssl from 23.1.0 to 23.1.1 (#15373) (diff) | |
| download | synapse-d07d2558305057cba6a7e2cb7644c24cf2dcf9be.tar.xz | |
Implement MSC2175: remove the creator field from create events. (#15394)
Diffstat (limited to 'synapse/handlers/federation_event.py')
| -rw-r--r-- | synapse/handlers/federation_event.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/handlers/federation_event.py b/synapse/handlers/federation_event.py index 982c8d3b2f..8d5be81a92 100644 --- a/synapse/handlers/federation_event.py +++ b/synapse/handlers/federation_event.py @@ -1515,7 +1515,10 @@ class FederationEventHandler: # support it or the event is not from the room creator. room_version = await self._store.get_room_version(marker_event.room_id) create_event = await self._store.get_create_event_for_room(marker_event.room_id) - room_creator = create_event.content.get(EventContentFields.ROOM_CREATOR) + if not room_version.msc2175_implicit_room_creator: + room_creator = create_event.content.get(EventContentFields.ROOM_CREATOR) + else: + room_creator = create_event.sender if not room_version.msc2716_historical and ( not self._config.experimental.msc2716_enabled or marker_event.sender != room_creator |