From 647a87d17c4018d13c2e3d8db405392aed340f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= Date: Sat, 6 Apr 2024 17:56:21 +0200 Subject: [PATCH] [twitter] match '/photo/' Tweet URLs (#5443) fixes regression introduced in 40c05535 --- gallery_dl/extractor/twitter.py | 3 ++- test/results/twitter.py | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py index 4a8177148c..9f3e39180b 100644 --- a/gallery_dl/extractor/twitter.py +++ b/gallery_dl/extractor/twitter.py @@ -741,7 +741,8 @@ def tweets(self): class TwitterTweetExtractor(TwitterExtractor): """Extractor for individual tweets""" subcategory = "tweet" - pattern = BASE_PATTERN + r"/([^/?#]+|i/web)/status/(\d+)/?(?:$|[?#])" + pattern = (BASE_PATTERN + r"/([^/?#]+|i/web)/status/(\d+)" + r"/?(?:$|\?|#|photo/)") example = "https://twitter.com/USER/status/12345" def __init__(self, match): diff --git a/test/results/twitter.py b/test/results/twitter.py index 4ceb63b9de..ac119a3343 100644 --- a/test/results/twitter.py +++ b/test/results/twitter.py @@ -526,6 +526,13 @@ "#count" : 5, }, +{ + "#url" : "https://twitter.com/supernaturepics/status/604341487988576256/photo/1", + "#comment" : "/photo/ URL (#5443)", + "#category": ("", "twitter", "tweet"), + "#class" : twitter.TwitterTweetExtractor, +}, + { "#url" : "https://twitter.com/morino_ya/status/1392763691599237121", "#comment" : "retweet with missing media entities (#1555)",