diff options
author | Andrew Morgan <andrew@amorgan.xyz> | 2021-11-26 17:17:59 +0000 |
---|---|---|
committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-12-08 18:30:52 +0000 |
commit | 05d0ed81518a6f7016a1cbb784a8a3a2c22c159a (patch) | |
tree | 692c84d101e27ece07b429d049a335b267d4bb51 | |
parent | rename ApplicationService.is_interested_in_user -> is_user_in_namespace (diff) | |
download | synapse-05d0ed81518a6f7016a1cbb784a8a3a2c22c159a.tar.xz |
rename ApplicationService.is_interested_in_alias -> is_room_alias_in_namespace
-rw-r--r-- | synapse/appservice/__init__.py | 4 | ||||
-rw-r--r-- | synapse/handlers/appservice.py | 2 | ||||
-rw-r--r-- | synapse/handlers/directory.py | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/synapse/appservice/__init__.py b/synapse/appservice/__init__.py index fbc9d5d1f8..1e720c2d3f 100644 --- a/synapse/appservice/__init__.py +++ b/synapse/appservice/__init__.py @@ -203,7 +203,7 @@ class ApplicationService: alias_list = await store.get_aliases_for_room(event.room_id) for alias in alias_list: - if self.is_interested_in_alias(alias): + if self.is_room_alias_in_namespace(alias): return True return False @@ -264,7 +264,7 @@ class ApplicationService: or user_id == self.sender ) - def is_interested_in_alias(self, alias: str) -> bool: + def is_room_alias_in_namespace(self, alias: str) -> bool: return bool(self._matches_regex(alias, ApplicationService.NS_ALIASES)) def is_interested_in_room(self, room_id: str) -> bool: diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py index affc398158..75ac4380be 100644 --- a/synapse/handlers/appservice.py +++ b/synapse/handlers/appservice.py @@ -623,7 +623,7 @@ class ApplicationServicesHandler: room_alias_str = room_alias.to_string() services = self.store.get_app_services() alias_query_services = [ - s for s in services if (s.is_interested_in_alias(room_alias_str)) + s for s in services if (s.is_room_alias_in_namespace(room_alias_str)) ] for alias_service in alias_query_services: is_known_alias = await self.appservice_api.query_alias( diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index 7ee5c47fd9..f49bb806a8 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -119,7 +119,7 @@ class DirectoryHandler: service = requester.app_service if service: - if not service.is_interested_in_alias(room_alias_str): + if not service.is_room_alias_in_namespace(room_alias_str): raise SynapseError( 400, "This application service has not reserved this kind of alias.", @@ -221,7 +221,7 @@ class DirectoryHandler: async def delete_appservice_association( self, service: ApplicationService, room_alias: RoomAlias ) -> None: - if not service.is_interested_in_alias(room_alias.to_string()): + if not service.is_room_alias_in_namespace(room_alias.to_string()): raise SynapseError( 400, "This application service has not reserved this kind of alias", @@ -374,7 +374,7 @@ class DirectoryHandler: # non-exclusive locks on the alias (or there are no interested services) services = self.store.get_app_services() interested_services = [ - s for s in services if s.is_interested_in_alias(alias.to_string()) + s for s in services if s.is_room_alias_in_namespace(alias.to_string()) ] for service in interested_services: |