summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-11-19 14:54:47 -0500
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-11-19 14:54:47 -0500
commitdf6824a00843b8eb944b1fe119f2ce84ea3525d9 (patch)
treebbb319d54820a85aceee0618f28a6fc475f45071 /synapse
parentSimplify code (diff)
downloadsynapse-df6824a00843b8eb944b1fe119f2ce84ea3525d9.tar.xz
Ignore forgotten rooms in v2 sync
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/roommember.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index c3e11b91da..d32ce1ab1e 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -160,7 +160,7 @@ class RoomMemberStore(SQLBaseStore):
 
     def _get_rooms_for_user_where_membership_is_txn(self, txn, user_id,
                                                     membership_list):
-        where_clause = "user_id = ? AND (%s)" % (
+        where_clause = "user_id = ? AND (%s) AND NOT forgotten" % (
             " OR ".join(["membership = ?" for _ in membership_list]),
         )