summaryrefslogtreecommitdiffstats
path: root/gallery_dl/extractor/mastodon.py
diff options
context:
space:
mode:
authorLibravatarUnit 193 <unit193@unit193.net>2020-10-25 17:59:22 -0400
committerLibravatarUnit 193 <unit193@unit193.net>2020-10-25 17:59:22 -0400
commit5dc7d6f5902ddaee5223d041d5c10060f0c72430 (patch)
tree6ddd103a86ea7bbb0d695f5fdfa55e43f04756ca /gallery_dl/extractor/mastodon.py
parente0c914765184ebbf99cffdecfe8cdbe10f42486e (diff)
New upstream version 1.15.2.upstream/1.15.2
Diffstat (limited to 'gallery_dl/extractor/mastodon.py')
-rw-r--r--gallery_dl/extractor/mastodon.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/gallery_dl/extractor/mastodon.py b/gallery_dl/extractor/mastodon.py
index ac17cb0..0e063d5 100644
--- a/gallery_dl/extractor/mastodon.py
+++ b/gallery_dl/extractor/mastodon.py
@@ -184,7 +184,7 @@ def generate_extractors():
Extr.category = category
Extr.instance = instance
Extr.pattern = (r"(?:https?://)?" + pattern +
- r"/@([^/?&#]+)(?:/media)?/?$")
+ r"/@([^/?#]+)(?:/media)?/?$")
Extr.test = info.get("test-user")
Extr.root = root
Extr.access_token = token
@@ -197,7 +197,7 @@ def generate_extractors():
Extr.__doc__ = "Extractor for images from a status on " + instance
Extr.category = category
Extr.instance = instance
- Extr.pattern = r"(?:https?://)?" + pattern + r"/@[^/?&#]+/(\d+)"
+ Extr.pattern = r"(?:https?://)?" + pattern + r"/@[^/?#]+/(\d+)"
Extr.test = info.get("test-status")
Extr.root = root
Extr.access_token = token