diff options
| author | Shay <hillerys@element.io> | 2023-02-24 13:15:29 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-24 13:15:29 -0800 |
| commit | 1c95ddd09bbc46046a3412e7bb03a87aa3b6f65a (patch) | |
| tree | 7941d82e136933cb271ce0b9cad24c749aa9b435 /synapse/handlers/room_member.py | |
| parent | Improve handling of non-ASCII characters in user directory search (#15143) (diff) | |
| download | synapse-1c95ddd09bbc46046a3412e7bb03a87aa3b6f65a.tar.xz | |
Batch up storing state groups when creating new room (#14918)
Diffstat (limited to 'synapse/handlers/room_member.py')
| -rw-r--r-- | synapse/handlers/room_member.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index a965c7ec76..de7476f300 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -414,7 +414,10 @@ class RoomMemberHandler(metaclass=abc.ABCMeta): max_retries = 5 for i in range(max_retries): try: - event, context = await self.event_creation_handler.create_event( + ( + event, + unpersisted_context, + ) = await self.event_creation_handler.create_event( requester, { "type": EventTypes.Member, @@ -435,7 +438,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta): outlier=outlier, historical=historical, ) - + context = await unpersisted_context.persist(event) prev_state_ids = await context.get_prev_state_ids( StateFilter.from_types([(EventTypes.Member, None)]) ) @@ -1944,7 +1947,10 @@ class RoomMemberMasterHandler(RoomMemberHandler): max_retries = 5 for i in range(max_retries): try: - event, context = await self.event_creation_handler.create_event( + ( + event, + unpersisted_context, + ) = await self.event_creation_handler.create_event( requester, event_dict, txn_id=txn_id, @@ -1952,6 +1958,7 @@ class RoomMemberMasterHandler(RoomMemberHandler): auth_event_ids=auth_event_ids, outlier=True, ) + context = await unpersisted_context.persist(event) event.internal_metadata.out_of_band_membership = True result_event = ( |