OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix tests

hs/push-reports-to-as
Will Hunt 2020-10-09 09:49:14 +01:00
parent 2a052728fd
commit f5e168cb93
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
synapse/appservice/__init__.py
View File

@ -196,7 +196,7 @@ class ApplicationService:
return True return True
return False return False
async def is_interested(self, event: EventBase, store: "DataStore") -> bool: async def is_interested(self, event: EventBase, store: Optional["DataStore"] = None) -> bool:
"""Check if this service is interested in this event. """Check if this service is interested in this event.
Args: Args:
@ -208,10 +208,13 @@ class ApplicationService:
if self._matches_room_id(event): if self._matches_room_id(event):
return True return True
if await self._matches_aliases(event, store): # This will check the namespaces first before
# checking the store, so should be run before _matches_aliases
if await self._matches_user(event, store):
return True return True
if await self._matches_user(event, store): # This will check the store, so should be run last
if await self._matches_aliases(event, store):
return True return True
return False return False