summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-05-22 16:04:22 +0100
committerMark Haines <mjark@negativecurvature.net>2015-05-22 16:04:22 +0100
commit5d53c143423ea58567f65231b8e98f92499b828c (patch)
tree53761625ee318ccfd04ae6a9408aa2daee853197 /synapse/handlers
parentMerge pull request #161 from matrix-org/erikj/txn_logging_fix (diff)
parentRemove unused import (diff)
downloadsynapse-5d53c143423ea58567f65231b8e98f92499b828c.tar.xz
Merge pull request #160 from matrix-org/markjh/appservice_performance
Make the appservice use 'users_in_room' rather than get_room_members …
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/appservice.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/synapse/handlers/appservice.py b/synapse/handlers/appservice.py

index 355ab317df..8269482e47 100644 --- a/synapse/handlers/appservice.py +++ b/synapse/handlers/appservice.py
@@ -15,7 +15,7 @@ from twisted.internet import defer -from synapse.api.constants import EventTypes, Membership +from synapse.api.constants import EventTypes from synapse.appservice import ApplicationService from synapse.types import UserID @@ -147,10 +147,7 @@ class ApplicationServicesHandler(object): ) # We need to know the members associated with this event.room_id, # if any. - member_list = yield self.store.get_room_members( - room_id=event.room_id, - membership=Membership.JOIN - ) + member_list = yield self.store.get_users_in_room(event.room_id) services = yield self.store.get_app_services() interested_list = [