summaryrefslogtreecommitdiffstats
path: root/gallery_dl/extractor/mastodon.py
diff options
context:
space:
mode:
Diffstat (limited to 'gallery_dl/extractor/mastodon.py')
-rw-r--r--gallery_dl/extractor/mastodon.py16
1 files changed, 10 insertions, 6 deletions
diff --git a/gallery_dl/extractor/mastodon.py b/gallery_dl/extractor/mastodon.py
index 6e780e8..493a8ef 100644
--- a/gallery_dl/extractor/mastodon.py
+++ b/gallery_dl/extractor/mastodon.py
@@ -179,12 +179,11 @@ class MastodonAPI():
try:
access_token = INSTANCES[extractor.category]["access-token"]
except (KeyError, TypeError):
- raise exception.StopExtraction(
- "Missing access token.\n"
- "Run 'gallery-dl oauth:mastodon:%s' to obtain one.",
- extractor.instance)
-
- self.headers = {"Authorization": "Bearer " + access_token}
+ pass
+ if access_token:
+ self.headers = {"Authorization": "Bearer " + access_token}
+ else:
+ self.headers = None
def account_id_by_username(self, username):
if username.startswith("id:"):
@@ -232,6 +231,11 @@ class MastodonAPI():
if code < 400:
return response
+ if code == 401:
+ raise exception.StopExtraction(
+ "Invalid or missing access token.\n"
+ "Run 'gallery-dl oauth:mastodon:%s' to obtain one.",
+ self.extractor.instance)
if code == 404:
raise exception.NotFoundError()
if code == 429: