Make search API honour limit set in filter

1 files changed, 3 insertions, 0 deletions

diff --git a/synapse/handlers/search.py b/synapse/handlers/search.py

index b13fb71d81..2718e9482e 100644
--- a/synapse/handlers/search.py
+++ b/synapse/handlers/search.py
@@ -87,6 +87,9 @@ class SearchHandler(BaseHandler):
             user.to_string(), filtered_events
         )
 
+        allowed_events.sort(key=lambda e: -rank_map[e.event_id])
+        allowed_events = allowed_events[:search_filter.limit()]
+
         if event_context is not None:
             now_token = yield self.hs.get_event_sources().get_current_token()