From a537ab1a094cf782915b654250a6110061b4377a Mon Sep 17 00:00:00 2001
From: Unknown <blackjack4494@web.de>
Date: Sun, 18 Oct 2020 02:14:13 +0200
Subject: [PATCH] [twitter/t.co] update supportedsites, failover replace,
 tco:id feature

---
 docs/supportedsites.md           |  2 ++
 youtube_dlc/extractor/twitter.py | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index 10c12b87a..c46d122ff 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -540,6 +540,7 @@
  - **natgeo:video**
  - **NationalGeographicTV**
  - **Naver**
+ - **Naver:live**
  - **NBA**
  - **NBC**
  - **NBCNews**
@@ -976,6 +977,7 @@
  - **twitter:amplify**
  - **twitter:broadcast**
  - **twitter:card**
+ - **twitter:shortener**
  - **udemy**
  - **udemy:course**
  - **UDNEmbed**: 聯合影音
diff --git a/youtube_dlc/extractor/twitter.py b/youtube_dlc/extractor/twitter.py
index 95cfa8154..ca5e040c6 100644
--- a/youtube_dlc/extractor/twitter.py
+++ b/youtube_dlc/extractor/twitter.py
@@ -612,8 +612,17 @@ class TwitterBroadcastIE(TwitterBaseIE, PeriscopeBaseIE):
 
 class TwitterShortenerIE(TwitterBaseIE):
     IE_NAME = 'twitter:shortener'
-    _VALID_URL = r'https?://t.co/'
+    _VALID_URL = r'https?://t.co/(?P<id>[^?]+)|tco:(?P<eid>[^?]+)'
+    _BASE_URL = 'https://t.co/'
 
     def _real_extract(self, url):
-        new_url = self._request_webpage(url, None, headers={'User-Agent': 'curl'}).geturl()
+        mobj = re.match(self._VALID_URL, url)
+        eid, id = mobj.group('eid', 'id')
+        if eid:
+            id = eid
+            url = self._BASE_URL + id
+        new_url = self._request_webpage(url, id, headers={'User-Agent': 'curl'}).geturl()
+        __UNSAFE_LINK = "https://twitter.com/safety/unsafe_link_warning?unsafe_link="
+        if new_url.startswith(__UNSAFE_LINK):
+            new_url = new_url.replace(__UNSAFE_LINK, "")
         return self.url_result(new_url)