Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-02 21:44:52 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move clean_room_for_join to master

Browse source
This commit is contained in:
Erik Johnston 2018-08-09 10:29:48 +01:00
parent 72d1902bbe
commit b179537f2a
2 changed files with 49 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
synapse/handlers/federation.py
View file

@ -50,6 +50,7 @@ from synapse.crypto.event_signing import (
)
from synapse.events.validator import EventValidator
from synapse.replication.http.federation import (
ReplicationCleanRoomRestServlet,
ReplicationFederationSendEventsRestServlet,
)
from synapse.replication.http.membership import ReplicationUserJoinedLeftRoomRestServlet
@ -104,6 +105,9 @@ class FederationHandler(BaseHandler):
self._notify_user_membership_change = (
ReplicationUserJoinedLeftRoomRestServlet.make_client(hs)
)
self._clean_room_for_join_client = (
ReplicationCleanRoomRestServlet.make_client(hs)
)
# When joining a room we need to queue any events for that room up
self.room_queues = {}
@ -2388,8 +2392,16 @@ class FederationHandler(BaseHandler):
)
def _clean_room_for_join(self, room_id):
# TODO move this out to master
return self.store.clean_room_for_join(room_id)
"""Called to clean up any data in DB for a given room, ready for the
server to join the room.
Args:
room_id (str)
"""
if self.config.worker_app:
return self._clean_room_for_join_client(room_id)
else:
return self.store.clean_room_for_join(room_id)
def user_joined_room(self, user, room_id):
"""Called when a new user has joined the room