7 files changed, 95 insertions, 10 deletions

diff --git a/Pipfile b/Pipfile
index 365589a..d0d3ce5 100644
--- a/Pipfile
+++ b/Pipfile
@@ -13,3 +13,4 @@ pytest-cov = "*"
 vcrpy = "*"
 pytest-vcr = "<1"
 pytest-mock = "*"
+requests-mock = "*"
diff --git a/Pipfile.lock b/Pipfile.lock
index d1939fc..db1193b 100644
--- a/Pipfile.lock
+++ b/Pipfile.lock
@@ -313,6 +313,14 @@
             ],
             "version": "==2.20.1"
         },
+        "requests-mock": {
+            "hashes": [
+                "sha256:7a5fa99db5e3a2a961b6f20ed40ee6baeff73503cf0a553cc4d679409e6170fb",
+                "sha256:8ca0628dc66d3f212878932fd741b02aa197ad53fd2228164800a169a4a826af"
+            ],
+            "index": "pypi",
+            "version": "==1.5.2"
+        },
         "six": {
             "hashes": [
                 "sha256:70e8a77beed4562e7f14fe23a786b54f6296e34344c23bc42f07b15018ff98e9",
diff --git a/docs/index.rst b/docs/index.rst
index 808e563..515e427 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -71,6 +71,26 @@ for applications that need to handle all rate limiting themselves (i.e. interact
 or applications wanting to use Mastodon.py in a multi-threaded context ("wait" and "pace" 
 modes are not thread safe).
 
+.. note::
+   Rate limit information is available on the `Mastodon` object for applications that
+   implement their own rate limit handling.
+
+   .. attribute:: Mastodon.ratelimit_remaining
+
+      Number of requests allowed until the next reset.
+
+   .. attribute:: Mastodon.ratelimit_reset
+
+      Time at which the rate limit will next be reset, as a POSIX timestamp.
+
+   .. attribute:: Mastodon.ratelimit_limit
+
+      Total number of requests allowed between resets. Typically 300.
+
+   .. attribute:: Mastodon.ratelimit_lastcall
+
+      Time at which these values have last been seen and updated, as a POSIX timestamp.
+
 In "wait" mode, once a request hits the rate limit, Mastodon.py will wait until
 the rate limit resets and then try again, until the request succeeds or an error
 is encountered. This mode is for applications that would rather just not worry about rate limits
@@ -91,9 +111,8 @@ minute time slot, and tighter limits on logins. Mastodon.py does not make any ef
 to respect these.
 
 If your application requires many hits to endpoints that are available without logging
-in, do consider using Mastodon.py without authenticating to get the full per-IP limit. In
-this case, you can set the Mastodon objects `ratelimit_limit` and `ratelimit_remaining`
-properties appropriately if you want to use advanced rate limit handling.
+in, do consider using Mastodon.py without authenticating to get the full per-IP limit.
+
 
 A note about pagination
 -----------------------
diff --git a/mastodon/Mastodon.py b/mastodon/Mastodon.py
index f78d303..dce2081 100644
--- a/mastodon/Mastodon.py
+++ b/mastodon/Mastodon.py
@@ -2222,9 +2222,12 @@ class Mastodon:
             if not response_object.ok:
                 try:
                     response = response_object.json(object_hook=self.__json_hooks)
-                    if not isinstance(response, dict) or 'error' not in response:
+                    if isinstance(response, dict) and 'error' in response:
+                        error_msg = response['error']
+                    elif isinstance(response, str):
+                        error_msg = response
+                    else:
                         error_msg = None
-                    error_msg = response['error']
                 except ValueError:
                     error_msg = None
 
@@ -2250,6 +2253,8 @@ class Mastodon:
                         # on any 404
                 elif response_object.status_code == 401:
                     ex_type = MastodonUnauthorizedError
+                elif response_object.status_code == 502:
+                    ex_type = MastodonServerError
                 else:
                     ex_type = MastodonAPIError
 
@@ -2280,13 +2285,17 @@ class Mastodon:
                     if url['rel'] == 'next':
                         # Be paranoid and extract max_id specifically
                         next_url = url['url']
-                        matchgroups = re.search(r"max_id=([0-9]*)", next_url)
+                        matchgroups = re.search(r"[?&]max_id=([^&]+)", next_url)
 
                         if matchgroups:
                             next_params = copy.deepcopy(params)
                             next_params['_pagination_method'] = method
                             next_params['_pagination_endpoint'] = endpoint
-                            next_params['max_id'] = int(matchgroups.group(1))
+                            max_id = matchgroups.group(1)
+                            if max_id.isdigit():
+                                next_params['max_id'] = int(max_id)
+                            else:
+                                next_params['max_id'] = max_id
                             if "since_id" in next_params:
                                 del next_params['since_id']
                             response[-1]._pagination_next = next_params
@@ -2294,13 +2303,17 @@ class Mastodon:
                     if url['rel'] == 'prev':
                         # Be paranoid and extract since_id specifically
                         prev_url = url['url']
-                        matchgroups = re.search(r"since_id=([0-9]*)", prev_url)
+                        matchgroups = re.search(r"[?&]since_id=([^&]+)", prev_url)
 
                         if matchgroups:
                             prev_params = copy.deepcopy(params)
                             prev_params['_pagination_method'] = method
                             prev_params['_pagination_endpoint'] = endpoint
-                            prev_params['since_id'] = int(matchgroups.group(1))
+                            since_id = matchgroups.group(1)
+                            if since_id.isdigit():
+                                prev_params['since_id'] = int(since_id)
+                            else:
+                                prev_params['since_id'] = since_id
                             if "max_id" in prev_params:
                                 del prev_params['max_id']
                             response[0]._pagination_prev = prev_params
@@ -2536,6 +2549,10 @@ class MastodonAPIError(MastodonError):
     """Raised when the mastodon API generates a response that cannot be handled"""
     pass
 
+class MastodonServerError(MastodonError):
+    """Raised if the Server is malconfigured, e.g. returns a 502 error code"""
+    pass
+
 class MastodonNotFoundError(MastodonAPIError):
     """Raised when the mastodon API returns a 404 Not Found error"""
     pass
diff --git a/setup.py b/setup.py
index 009063d..72e3c8b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup
 
-test_deps = ['pytest', 'pytest-runner', 'pytest-cov', 'vcrpy', 'pytest-vcr', 'pytest-mock']
+test_deps = ['pytest', 'pytest-runner', 'pytest-cov', 'vcrpy', 'pytest-vcr', 'pytest-mock', 'requests-mock']
 extras = {
       "test": test_deps
 }
diff --git a/tests/test_errors.py b/tests/test_errors.py
new file mode 100644
index 0000000..7329507
--- /dev/null
+++ b/tests/test_errors.py
@@ -0,0 +1,20 @@
+import pytest
+from mastodon.Mastodon import MastodonAPIError
+
+try:
+    from mock import MagicMock
+except ImportError:
+    from unittest.mock import MagicMock
+
+def test_nonstandard_errors(api):
+    response = MagicMock()
+    response.json = MagicMock(return_value=
+            "I am a non-standard instance and this error is a plain string.")
+    response.ok = False
+    session = MagicMock()
+    session.request = MagicMock(return_value=response)
+
+    api.session = session
+    with pytest.raises(MastodonAPIError):
+        api.instance()
+
diff --git a/tests/test_pagination.py b/tests/test_pagination.py
index 599b2f4..d2c0bd5 100644
--- a/tests/test_pagination.py
+++ b/tests/test_pagination.py
@@ -1,5 +1,10 @@
 import pytest
 from contextlib import contextmanager
+try:
+    from mock import MagicMock
+except ImportError:
+    from unittest.mock import MagicMock
+import requests_mock
 
 UNLIKELY_HASHTAG = "fgiztsshwiaqqiztpmmjbtvmescsculuvmgjgopwoeidbcrixp"
 
@@ -44,3 +49,18 @@ def test_fetch_remaining(api):
         hashtag_remaining = api.fetch_remaining(hashtag)
         assert hashtag_remaining
         assert len(hashtag_remaining) >= 30
+
+def test_link_headers(api):
+    rmock = requests_mock.Adapter()
+    api.session.mount(api.api_base_url, rmock)
+
+    _id='abc1234'
+
+    rmock.register_uri('GET', requests_mock.ANY, json=[{"foo": "bar"}], headers={"link":"""
+            <{base}/api/v1/timelines/tag/{tag}?max_id={_id}>; rel="next", <{base}/api/v1/timelines/tag/{tag}?since_id={_id}>; rel="prev"
+        """.format(base=api.api_base_url, tag=UNLIKELY_HASHTAG, _id=_id).strip()
+    })
+
+    resp = api.timeline_hashtag(UNLIKELY_HASHTAG)
+    assert resp[0]._pagination_next['max_id'] == _id
+    assert resp[0]._pagination_prev['since_id'] == _id