From c906e0c96107dac7ac0fd393cb7e775566bfb76d Mon Sep 17 00:00:00 2001
From: nao20010128nao <nao20010128@gmail.com>
Date: Wed, 10 Jul 2019 04:49:05 +0000
Subject: [PATCH] [twitter] Fix user_id extraction instead of regex
---
youtube_dl/extractor/twitter.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/youtube_dl/extractor/twitter.py b/youtube_dl/extractor/twitter.py
index 19b9232a5..2681b8ff4 100644
--- a/youtube_dl/extractor/twitter.py
+++ b/youtube_dl/extractor/twitter.py
@@ -280,7 +280,7 @@ class TwitterCardIE(TwitterBaseIE):
class TwitterIE(InfoExtractor):
IE_NAME = 'twitter'
- _VALID_URL = r'https?://(?:www\.|m\.|mobile\.)?twitter\.com/(?:i/web|-|(?P<user_id>[^/]+))/status/(?P<id>\d+)'
+ _VALID_URL = r'https?://(?:www\.|m\.|mobile\.)?twitter\.com/(?:i/web|(?P<user_id>[^/]+))/status/(?P<id>\d+)'
_TEMPLATE_URL = 'https://twitter.com/%s/status/%s'
_TEMPLATE_STATUSES_URL = 'https://twitter.com/statuses/%s'
@@ -444,7 +444,7 @@ class TwitterIE(InfoExtractor):
if 'twitter.com/account/suspended' in urlh.geturl():
raise ExtractorError('Account suspended by Twitter.', expected=True)
- if user_id is None:
+ if user_id is None or user_id == '-':
mobj = re.match(self._VALID_URL, urlh.geturl())
user_id = mobj.group('user_id')