Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Remove redundant store_room call #6979

Merged
merged 3 commits into from
Feb 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/6979.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove redundant `store_room` call from `FederationHandler._process_received_pdu`.
23 changes: 0 additions & 23 deletions synapse/handlers/federation.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
FederationDeniedError,
FederationError,
RequestSendFailed,
StoreError,
SynapseError,
)
from synapse.api.room_versions import KNOWN_ROOM_VERSIONS, RoomVersion, RoomVersions
Expand Down Expand Up @@ -707,28 +706,6 @@ async def _process_received_pdu(
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
Expand Down