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.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/gallery_dl/extractor/mastodon.py b/gallery_dl/extractor/mastodon.py
index 3c2b03e..c5fe840 100644
--- a/gallery_dl/extractor/mastodon.py
+++ b/gallery_dl/extractor/mastodon.py
@@ -45,6 +45,9 @@ class MastodonExtractor(BaseExtractor):
attachments = status["media_attachments"]
del status["media_attachments"]
+ if status["reblog"]:
+ attachments.extend(status["reblog"]["media_attachments"])
+
status["instance"] = self.instance
acct = status["account"]["acct"]
status["instance_remote"] = \
@@ -113,7 +116,10 @@ class MastodonUserExtractor(MastodonExtractor):
return api.account_statuses(
api.account_id_by_username(self.item),
- only_media=not self.config("text-posts", False),
+ only_media=(
+ not self.reblogs and
+ not self.config("text-posts", False)
+ ),
exclude_replies=not self.replies,
)