From f6e6f3d87a30932f706e39f4fb2d9f07d3270dce Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Thu, 29 Oct 2015 16:17:47 +0000
Subject: [PATCH] Make search API honour limit set in filter

---
 synapse/handlers/search.py | 3 +++
 1 file changed, 3 insertions(+)

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()
 
-- 
GitLab