From 035562bd11dcebe764c7108ebb71cc2d22ad6d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Mon, 28 Jun 2021 16:25:24 +0200
Subject: [PATCH] [twitter] remove old-style URLs from image fallback lists

---
 gallery_dl/extractor/twitter.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py
index 5550f966..363da9a6 100644
--- a/gallery_dl/extractor/twitter.py
+++ b/gallery_dl/extractor/twitter.py
@@ -113,18 +113,16 @@ class TwitterExtractor(Extractor):
                     "url"      : base + "orig",
                     "width"    : width,
                     "height"   : height,
-                    "_fallback": self._image_fallback(base, url + ":"),
+                    "_fallback": self._image_fallback(base),
                 }))
             else:
                 files.append({"url": media["media_url"]})
 
     @staticmethod
-    def _image_fallback(new, old):
-        yield old + "orig"
-
-        for size in ("large", "medium", "small"):
-            yield new + size
-            yield old + size
+    def _image_fallback(base):
+        yield base + "large"
+        yield base + "medium"
+        yield base + "small"
 
     def _extract_card(self, tweet, files):
         card = tweet["card"]
@@ -526,18 +524,17 @@ class TwitterImageExtractor(Extractor):
         self.id, self.fmt = match.groups()
 
     def items(self):
-        base = "https://pbs.twimg.com/media/" + self.id
-        new = base + "?format=" + self.fmt + "&name="
-        old = base + "." + self.fmt + ":"
+        base = "https://pbs.twimg.com/media/{}?format={}&name=".format(
+            self.id, self.fmt)
 
         data = {
             "filename": self.id,
             "extension": self.fmt,
-            "_fallback": TwitterExtractor._image_fallback(new, old),
+            "_fallback": TwitterExtractor._image_fallback(base),
         }
 
         yield Message.Directory, data
-        yield Message.Url, new + "orig", data
+        yield Message.Url, base + "orig", data
 
 
 class TwitterAPI():