From d12dd3813c51cf141bd8b1afad5a98c37379e37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Sat, 6 May 2023 14:58:42 +0200
Subject: [PATCH] [imgur] fix internal image/album URLs

URLs from "link" attributes of newer images/albums were all returned
as 'https://imgur.com/gallery/...' instead of the expected format,
causing them to be ignored.
---
 gallery_dl/extractor/imgur.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/gallery_dl/extractor/imgur.py b/gallery_dl/extractor/imgur.py
index 8e227830..4c29d98f 100644
--- a/gallery_dl/extractor/imgur.py
+++ b/gallery_dl/extractor/imgur.py
@@ -47,8 +47,13 @@ class ImgurExtractor(Extractor):
         image_ex = ImgurImageExtractor
 
         for item in items:
-            item["_extractor"] = album_ex if item["is_album"] else image_ex
-            yield Message.Queue, item["link"], item
+            if item["is_album"]:
+                url = "https://imgur.com/a/" + item["id"]
+                item["_extractor"] = album_ex
+            else:
+                url = "https://imgur.com/" + item["id"]
+                item["_extractor"] = image_ex
+            yield Message.Queue, url, item
 
 
 class ImgurImageExtractor(ImgurExtractor):
@@ -272,7 +277,7 @@ class ImgurUserExtractor(ImgurExtractor):
         ("https://imgur.com/user/Miguenzo", {
             "range": "1-100",
             "count": 100,
-            "pattern": r"https?://(i.imgur.com|imgur.com/a)/[\w.]+",
+            "pattern": r"https://imgur\.com(/a)?/\w+$",
         }),
         ("https://imgur.com/user/Miguenzo/posts"),
         ("https://imgur.com/user/Miguenzo/submitted"),
@@ -289,7 +294,7 @@ class ImgurFavoriteExtractor(ImgurExtractor):
     test = ("https://imgur.com/user/Miguenzo/favorites", {
         "range": "1-100",
         "count": 100,
-        "pattern": r"https?://(i.imgur.com|imgur.com/a)/[\w.]+",
+        "pattern": r"https://imgur\.com(/a)?/\w+$",
     })
 
     def items(self):
@@ -302,9 +307,11 @@ class ImgurFavoriteFolderExtractor(ImgurExtractor):
     pattern = BASE_PATTERN + r"/user/([^/?#]+)/favorites/folder/(\d+)"
     test = (
         ("https://imgur.com/user/mikf1/favorites/folder/11896757/public", {
+            "pattern": r"https://imgur\.com(/a)?/\w+$",
             "count": 3,
         }),
         ("https://imgur.com/user/mikf1/favorites/folder/11896741/private", {
+            "pattern": r"https://imgur\.com(/a)?/\w+$",
             "count": 5,
         }),
     )
@@ -325,7 +332,7 @@ class ImgurSubredditExtractor(ImgurExtractor):
     test = ("https://imgur.com/r/pics", {
         "range": "1-100",
         "count": 100,
-        "pattern": r"https?://(i.imgur.com|imgur.com/a)/[\w.]+",
+        "pattern": r"https://imgur\.com(/a)?/\w+$",
     })
 
     def items(self):
@@ -339,7 +346,7 @@ class ImgurTagExtractor(ImgurExtractor):
     test = ("https://imgur.com/t/animals", {
         "range": "1-100",
         "count": 100,
-        "pattern": r"https?://(i.imgur.com|imgur.com/a)/[\w.]+",
+        "pattern": r"https://imgur\.com(/a)?/\w+$",
     })
 
     def items(self):
@@ -353,7 +360,7 @@ class ImgurSearchExtractor(ImgurExtractor):
     test = ("https://imgur.com/search?q=cute+cat", {
         "range": "1-100",
         "count": 100,
-        "pattern": r"https?://(i.imgur.com|imgur.com/a)/[\w.]+",
+        "pattern": r"https://imgur\.com(/a)?/\w+$",
     })
 
     def items(self):