From aeb0d32333660640253a8ddc2c58d2c643396508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Mon, 21 Sep 2020 22:21:16 +0200
Subject: [PATCH] [twitter] improve twitpic extraction (fixes #1019)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- ignore twitpic.com/photos/… URLs
- ignore empty image URLs
---
 CHANGELOG.md                    |  2 ++
 gallery_dl/extractor/twitter.py | 11 ++++++-----
 gallery_dl/version.py           |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b368535f..0fd227f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## Unreleased
+
 ## 1.15.0 - 2020-09-20
 ### Additions
 - [deviantart] support watchers-only/paid deviations ([#995](https://github.com/mikf/gallery-dl/issues/995))
diff --git a/gallery_dl/extractor/twitter.py b/gallery_dl/extractor/twitter.py
index 236a001f..1e61f84e 100644
--- a/gallery_dl/extractor/twitter.py
+++ b/gallery_dl/extractor/twitter.py
@@ -110,16 +110,17 @@ class TwitterExtractor(Extractor):
         twitpics = []
         for url in tweet["entities"].get("urls", ()):
             url = url["expanded_url"]
-            if "//twitpic.com/" in url:
+            if "//twitpic.com/" in url and "/photos/" not in url:
                 response = self.request(url, fatal=False)
                 if response.status_code >= 400:
                     continue
                 url = text.extract(
                     response.text, 'name="twitter:image" value="', '"')[0]
-                twitpics.append({
-                    "original_info": {},
-                    "media_url"    : url,
-                })
+                if url:
+                    twitpics.append({
+                        "original_info": {},
+                        "media_url"    : url,
+                    })
         if twitpics:
             if "extended_entities" in tweet:
                 tweet["extended_entities"]["media"].extend(twitpics)
diff --git a/gallery_dl/version.py b/gallery_dl/version.py
index d7e27374..a8523f8d 100644
--- a/gallery_dl/version.py
+++ b/gallery_dl/version.py
@@ -6,4 +6,4 @@
 # it under the terms of the GNU General Public License version 2 as
 # published by the Free Software Foundation.
 
-__version__ = "1.15.0"
+__version__ = "1.15.1-dev"