From 32d7195d08424e37d060ddd4055a0d2433ee42c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Sat, 18 Jan 2020 21:06:44 +0100
Subject: [PATCH] [pinterest] improve detection of invalid pin.it links

---
 gallery_dl/extractor/imgur.py     | 2 +-
 gallery_dl/extractor/pinterest.py | 9 +++------
 gallery_dl/extractor/xhamster.py  | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/gallery_dl/extractor/imgur.py b/gallery_dl/extractor/imgur.py
index 6ff6588b..5084e802 100644
--- a/gallery_dl/extractor/imgur.py
+++ b/gallery_dl/extractor/imgur.py
@@ -153,7 +153,7 @@ class ImgurAlbumExtractor(ImgurExtractor):
                     "is_album"    : True,
                     "layout"      : "blog",
                     "link"        : "https://imgur.com/a/TcBmP",
-                    "nsfw"        : True,
+                    "nsfw"        : bool,
                     "privacy"     : "hidden",
                     "section"     : None,
                     "title"       : "138",
diff --git a/gallery_dl/extractor/pinterest.py b/gallery_dl/extractor/pinterest.py
index b72a8968..24a0a557 100644
--- a/gallery_dl/extractor/pinterest.py
+++ b/gallery_dl/extractor/pinterest.py
@@ -60,9 +60,8 @@ class PinterestPinExtractor(PinterestExtractor):
     test = (
         ("https://www.pinterest.com/pin/858146903966145189/", {
             "url": "afb3c26719e3a530bb0e871c480882a801a4e8a5",
-            # image version depends on CDN server used
-            #  "content": "d3e24bc9f7af585e8c23b9136956bd45a4d9b947",
-            #  "content": "4c435a66f6bb82bb681db2ecc888f76cf6c5f9ca",
+            "content": ("4c435a66f6bb82bb681db2ecc888f76cf6c5f9ca",
+                        "d3e24bc9f7af585e8c23b9136956bd45a4d9b947"),
         }),
         ("https://www.pinterest.com/pin/858146903966145188/", {
             "exception": exception.NotFoundError,
@@ -171,9 +170,7 @@ class PinterestPinitExtractor(PinterestExtractor):
             self.shortened_id)
         response = self.request(url, method="HEAD", allow_redirects=False)
         location = response.headers.get("Location")
-        if not location or location in ("https://api.pinterest.com/None",
-                                        "https://pin.it/None",
-                                        "https://www.pinterest.com"):
+        if not location or not PinterestPinExtractor.pattern.match(location):
             raise exception.NotFoundError("pin")
         yield Message.Queue, location, {"_extractor": PinterestPinExtractor}
 
diff --git a/gallery_dl/extractor/xhamster.py b/gallery_dl/extractor/xhamster.py
index e1251846..62acb288 100644
--- a/gallery_dl/extractor/xhamster.py
+++ b/gallery_dl/extractor/xhamster.py
@@ -152,7 +152,7 @@ class XhamsterUserExtractor(XhamsterExtractor):
     subcategory = "user"
     pattern = BASE_PATTERN + r"/users/([^/?&#]+)(?:/photos)?/?(?:$|[?#])"
     test = (
-        ("https://xhamster.com/users/nickname68/photos", {
+        ("https://xhamster.com/users/goldenpalomino/photos", {
             "pattern": XhamsterGalleryExtractor.pattern,
             "count": 50,
             "range": "1-50",