github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge #7496: [mastodon] support Akkoma/Pleroma '/notice/:id' URLs

Browse Source
This commit is contained in:
Mike Fährmann
2025-05-10 17:50:34 +02:00
parent e233360015 1f7c29aee9
commit 18eac5ca70
2 changed files with 47 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gallery_dl/extractor/mastodon.py
View File

@@ -196,8 +196,8 @@ 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))/(?!following)([^/?#]+)")
example = "https://mastodon.social/@USER/12345"
def statuses(self):

45
test/results/mastodon.py
View File

@@ -10,6 +10,7 @@ from gallery_dl.extractor import mastodon
__tests__ = (
{
"#url" : "mastodon:https://donotsta.re/@elly/AcoUaA7EH1igiYKmFU",
"#comment" : "Akkoma - /:user/:status_id",
"#category": ("mastodon", "donotsta.re", "status"),
"#class" : mastodon.MastodonStatusExtractor,
"#urls" : "https://asdf.donotsta.re/media/917e7722dd30d510686ce9f3717a1f722dac96fd974b5af5ec2ccbc8cbd740c6.png",
@@ -29,4 +30,48 @@ __tests__ = (
"instance_remote": None,
},
{
"#url" : "mastodon:https://woem.space/notice/Aswds12sVGsm55NS2S",
"#comment" : "Akkoma - /notice/:status_id",
"#category": ("mastodon", "woem.space", "status"),
"#class" : mastodon.MastodonStatusExtractor,
"#urls" : "https://nbg1.your-objectstorage.com/woem-space/261f4f482e1cb641db732dab91f0177b1f5ea0bcf008f4831c593ff718dff4fe.jpg",
"instance" : "woem.space",
"instance_remote": None,
},
{
"#url" : "mastodon:https://labyrinth.zone/notice/Ai9Y2EijwN3gAil1nM",
"#comment" : "Akkoma - /notice/:status_id",
"#category": ("mastodon", "labyrinth.zone", "status"),
"#class" : mastodon.MastodonStatusExtractor,
"#urls" : "https://media.labyrinth.zone/media/96e10a9e3b0f24f63713d8a03e939eec7f9e636cdef57a14c389163f58e60947.png",
"instance" : "labyrinth.zone",
"instance_remote": None,
},
{
"#url" : "mastodon:https://udongein.xyz/notice/Asl9hUpShUamlVAZiC",
"#comment" : "Pleroma - /notice/:status_id",
"#category": ("mastodon", "udongein.xyz", "status"),
"#class" : mastodon.MastodonStatusExtractor,
"#urls" : "https://statics.udongein.xyz/udongein/cc3c7a8b749cd88298fda6553e10f81f9c4de280f03ad107ed25a439e6be23eb.jpg?name=Husky_1743801357069_6QIL5OZLXK.jpg",
"instance" : "udongein.xyz",
"instance_remote": None,
},
{
"#url" : "mastodon:https://freeradical.zone/@bitartbot/114477182939377350",
"#comment" : "Mastodon - /:user/:status_id",
"#category": ("mastodon", "freeradical.zone", "status"),
"#class" : mastodon.MastodonStatusExtractor,
"#urls" : "https://nfts.freeradical.zone/media_attachments/files/114/477/182/897/690/030/original/96700c8ae9a79651.png",
"instance" : "freeradical.zone",
"instance_remote": None,
},
)