summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2015-02-03 14:44:16 +0000
committerKegan Dougal <kegan@matrix.org>2015-02-03 14:44:16 +0000
commit94a5db9f4d400a345c5d8b9f7bacb0c9ccf99959 (patch)
tree70b31202ff92338c139ea64989dee8644397587f /synapse/handlers
parentImplement restricted namespace checks. Begin fleshing out the main hook for n... (diff)
downloadsynapse-94a5db9f4d400a345c5d8b9f7bacb0c9ccf99959.tar.xz
Add appservice package and move ApplicationService into it.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/appservice.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py
index dac63e2245..f05b57bcb9 100644
--- a/synapse/handlers/appservice.py
+++ b/synapse/handlers/appservice.py
@@ -17,7 +17,7 @@ from twisted.internet import defer
 
 from ._base import BaseHandler
 from synapse.api.errors import Codes, StoreError, SynapseError
-from synapse.storage.appservice import ApplicationService
+from synapse.appservice import ApplicationService
 
 import logging
 
@@ -96,6 +96,7 @@ class ApplicationServicesHandler(BaseHandler):
                 restrict_to=ApplicationService.NS_USERS
             )
             for user_service in user_query_services:
+                # this needs to block XXX: Need to feed response back to caller
                 pass  # TODO poke User Query API
 
         # Do we know this room alias exists? If not, poke the room alias query
@@ -107,6 +108,7 @@ class ApplicationServicesHandler(BaseHandler):
                 restrict_to=ApplicationService.NS_ALIASES
             )
             for alias_service in alias_query_services:
+                # this needs to block XXX: Need to feed response back to caller
                 pass  # TODO poke Room Alias Query API
 
         # Fork off pushes to these services - XXX First cut, best effort