summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2015-10-21 15:46:41 +0100
committerMark Haines <mjark@negativecurvature.net>2015-10-21 15:46:41 +0100
commite94ffd89d6490cae63b72cf54ece89afc29b300c (patch)
tree28b944c93fdd59e66eab7bc985786f3b110efca4 /synapse/storage
parentMerge pull request #318 from matrix-org/syn-502-login-bad-emails (diff)
parentInclude banned rooms in the archived section of v2 sync (diff)
downloadsynapse-e94ffd89d6490cae63b72cf54ece89afc29b300c.tar.xz
Merge pull request #316 from matrix-org/markjh/v2_sync_archived
Add rooms that the user has left under archived in v2 sync.
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/roommember.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/synapse/storage/roommember.py b/synapse/storage/roommember.py
index dd98dcfda8..ae1ad56d9a 100644
--- a/synapse/storage/roommember.py
+++ b/synapse/storage/roommember.py
@@ -124,6 +124,19 @@ class RoomMemberStore(SQLBaseStore):
             invites.event_id for invite in invites
         ]))
 
+    def get_leave_and_ban_events_for_user(self, user_id):
+        """ Get all the leave events for a user
+        Args:
+            user_id (str): The user ID.
+        Returns:
+            A deferred list of event objects.
+        """
+        return self.get_rooms_for_user_where_membership_is(
+            user_id, (Membership.LEAVE, Membership.BAN)
+        ).addCallback(lambda leaves: self._get_events([
+            leave.event_id for leave in leaves
+        ]))
+
     def get_rooms_for_user_where_membership_is(self, user_id, membership_list):
         """ Get all the rooms for this user where the membership for this user
         matches one in the membership list.