1 files changed, 55 insertions, 12 deletions

diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index 98ac72a..0922a6f 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -120,10 +120,27 @@ class AttribAccessDict(dict):
             raise AttributeError("Attribute-style access is read only")
         super(AttribAccessDict, self).__setattr__(attr, val)
 
+
 ###
-# The actual Mastodon class
+# List helper class.
+# Defined at top level so it can be pickled.
 ###
+class AttribAccessList(list):
+    def __getattr__(self, attr):
+        if attr in self:
+            return self[attr]
+        else:
+            raise AttributeError("Attribute not found: " + str(attr))
 
+    def __setattr__(self, attr, val):
+        if attr in self:
+            raise AttributeError("Attribute-style access is read only")
+        super(AttribAccessList, self).__setattr__(attr, val)
+
+
+###
+# The actual Mastodon class
+###
 class Mastodon:
     """
     Thorough and easy to use Mastodon
@@ -1633,13 +1650,23 @@ class Mastodon:
     # Reading data: Bookmarks
     ###
     @api_version("3.1.0", "3.1.0", __DICT_VERSION_STATUS)
-    def bookmarks(self):
+    def bookmarks(self, max_id=None, min_id=None, since_id=None, limit=None):
         """
         Get a list of statuses bookmarked by the logged-in user.
         
         Returns a list of `toot dicts`_.
         """
-        return self.__api_request('GET', '/api/v1/bookmarks')
+        if max_id != None:
+            max_id = self.__unpack_id(max_id)
+
+        if min_id != None:
+            min_id = self.__unpack_id(min_id)
+
+        if since_id != None:
+            since_id = self.__unpack_id(since_id)
+
+        params = self.__generate_params(locals())
+        return self.__api_request('GET', '/api/v1/bookmarks', params)
     
     ###
     # Writing data: Statuses
@@ -3040,8 +3067,8 @@ class Mastodon:
         Returns the next page or None if no further data is available.
         """
         if isinstance(previous_page, list) and len(previous_page) != 0:
-            if hasattr(previous_page[-1], '_pagination_next'):
-                params = copy.deepcopy(previous_page[-1]._pagination_next)
+            if hasattr(previous_page, '_pagination_next'):
+                params = copy.deepcopy(previous_page._pagination_next)
             else:
                 return None
         else:
@@ -3064,8 +3091,8 @@ class Mastodon:
         Returns the previous page or None if no further data is available.
         """
         if isinstance(next_page, list) and len(next_page) != 0:
-            if hasattr(next_page[0], '_pagination_prev'):
-                params = copy.deepcopy(next_page[0]._pagination_prev)
+            if hasattr(next_page, '_pagination_prev'):
+                params = copy.deepcopy(next_page._pagination_prev)
             else:
                 return None
         else:
@@ -3230,7 +3257,7 @@ class Mastodon:
             if (key in json_object and isinstance(json_object[key], six.text_type)):
                 if json_object[key].lower() == 'true':
                     json_object[key] = True
-                if json_object[key].lower() == 'False':
+                if json_object[key].lower() == 'false':
                     json_object[key] = False
         return json_object
     
@@ -3443,6 +3470,7 @@ class Mastodon:
             if isinstance(response, list) and \
                     'Link' in response_object.headers and \
                     response_object.headers['Link'] != "":
+                response = AttribAccessList(response)
                 tmp_urls = requests.utils.parse_header_links(
                     response_object.headers['Link'].rstrip('>').replace('>,<', ',<'))
                 for url in tmp_urls:
@@ -3467,7 +3495,12 @@ class Mastodon:
                                 del next_params['since_id']
                             if "min_id" in next_params:
                                 del next_params['min_id']
-                            response[-1]._pagination_next = next_params
+                            response._pagination_next = next_params
+
+                            # Maybe other API users rely on the pagination info in the last item
+                            # Will be removed in future
+                            if isinstance(response[-1], AttribAccessDict):
+                                response[-1]._pagination_next = next_params
 
                     if url['rel'] == 'prev':
                         # Be paranoid and extract since_id or min_id specifically
@@ -3486,8 +3519,13 @@ class Mastodon:
                                 prev_params['since_id'] = since_id
                             if "max_id" in prev_params:
                                 del prev_params['max_id']
-                            response[0]._pagination_prev = prev_params
-                            
+                            response._pagination_prev = prev_params
+
+                            # Maybe other API users rely on the pagination info in the first item
+                            # Will be removed in future
+                            if isinstance(response[0], AttribAccessDict):
+                                response[0]._pagination_prev = prev_params
+
                         # New and fantastico (post-2.6.0): min_id pagination
                         matchgroups = re.search(r"[?&]min_id=([^&]+)", prev_url)
                         if matchgroups:
@@ -3501,7 +3539,12 @@ class Mastodon:
                                 prev_params['min_id'] = min_id
                             if "max_id" in prev_params:
                                 del prev_params['max_id']
-                            response[0]._pagination_prev = prev_params
+                            response._pagination_prev = prev_params
+
+                            # Maybe other API users rely on the pagination info in the first item
+                            # Will be removed in future
+                            if isinstance(response[0], AttribAccessDict):
+                                response[0]._pagination_prev = prev_params
 
         return response