summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2018-10-31 04:33:41 +1100
committerGitHub <noreply@github.com>2018-10-31 04:33:41 +1100
commit3bade14ec0aa7e56c84d30241bd86a177f0699d6 (patch)
treec80962f1d35acef37112f0bcde89c4caf2ad6cc3 /synapse
parentRemove the unused /pull federation API (#4118) (diff)
downloadsynapse-3bade14ec0aa7e56c84d30241bd86a177f0699d6.tar.xz
Fix search 500ing (#4122)
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/search.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py
index 0c1d52fd11..80e7b15de8 100644
--- a/synapse/handlers/search.py
+++ b/synapse/handlers/search.py
@@ -24,6 +24,7 @@ from synapse.api.constants import EventTypes, Membership
 from synapse.api.errors import SynapseError
 from synapse.api.filtering import Filter
 from synapse.events.utils import serialize_event
+from synapse.storage.state import StateFilter
 from synapse.visibility import filter_events_for_client
 
 from ._base import BaseHandler
@@ -324,9 +325,12 @@ class SearchHandler(BaseHandler):
                     else:
                         last_event_id = event.event_id
 
+                    state_filter = StateFilter.from_types(
+                        [(EventTypes.Member, sender) for sender in senders]
+                    )
+
                     state = yield self.store.get_state_for_event(
-                        last_event_id,
-                        types=[(EventTypes.Member, sender) for sender in senders]
+                        last_event_id, state_filter
                     )
 
                     res["profile_info"] = {