Make matches_user_in_member_list method private

synapse/appservice/__init__.py

@@ -176,7 +176,7 @@ def _is_exclusive(self, namespace_key: str, test_string: str) -> bool:
         return False
 
     @cached(num_args=1, cache_context=True)
-    async def matches_user_in_member_list(
+    async def _matches_user_in_member_list(
         self,
         room_id: str,
         store: "DataStore",
@@ -259,7 +259,7 @@ async def is_interested_in_room(
 
         # And finally, perform an expensive check on whether any of the
         # users in the room match the appservice's user namespace
-        return await self.matches_user_in_member_list(
+        return await self._matches_user_in_member_list(
             room_id, store, on_invalidate=cache_context.invalidate
         )
 
@@ -316,7 +316,7 @@ async def is_interested_in_presence(
 
         # Then find out if the appservice is interested in any of those rooms
         for room_id in room_ids:
-            if await self.matches_user_in_member_list(
+            if await self.is_interested_in_room(
                 room_id, store, on_invalidate=cache_context.invalidate
             ):
                 return True

synapse/handlers/receipts.py

@@ -269,7 +269,7 @@ async def get_new_events_as(
         # Then filter down to rooms that the AS can read
         events = []
         for room_id, event in rooms_to_events.items():
-            if not await service.matches_user_in_member_list(room_id, self.store):
+            if not await service.is_interested_in_room(room_id, self.store):
                 continue
 
             events.append(event)

synapse/handlers/typing.py

@@ -486,9 +486,7 @@ async def get_new_events_as(
                 if handler._room_serials[room_id] <= from_key:
                     continue
 
-                if not await service.matches_user_in_member_list(
-                    room_id, self._main_store
-                ):
+                if not await service.is_interested_in_room(room_id, self._main_store):
                     continue
 
                 events.append(self._make_event_for(room_id))