From 4d1b6f4ad1bbae71c6c941b5951d9f9043ddace4 Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Mon, 18 May 2015 14:03:46 +0100
Subject: Remove rejected events if we don't want rejected events

---
 synapse/storage/events.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'synapse')

diff --git a/synapse/storage/events.py b/synapse/storage/events.py
index 25fb49a28d..5a04d45e1e 100644
--- a/synapse/storage/events.py
+++ b/synapse/storage/events.py
@@ -643,6 +643,9 @@ class EventsStore(SQLBaseStore):
                 events,
             )
 
+        if not allow_rejected:
+            rows[:] = [r for r in rows if not r["rejects"]]
+
         res = yield defer.gatherResults(
             [
                 defer.maybeDeferred(
-- 
cgit 1.4.1