Update upstream source from tag 'upstream/1.31.2'

Update to upstream version '1.31.2'
with Debian dir 4ebe0ca706fc53eceb778881b680572ca5a0231c

1 files changed, 5 insertions, 5 deletions

diff --git a/gallery_dl/extractor/foolfuuka.py b/gallery_dl/extractor/foolfuuka.py
index 3c69489..88053b4 100644
--- a/gallery_dl/extractor/foolfuuka.py
+++ b/gallery_dl/extractor/foolfuuka.py
@@ -147,7 +147,7 @@ class FoolfuukaThreadExtractor(FoolfuukaExtractor):
     subcategory = "thread"
     directory_fmt = ("{category}", "{board[shortname]}",
                      "{thread_num} {title|comment[:50]}")
-    pattern = rf"{BASE_PATTERN}/([^/?#]+)/thread/(\d+)"
+    pattern = BASE_PATTERN + r"/([^/?#]+)/thread/(\d+)"
     example = "https://archived.moe/a/thread/12345/"
 
     def __init__(self, match):
@@ -174,7 +174,7 @@ class FoolfuukaThreadExtractor(FoolfuukaExtractor):
 class FoolfuukaBoardExtractor(FoolfuukaExtractor):
     """Base extractor for FoolFuuka based boards/archives"""
     subcategory = "board"
-    pattern = rf"{BASE_PATTERN}/([^/?#]+)(?:/(?:page/)?(\d*))?$"
+    pattern = BASE_PATTERN + r"/([^/?#]+)(?:/(?:page/)?(\d*))?$"
     example = "https://archived.moe/a/"
 
     def __init__(self, match):
@@ -210,7 +210,7 @@ class FoolfuukaSearchExtractor(FoolfuukaExtractor):
     """Base extractor for search results on FoolFuuka based boards/archives"""
     subcategory = "search"
     directory_fmt = ("{category}", "search", "{search}")
-    pattern = rf"{BASE_PATTERN}/([^/?#]+)/search((?:/[^/?#]+/[^/?#]+)+)"
+    pattern = BASE_PATTERN + r"/([^/?#]+)/search((?:/[^/?#]+/[^/?#]+)+)"
     example = "https://archived.moe/_/search/text/QUERY/"
     request_interval = (0.5, 1.5)
 
@@ -265,7 +265,7 @@ class FoolfuukaGalleryExtractor(FoolfuukaExtractor):
     """Base extractor for FoolFuuka galleries"""
     subcategory = "gallery"
     directory_fmt = ("{category}", "{board}", "gallery")
-    pattern = rf"{BASE_PATTERN}/([^/?#]+)/gallery(?:/(\d+))?"
+    pattern = BASE_PATTERN + r"/([^/?#]+)/gallery(?:/(\d+))?"
     example = "https://archived.moe/a/gallery"
 
     def metadata(self):
@@ -278,7 +278,7 @@ class FoolfuukaGalleryExtractor(FoolfuukaExtractor):
         base = f"{self.root}/_/api/chan/gallery/?board={self.board}&page="
 
         for pnum in pages:
-            posts = self.request_json(f"{base}{pnum}")
+            posts = self.request_json(base + str(pnum))
             if not posts:
                 return
             yield from posts