summary refs log tree commit diff
path: root/synapse/handlers/message.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <daniel@matrix.org>2015-10-13 13:32:43 +0100
committerDaniel Wagner-Hall <daniel@matrix.org>2015-10-13 13:32:43 +0100
commit32a453d7ba43f4bbf7160761858367072fe8c43f (patch)
tree3fb96db58bc18f76b2f22bee85824d7024435791 /synapse/handlers/message.py
parentMerge branch 'develop' into daniel/3pidinvites (diff)
parentMerge pull request #299 from stevenhammerton/sh-cas-required-attribute (diff)
downloadsynapse-32a453d7ba43f4bbf7160761858367072fe8c43f.tar.xz
Merge branch 'develop' into daniel/3pidinvites
Diffstat (limited to 'synapse/handlers/message.py')
-rw-r--r--synapse/handlers/message.py13
1 files changed, 8 insertions, 5 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 30949ff7a6..b70258697b 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -324,7 +324,8 @@ class MessageHandler(BaseHandler):
         )
 
     @defer.inlineCallbacks
-    def snapshot_all_rooms(self, user_id=None, pagin_config=None, as_client_event=True):
+    def snapshot_all_rooms(self, user_id=None, pagin_config=None,
+                           as_client_event=True, include_archived=False):
         """Retrieve a snapshot of all rooms the user is invited or has joined.
 
         This snapshot may include messages for all rooms where the user is
@@ -335,17 +336,19 @@ class MessageHandler(BaseHandler):
             pagin_config (synapse.api.streams.PaginationConfig): The pagination
             config used to determine how many messages *PER ROOM* to return.
             as_client_event (bool): True to get events in client-server format.
+            include_archived (bool): True to get rooms that the user has left
         Returns:
             A list of dicts with "room_id" and "membership" keys for all rooms
             the user is currently invited or joined in on. Rooms where the user
             is joined on, may return a "messages" key with messages, depending
             on the specified PaginationConfig.
         """
+        memberships = [Membership.INVITE, Membership.JOIN]
+        if include_archived:
+            memberships.append(Membership.LEAVE)
+
         room_list = yield self.store.get_rooms_for_user_where_membership_is(
-            user_id=user_id,
-            membership_list=[
-                Membership.INVITE, Membership.JOIN, Membership.LEAVE
-            ]
+            user_id=user_id, membership_list=memberships
         )
 
         user = UserID.from_string(user_id)