diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 3c5751d66c..1d7e6997b9 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -27,10 +27,6 @@ from synapse.api.constants import (
EventTypes, Membership,
)
from synapse.api.errors import AuthError, SynapseError, Codes
-from synapse.replication.http.membership import (
- remote_join, remote_reject_invite, get_or_register_3pid_guest,
- notify_user_membership_change,
-)
from synapse.types import UserID, RoomID
from synapse.util.async import Linearizer
from synapse.util.distributor import user_left_room, user_joined_room
@@ -933,77 +929,3 @@ class RoomMemberMasterHandler(RoomMemberHandler):
if membership:
yield self.store.forget(user_id, room_id)
-
-
-class RoomMemberWorkerHandler(RoomMemberHandler):
- @defer.inlineCallbacks
- def _remote_join(self, requester, remote_room_hosts, room_id, user, content):
- """Implements RoomMemberHandler._remote_join
- """
- if len(remote_room_hosts) == 0:
- raise SynapseError(404, "No known servers")
-
- ret = yield remote_join(
- self.simple_http_client,
- host=self.config.worker_replication_host,
- port=self.config.worker_replication_http_port,
- requester=requester,
- remote_room_hosts=remote_room_hosts,
- room_id=room_id,
- user_id=user.to_string(),
- content=content,
- )
-
- yield self._user_joined_room(user, room_id)
-
- defer.returnValue(ret)
-
- def _remote_reject_invite(self, requester, remote_room_hosts, room_id, target):
- """Implements RoomMemberHandler._remote_reject_invite
- """
- return remote_reject_invite(
- self.simple_http_client,
- host=self.config.worker_replication_host,
- port=self.config.worker_replication_http_port,
- requester=requester,
- remote_room_hosts=remote_room_hosts,
- room_id=room_id,
- user_id=target.to_string(),
- )
-
- def _user_joined_room(self, target, room_id):
- """Implements RoomMemberHandler._user_joined_room
- """
- return notify_user_membership_change(
- self.simple_http_client,
- host=self.config.worker_replication_host,
- port=self.config.worker_replication_http_port,
- user_id=target.to_string(),
- room_id=room_id,
- change="join",
- )
-
- def _user_left_room(self, target, room_id):
- """Implements RoomMemberHandler._user_left_room
- """
- return notify_user_membership_change(
- self.simple_http_client,
- host=self.config.worker_replication_host,
- port=self.config.worker_replication_http_port,
- user_id=target.to_string(),
- room_id=room_id,
- change="left",
- )
-
- def get_or_register_3pid_guest(self, requester, medium, address, inviter_user_id):
- """Implements RoomMemberHandler.get_or_register_3pid_guest
- """
- return get_or_register_3pid_guest(
- self.simple_http_client,
- host=self.config.worker_replication_host,
- port=self.config.worker_replication_http_port,
- requester=requester,
- medium=medium,
- address=address,
- inviter_user_id=inviter_user_id,
- )
|
