diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-02-24 17:20:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-24 17:20:44 +0000 |
| commit | 691659568fa57f6afd9918886efc72b9e7081d8f (patch) | |
| tree | efae22a38e20e03ee77e56127c3ffda6fbd11dd3 | |
| parent | Upsert room version when we join over federation (#6968) (diff) | |
| download | synapse-691659568fa57f6afd9918886efc72b9e7081d8f.tar.xz | |
Remove redundant store_room call (#6979)
`_process_received_pdu` is only called by `on_receive_pdu`, which ignores any events for unknown rooms, so this is redundant.
| -rw-r--r-- | changelog.d/6979.misc | 1 | ||||
| -rw-r--r-- | synapse/handlers/federation.py | 23 |
2 files changed, 1 insertions, 23 deletions
diff --git a/changelog.d/6979.misc b/changelog.d/6979.misc new file mode 100644 index 0000000000..c57b398c2f --- /dev/null +++ b/changelog.d/6979.misc @@ -0,0 +1 @@ +Remove redundant `store_room` call from `FederationHandler._process_received_pdu`. diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py index fb0a586eaa..c2e6ee266d 100644 --- a/synapse/handlers/federation.py +++ b/synapse/handlers/federation.py @@ -41,7 +41,6 @@ from synapse.api.errors import ( FederationDeniedError, FederationError, RequestSendFailed, - StoreError, SynapseError, ) from synapse.api.room_versions import KNOWN_ROOM_VERSIONS, RoomVersion, RoomVersions @@ -707,28 +706,6 @@ class FederationHandler(BaseHandler): except AuthError as e: raise FederationError("ERROR", e.code, e.msg, affected=event.event_id) - room = await self.store.get_room(room_id) - - if not room: - try: - prev_state_ids = await context.get_prev_state_ids() - create_event = await self.store.get_event( - prev_state_ids[(EventTypes.Create, "")] - ) - - room_version_id = create_event.content.get( - "room_version", RoomVersions.V1.identifier - ) - - await self.store.store_room( - room_id=room_id, - room_creator_user_id="", - is_public=False, - room_version=KNOWN_ROOM_VERSIONS[room_version_id], - ) - except StoreError: - logger.exception("Failed to store room.") - if event.type == EventTypes.Member: if event.membership == Membership.JOIN: # Only fire user_joined_room if the user has acutally |