diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py
index 6647063485..b3a93212f1 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -2009,8 +2009,7 @@ class FederationHandler(BaseHandler):
"""
if get_domain_from_id(user_id) != origin:
logger.info(
- "Get /xyz.amorgan.knock/make_knock request for user %r"
- "from different origin %s, ignoring",
+ "Get /make_knock request for user %r from different origin %s, ignoring",
user_id,
origin,
)
@@ -2077,8 +2076,7 @@ class FederationHandler(BaseHandler):
if get_domain_from_id(event.sender) != origin:
logger.info(
- "Got /xyz.amorgan.knock/send_knock request for user %r "
- "from different origin %s",
+ "Got /send_knock request for user %r from different origin %s",
event.sender,
origin,
)
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index c26963b1e1..a49a61a34c 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -707,10 +707,7 @@ class RoomMemberHandler(metaclass=abc.ABCMeta):
knock.event_id, txn_id, requester, content
)
- elif (
- self.config.experimental.msc2403_enabled
- and effective_membership_state == Membership.KNOCK
- ):
+ elif effective_membership_state == Membership.KNOCK:
if not is_host_in_room:
# The knock needs to be sent over federation instead
remote_room_hosts.append(get_domain_from_id(room_id))
|
