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

[twitter] fix pattern for single tweet (#5371)

Browse Source 
- Add optional slash
- Update tests to include some non-standard tweet URLs
This commit is contained in:
fireattack
2024-03-25 11:45:04 +08:00
committed by Mike Fährmann
parent c3bafd6a2b
commit 423599ce95
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gallery_dl/extractor/twitter.py
View File

@@ -736,7 +736,7 @@ class TwitterEventExtractor(TwitterExtractor):
class TwitterTweetExtractor(TwitterExtractor): class TwitterTweetExtractor(TwitterExtractor):
"""Extractor for individual tweets""" """Extractor for individual tweets"""
subcategory = "tweet" 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" example = "https://twitter.com/USER/status/12345"
def __init__(self, match): def __init__(self, match):

4
test/results/twitter.py
View File

@@ -316,7 +316,7 @@ __tests__ = (
}, },
{ {
"#url" : "https://twitter.com/perrypumas/status/1065692031626829824", "#url" : "https://twitter.com/perrypumas/status/1065692031626829824?s=20",
"#comment" : "video", "#comment" : "video",
"#category": ("", "twitter", "tweet"), "#category": ("", "twitter", "tweet"),
"#class" : twitter.TwitterTweetExtractor, "#class" : twitter.TwitterTweetExtractor,
@@ -324,7 +324,7 @@ __tests__ = (
}, },
{ {
"#url" : "https://twitter.com/playpokemon/status/1263832915173048321", "#url" : "https://twitter.com/playpokemon/status/1263832915173048321/",
"#comment" : "content with emoji, newlines, hashtags (#338)", "#comment" : "content with emoji, newlines, hashtags (#338)",
"#category": ("", "twitter", "tweet"), "#category": ("", "twitter", "tweet"),
"#class" : twitter.TwitterTweetExtractor, "#class" : twitter.TwitterTweetExtractor,