From 9cce4616271715093f1a885ebfb64be6dabd2abf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Tue, 26 Mar 2024 15:20:14 +0100
Subject: [PATCH] [kemonoparty] add 'announcements' option (#5262)

https://github.com/mikf/gallery-dl/issues/5262#issuecomment-2015919188
---
 docs/configuration.rst              | 10 ++++++++++
 gallery_dl/extractor/kemonoparty.py | 30 +++++++++++++++++------------
 test/results/kemonoparty.py         | 13 +++++++++++++
 3 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 51408d3c90..3052385f71 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -2317,6 +2317,16 @@ Description
     Extract a user's direct messages as ``dms`` metadata.
 
 
+extractor.kemonoparty.announcements
+-----------------------------------
+Type
+    ``bool``
+Default
+    ``false``
+Description
+    Extract a user's announcements as ``announcements`` metadata.
+
+
 extractor.kemonoparty.favorites
 -------------------------------
 Type
diff --git a/gallery_dl/extractor/kemonoparty.py b/gallery_dl/extractor/kemonoparty.py
index f7f5ea9d11..bb0b03af93 100644
--- a/gallery_dl/extractor/kemonoparty.py
+++ b/gallery_dl/extractor/kemonoparty.py
@@ -57,7 +57,7 @@ def items(self):
         generators = self._build_file_generators(self.config("files"))
         duplicates = self.config("duplicates")
         comments = self.config("comments")
-        username = dms = None
+        username = dms = announcements = None
 
         # prevent files from being sent with gzip compression
         headers = {"Accept-Encoding": "identity"}
@@ -68,6 +68,8 @@ def items(self):
                 '<meta name="artist_name" content="', '"')[0])
         if self.config("dms"):
             dms = True
+        if self.config("announcements"):
+            announcements = True
 
         posts = self.posts()
         max_posts = self.config("max-posts")
@@ -88,8 +90,12 @@ def items(self):
                 post["comments"] = self._extract_comments(post)
             if dms is not None:
                 if dms is True:
-                    dms = self._extract_dms(post)
+                    dms = self._extract_cards(post, "dms")
                 post["dms"] = dms
+            if announcements is not None:
+                if announcements is True:
+                    announcements = self._extract_cards(post, "announcements")
+                post["announcements"] = announcements
 
             files = []
             hashes = set()
@@ -200,21 +206,21 @@ def _extract_comments(self, post):
             })
         return comments
 
-    def _extract_dms(self, post):
-        url = "{}/{}/user/{}/dms".format(
-            self.root, post["service"], post["user"])
+    def _extract_cards(self, post, type):
+        url = "{}/{}/user/{}/{}".format(
+            self.root, post["service"], post["user"], type)
         page = self.request(url).text
 
-        dms = []
-        for dm in text.extract_iter(page, "<article", "</article>"):
-            footer = text.extr(dm, "<footer", "</footer>")
-            dms.append({
+        cards = []
+        for card in text.extract_iter(page, "<article", "</article>"):
+            footer = text.extr(card, "<footer", "</footer>")
+            cards.append({
                 "body": text.unescape(text.extr(
-                    dm, "<pre>", "</pre></",
+                    card, "<pre>", "</pre></",
                 ).strip()),
-                "date": text.extr(footer, 'Published: ', '\n'),
+                "date": text.extr(footer, ': ', '\n'),
             })
-        return dms
+        return cards
 
     def _parse_datetime(self, date_string):
         if len(date_string) > 19:
diff --git a/test/results/kemonoparty.py b/test/results/kemonoparty.py
index 7b8d1301c8..4c37008979 100644
--- a/test/results/kemonoparty.py
+++ b/test/results/kemonoparty.py
@@ -135,6 +135,19 @@
     }],
 },
 
+{
+    "#url"     : "https://kemono.su/patreon/user/3161935/post/68231671",
+    "#comment" : "announcements",
+    "#category": ("", "kemonoparty", "patreon"),
+    "#class"   : kemonoparty.KemonopartyPostExtractor,
+    "#options" : {"announcements": True},
+
+    "announcements": [{
+        "body": "<div><strong>Thank you so much for the support!</strong><strong><br></strong>This Patreon is more of a tip jar for supporting what I make. I have to clarify that there are <strong>no exclusive Patreon animations</strong> because all are released for the public. You will get earlier access to WIPs. Direct downloads to my works are also available for $5 and $10 Tiers.</div>",
+        "date": "2023-02",
+    }],
+},
+
 {
     "#url"     : "https://kemono.su/patreon/user/19623797/post/29035449",
     "#comment" : "invalid file (#3510)",