diff options
| author | Erik Johnston <erik@matrix.org> | 2014-11-10 11:15:02 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2014-11-10 11:15:02 +0000 |
| commit | 65f846ade09feba129a14b2b9714c2ad51d00f0a (patch) | |
| tree | 9f7d99af9832ad64df1a649ee9a45c63396ef049 /synapse/storage | |
| parent | Fix invite auth (diff) | |
| download | synapse-65f846ade09feba129a14b2b9714c2ad51d00f0a.tar.xz | |
Notify users about invites.
Diffstat (limited to 'synapse/storage')
| -rw-r--r-- | synapse/storage/stream.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/synapse/storage/stream.py b/synapse/storage/stream.py index 8f7f61d29d..475e7f20a1 100644 --- a/synapse/storage/stream.py +++ b/synapse/storage/stream.py @@ -177,10 +177,9 @@ class StreamStore(SQLBaseStore): sql = ( "SELECT *, (%(redacted)s) AS redacted FROM events AS e WHERE " - "((room_id IN (%(current)s)) OR " + "(e.outlier = 0 AND (room_id IN (%(current)s)) OR " "(event_id IN (%(invites)s))) " "AND e.stream_ordering > ? AND e.stream_ordering <= ? " - "AND e.outlier = 0 " "ORDER BY stream_ordering ASC LIMIT %(limit)d " ) % { "redacted": del_sql, |