diff options
| author | Erik Johnston <erik@matrix.org> | 2015-05-18 14:03:46 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-05-18 14:03:46 +0100 |
| commit | 4d1b6f4ad1bbae71c6c941b5951d9f9043ddace4 (patch) | |
| tree | 781138fa5408dab3dacbb950a42c2d228530ca39 | |
| parent | Merge branch 'erikj/events_move' of github.com:matrix-org/synapse into erikj/... (diff) | |
| download | synapse-4d1b6f4ad1bbae71c6c941b5951d9f9043ddace4.tar.xz | |
Remove rejected events if we don't want rejected events
| -rw-r--r-- | synapse/storage/events.py | 3 |
1 files changed, 3 insertions, 0 deletions
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( |