merge #5372: [twitter] match Tweet URLs with query parameters (#5371)

fixes regression introduced in 40c0553
mikf · Mar 25, 2024 · d1d017a · d1d017a
2 parents 15a4bc2 + 423599c
commit d1d017a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py
@@ -736,7 +736,7 @@ 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+)/?(?:$|[?#])"
     example = "https://twitter.com/USER/status/12345"
 
     def __init__(self, match):

diff --git a/test/results/twitter.py b/test/results/twitter.py
@@ -316,15 +316,15 @@
 },
 
 {
-    "#url"     : "https://twitter.com/perrypumas/status/1065692031626829824",
+    "#url"     : "https://twitter.com/perrypumas/status/1065692031626829824?s=20",
     "#comment" : "video",
     "#category": ("", "twitter", "tweet"),
     "#class"   : twitter.TwitterTweetExtractor,
     "#pattern" : r"https://video.twimg.com/ext_tw_video/.+\.mp4\?tag=5",
 },
 
 {
-    "#url"     : "https://twitter.com/playpokemon/status/1263832915173048321",
+    "#url"     : "https://twitter.com/playpokemon/status/1263832915173048321/",
     "#comment" : "content with emoji, newlines, hashtags (#338)",
     "#category": ("", "twitter", "tweet"),
     "#class"   : twitter.TwitterTweetExtractor,