Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Rename various ApplicationServices interested methods #11915

Merged
merged 10 commits into from
Mar 3, 2022
Merged

Rename various ApplicationServices interested methods #11915

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aaa402e
Rename various ApplicationServices interested methods
anoadragon453 Mar 2, 2022
fe17863
Add 'is_interested_in_user' and 'is_interested_in_room'
anoadragon453 Mar 3, 2022
a493a16
Update tests to use the new methods
anoadragon453 Mar 2, 2022
4866227
Remove _matches_user
anoadragon453 Mar 2, 2022
bcae63e
Remove inline'd _matches_room_id and _matches_aliases methods
anoadragon453 Mar 3, 2022
381b560
Add caching to ApplicationService.is_interested_in_event
anoadragon453 Nov 29, 2021
bf00539
Make matches_user_in_member_list method private; update refs
anoadragon453 Mar 3, 2022
27ffd6d
Changelog
anoadragon453 Mar 3, 2022
eb779e0
Type hints and docstring for _mkservice, _mkservice_alias
anoadragon453 Mar 3, 2022
453fdac
Add an event ID arg to is_interested_in_event to cache with
anoadragon453 Mar 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions synapse/appservice/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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
)

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion synapse/handlers/receipts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions synapse/handlers/typing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down