From fe6ce5495a8b33836d7b047c02527f8c13e1873c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Wed, 13 Oct 2021 19:33:00 +0200
Subject: [PATCH] [kemonoparty] add 'discord' extractor (#1827, #1940)

---
 docs/supportedsites.md              |  2 +-
 gallery_dl/extractor/kemonoparty.py | 57 ++++++++++++++++++++++++++++-
 scripts/supportedsites.py           |  3 ++
 3 files changed, 59 insertions(+), 3 deletions(-)

diff --git a/docs/supportedsites.md b/docs/supportedsites.md
index efb849d3..27ffade3 100644
--- a/docs/supportedsites.md
+++ b/docs/supportedsites.md
@@ -394,7 +394,7 @@ Consider all sites to be NSFW unless otherwise known.
 <tr>
     <td>Kemonoparty</td>
     <td>https://kemono.party/</td>
-    <td>Favorites, Posts, User Profiles</td>
+    <td>Discord Servers, Favorites, Posts, User Profiles</td>
     <td>Supported</td>
 </tr>
 <tr>
diff --git a/gallery_dl/extractor/kemonoparty.py b/gallery_dl/extractor/kemonoparty.py
index c5f5ae7d..1348a74e 100644
--- a/gallery_dl/extractor/kemonoparty.py
+++ b/gallery_dl/extractor/kemonoparty.py
@@ -141,8 +141,8 @@ class KemonopartyPostExtractor(KemonopartyExtractor):
     pattern = BASE_PATTERN + r"/post/([^/?#]+)"
     test = (
         ("https://kemono.party/fanbox/user/6993449/post/506575", {
-            "pattern": r"https://kemono\.party/data/files/fanbox"
-                       r"/6993449/506575/P058kDFYus7DbqAkGlfWTlOr\.jpeg",
+            "pattern": r"https://kemono.party/data/21/0f"
+                       r"/210f35388e28bbcf756db18dd516e2d82ce75[0-9a-f]+\.jpg",
             "keyword": {
                 "added": "Wed, 06 May 2020 20:28:02 GMT",
                 "content": str,
@@ -197,6 +197,59 @@ class KemonopartyPostExtractor(KemonopartyExtractor):
         return (posts[0],) if len(posts) > 1 else posts
 
 
+class KemonopartyDiscordExtractor(KemonopartyExtractor):
+    """Extractor for kemono.party discord servers"""
+    subcategory = "discord"
+    directory_fmt = ("{category}", "discord", "{server}", "{channel}")
+    filename_fmt = "{id}_{num:>02}_{filename}.{extension}"
+    archive_fmt = "discord_{server}_{id}_{num}"
+    pattern = r"(?:https?://)?kemono\.party/discord/server/(\d+)"
+    test = ("https://kemono.party/discord/server/256559665620451329", {
+        "pattern": r"https://kemono\.party/data/attachments/discord"
+                   r"/256559665620451329/\d+/\d+/.+",
+        "count": ">= 2",
+    })
+
+    def __init__(self, match):
+        KemonopartyExtractor.__init__(self, match)
+        self.server = match.group(1)
+
+    def items(self):
+        self._prepare_ddosguard_cookies()
+
+        for post in self.posts():
+            post["date"] = text.parse_datetime(
+                post["published"], "%a, %d %b %Y %H:%M:%S %Z")
+            yield Message.Directory, post
+
+            for post["num"], file in enumerate(post["attachments"], 1):
+                post["type"] = "attachment"
+                url = file["path"]
+                if url[0] == "/":
+                    url = self.root + "/data" + url
+                elif url.startswith("https://kemono.party"):
+                    url = self.root + "/data" + url[20:]
+
+                text.nameext_from_url(file["name"], post)
+                yield Message.Url, url, post
+
+    def posts(self):
+        url = "{}/api/discord/channels/lookup?q={}".format(
+            self.root, self.server)
+
+        for channel in self.request(url).json():
+            url = "{}/api/discord/channel/{}".format(self.root, channel["id"])
+            params = {"skip": 0}
+
+            while True:
+                posts = self.request(url, params=params).json()
+                yield from posts
+
+                if len(posts) < 25:
+                    return
+                params["skip"] += 25
+
+
 class KemonopartyFavoriteExtractor(KemonopartyExtractor):
     """Extractor for kemono.party favorites"""
     subcategory = "favorite"
diff --git a/scripts/supportedsites.py b/scripts/supportedsites.py
index a7da9e77..367f8860 100755
--- a/scripts/supportedsites.py
+++ b/scripts/supportedsites.py
@@ -149,6 +149,9 @@ SUBCATEGORY_MAP = {
         "saved": "Saved Posts",
         "tagged": "Tagged Posts",
     },
+    "kemonoparty": {
+        "discord": "Discord Servers",
+    },
     "mangadex": {
         "feed" : "Followed Feed",
     },