summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-11-27 16:38:50 +0000
committerErik Johnston <erik@matrix.org>2014-11-27 16:38:50 +0000
commit1505055334ecff6516c0b388efe4c5759e59fad0 (patch)
tree0375a248b650bc36e9d2eead1e2c8968c047d86a /synapse/storage
parentFix bugs when joining a remote room that has dodgy event graphs. This should ... (diff)
downloadsynapse-1505055334ecff6516c0b388efe4c5759e59fad0.tar.xz
Don't return outliers when we get recent events for rooms.
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/stream.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py
index b84735e61c..3405cb365e 100644
--- a/synapse/storage/stream.py
+++ b/synapse/storage/stream.py
@@ -283,7 +283,7 @@ class StreamStore(SQLBaseStore):
 
         sql = (
             "SELECT *, (%(redacted)s) AS redacted FROM events "
-            "WHERE room_id = ? AND stream_ordering <= ? "
+            "WHERE room_id = ? AND stream_ordering <= ? AND outlier = 0 "
             "ORDER BY topological_ordering DESC, stream_ordering DESC LIMIT ? "
         ) % {
             "redacted": del_sql,