From 50e2ebaff051fab31fd78e9b9842a5f9cc3b9510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Fri, 22 Sep 2023 20:58:38 +0200
Subject: [PATCH] [danbooru] support 'donmai.moe' URLs

---
 gallery_dl/extractor/danbooru.py | 5 +++--
 test/results/danbooru.py         | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/gallery_dl/extractor/danbooru.py b/gallery_dl/extractor/danbooru.py
index f69b0e25..56d81e5b 100644
--- a/gallery_dl/extractor/danbooru.py
+++ b/gallery_dl/extractor/danbooru.py
@@ -150,7 +150,8 @@ class DanbooruExtractor(BaseExtractor):
 BASE_PATTERN = DanbooruExtractor.update({
     "danbooru": {
         "root": None,
-        "pattern": r"(?:danbooru|hijiribe|sonohara|safebooru)\.donmai\.us",
+        "pattern": r"(?:(?:danbooru|hijiribe|sonohara|safebooru)\.donmai\.us"
+                   r"|donmai\.moe)",
     },
     "atfbooru": {
         "root": "https://booru.allthefallen.moe",
@@ -158,7 +159,7 @@ BASE_PATTERN = DanbooruExtractor.update({
     },
     "aibooru": {
         "root": None,
-        "pattern": r"(?:safe.)?aibooru\.online",
+        "pattern": r"(?:safe\.)?aibooru\.online",
     },
     "booruvar": {
         "root": "https://booru.borvar.art",
diff --git a/test/results/danbooru.py b/test/results/danbooru.py
index c64c693e..1bebf1ca 100644
--- a/test/results/danbooru.py
+++ b/test/results/danbooru.py
@@ -50,6 +50,12 @@ __tests__ = (
     "#class"   : danbooru.DanbooruTagExtractor,
 },
 
+{
+    "#url"     : "https://donmai.moe/posts?tags=bonocho",
+    "#category": ("Danbooru", "danbooru", "tag"),
+    "#class"   : danbooru.DanbooruTagExtractor,
+},
+
 {
     "#url"     : "https://danbooru.donmai.us/pools/7659",
     "#category": ("Danbooru", "danbooru", "pool"),