summary refs log tree commit diff
path: root/synapse/handlers/appservice.py
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-09 15:01:28 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-09 15:01:28 +0000
commitf7cac2f7b699fb3bb58c02fa1828aeec6c319f01 (patch)
tree34d975546d13d888fe42832f21a6db16a9c19948 /synapse/handlers/appservice.py
parentRemove unused imports. (diff)
downloadsynapse-f7cac2f7b699fb3bb58c02fa1828aeec6c319f01.tar.xz
Fix bugs so lazy room joining works as intended.
Diffstat (limited to 'synapse/handlers/appservice.py')
-rw-r--r--synapse/handlers/appservice.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index 5071a12eb1..8591a77bf3 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -124,15 +124,15 @@ class ApplicationServicesHandler(object):
             namedtuple: with keys "room_id" and "servers" or None if no
             association can be found.
         """
-        room_alias = room_alias.to_string()
+        room_alias_str = room_alias.to_string()
         alias_query_services = yield self._get_services_for_event(
             event=None,
             restrict_to=ApplicationService.NS_ALIASES,
-            alias_list=[room_alias]
+            alias_list=[room_alias_str]
         )
         for alias_service in alias_query_services:
             is_known_alias = yield self.appservice_api.query_alias(
-                alias_service, room_alias
+                alias_service, room_alias_str
             )
             if is_known_alias:
                 # the alias exists now so don't query more ASes.