Rename do_invite_join

This keeps confusing me. It's nothing to do with invites!

changelog.d/11010.misc

@@ -0,0 +1 @@
+Rename `do_invite_join` to `self.federation_handler.join_room_over_federation`.

synapse/handlers/federation.py

@@ -432,7 +432,7 @@ class FederationHandler(BaseHandler):
         )
         return list(auth)
 
-    async def do_invite_join(
+    async def join_room_over_federation(
         self, target_hosts: Iterable[str], room_id: str, joinee: str, content: JsonDict
     ) -> Tuple[str, int]:
         """Attempts to join the `joinee` to the room `room_id` via the

synapse/handlers/room_member.py

@@ -1534,7 +1534,7 @@ class RoomMemberMasterHandler(RoomMemberHandler):
         # join dance for now, since we're kinda implicitly checking
         # that we are allowed to join when we decide whether or not we
         # need to do the invite/join dance.
-        event_id, stream_id = await self.federation_handler.do_invite_join(
+        event_id, stream_id = await self.federation_handler.join_room_over_federation(
             remote_room_hosts, room_id, user.to_string(), content
         )
 

synapse/replication/http/membership.py

@@ -90,7 +90,7 @@ class ReplicationRemoteJoinRestServlet(ReplicationEndpoint):
 
         logger.info("remote_join: %s into room: %s", user_id, room_id)
 
-        event_id, stream_id = await self.federation_handler.do_invite_join(
+        event_id, stream_id = await self.federation_handler.join_room_over_federation(
             remote_room_hosts, room_id, user_id, event_content
         )
 

tests/federation/test_complexity.py

@@ -75,7 +75,7 @@ class RoomComplexityTests(unittest.FederatingHomeserverTestCase):
 
         # Mock out some things, because we don't want to test the whole join
         fed_transport.client.get_json = Mock(return_value=make_awaitable({"v1": 9999}))
-        handler.federation_handler.do_invite_join = Mock(
+        handler.federation_handler.join_room_over_federation = Mock(
             return_value=make_awaitable(("", 1))
         )
 
@@ -106,7 +106,7 @@ class RoomComplexityTests(unittest.FederatingHomeserverTestCase):
 
         # Mock out some things, because we don't want to test the whole join
         fed_transport.client.get_json = Mock(return_value=make_awaitable({"v1": 9999}))
-        handler.federation_handler.do_invite_join = Mock(
+        handler.federation_handler.join_room_over_federation = Mock(
             return_value=make_awaitable(("", 1))
         )
 
@@ -144,7 +144,7 @@ class RoomComplexityTests(unittest.FederatingHomeserverTestCase):
 
         # Mock out some things, because we don't want to test the whole join
         fed_transport.client.get_json = Mock(return_value=make_awaitable(None))
-        handler.federation_handler.do_invite_join = Mock(
+        handler.federation_handler.join_room_over_federation = Mock(
             return_value=make_awaitable(("", 1))
         )
 
@@ -200,7 +200,7 @@ class RoomComplexityAdminTests(unittest.FederatingHomeserverTestCase):
 
         # Mock out some things, because we don't want to test the whole join
         fed_transport.client.get_json = Mock(return_value=make_awaitable({"v1": 9999}))
-        handler.federation_handler.do_invite_join = Mock(
+        handler.federation_handler.join_room_over_federation = Mock(
             return_value=make_awaitable(("", 1))
         )
 
@@ -230,7 +230,7 @@ class RoomComplexityAdminTests(unittest.FederatingHomeserverTestCase):
 
         # Mock out some things, because we don't want to test the whole join
         fed_transport.client.get_json = Mock(return_value=make_awaitable({"v1": 9999}))
-        handler.federation_handler.do_invite_join = Mock(
+        handler.federation_handler.join_room_over_federation = Mock(
             return_value=make_awaitable(("", 1))
         )