summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-12-22 18:53:47 +0000
committerMark Haines <mark.haines@matrix.org>2015-12-22 18:53:47 +0000
commit517fb9a023733c064dfabdcfdf4ed75bcff3f7bd (patch)
treecf5cb18ed2d64601e26fa1ad8e7a7304da1075f0 /synapse
parentAdd a cache for initialSync responses that expires after 5 minutes (diff)
downloadsynapse-517fb9a023733c064dfabdcfdf4ed75bcff3f7bd.tar.xz
Move the doc string to the public facing method
Diffstat (limited to 'synapse')
-rw-r--r--synapse/handlers/message.py33
1 files changed, 17 insertions, 16 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index bef477b31e..a1bed9b0dc 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -330,6 +330,23 @@ class MessageHandler(BaseHandler):
 
     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
+        joined, depending on the pagination config.
+
+        Args:
+            user_id (str): The ID of the user making the request.
+            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.
+        """
         key = (
             user_id,
             pagin_config.from_token,
@@ -351,23 +368,7 @@ class MessageHandler(BaseHandler):
     @defer.inlineCallbacks
     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
-        joined, depending on the pagination config.
 
-        Args:
-            user_id (str): The ID of the user making the request.
-            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)