diff options
| author |   Unit 193 <unit193@unit193.net> | 2025-05-26 06:46:00 -0400 |
|---|---|---|
| committer | Unit 193 <unit193@unit193.net> | 2025-05-26 06:46:00 -0400 |
| commit | 6424318a059207759b9055cf8a8df91c0ddac7c8 (patch) | |
| tree | 3fb8adec807ad1ffeba4889a506b05e680ca8051 /gallery_dl/extractor/mastodon.py | |
| parent | 2bef55427baa34bf0f78d52590bbf27b2c5f3a56 (diff) | |
| parent | 7672a750cb74bf31e21d76aad2776367fd476155 (diff) | |
Update upstream source from tag 'upstream/1.29.7'
Update to upstream version '1.29.7'
with Debian dir 264267cd1ebd5c7205fe1f137a394d0ae1a2fb3b
Diffstat (limited to 'gallery_dl/extractor/mastodon.py')
| -rw-r--r-- | gallery_dl/extractor/mastodon.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gallery_dl/extractor/mastodon.py b/gallery_dl/extractor/mastodon.py index 5e78ad4..8b38474 100644 --- a/gallery_dl/extractor/mastodon.py +++ b/gallery_dl/extractor/mastodon.py @@ -196,11 +196,15 @@ class MastodonFollowingExtractor(MastodonExtractor): class MastodonStatusExtractor(MastodonExtractor): """Extractor for images from a status""" subcategory = "status" - pattern = (BASE_PATTERN + r"/(?:@[^/?#]+|(?:users/[^/?#]+/)?statuses)" - r"/(?!following)([^/?#]+)") + pattern = (BASE_PATTERN + r"/(?:@[^/?#]+|(?:users/[^/?#]+/)?" + r"(?:statuses|notice|objects()))/(?!following)([^/?#]+)") example = "https://mastodon.social/@USER/12345" def statuses(self): + if self.groups[-2] is not None: + url = "{}/objects/{}".format(self.root, self.item) + location = self.request_location(url) + self.item = location.rpartition("/")[2] return (MastodonAPI(self).status(self.item),) |