Update upstream source from tag 'upstream/1.30.10'

Update to upstream version '1.30.10'
with Debian dir e2322700edd83cfacc538c82b4928de8a169ad1a

1 files changed, 23 insertions, 12 deletions

diff --git a/gallery_dl/extractor/fansly.py b/gallery_dl/extractor/fansly.py
index 8a6dbef..7138599 100644
--- a/gallery_dl/extractor/fansly.py
+++ b/gallery_dl/extractor/fansly.py
@@ -9,7 +9,7 @@
 """Extractors for https://fansly.com/"""
 
 from .common import Extractor, Message
-from .. import text, util
+from .. import text, util, exception
 import time
 
 BASE_PATTERN = r"(?:https?://)?(?:www\.)?fansly\.com"
@@ -43,6 +43,23 @@ class FanslyExtractor(Extractor):
                 url = file["url"]
                 yield Message.Url, url, text.nameext_from_url(url, post)
 
+    def posts(self):
+        creator, wall_id = self.groups
+        account = self.api.account(creator)
+        walls = account["walls"]
+
+        if wall_id:
+            for wall in walls:
+                if wall["id"] == wall_id:
+                    break
+            else:
+                raise exception.NotFoundError("wall")
+            walls = (wall,)
+
+        for wall in walls:
+            self.kwdict["wall"] = wall
+            yield from self.posts_wall(account, wall)
+
     def _extract_files(self, post):
         files = []
 
@@ -77,7 +94,7 @@ class FanslyExtractor(Extractor):
             variants.append(media)
 
         formats = [
-            (type > 256, variant["width"], type, variant)
+            (variant["width"], (type-500 if type > 256 else type), variant)
             for variant in variants
             if variant.get("locations") and
             (type := variant["type"]) in self.formats
@@ -190,11 +207,8 @@ class FanslyCreatorPostsExtractor(FanslyExtractor):
     pattern = rf"{BASE_PATTERN}/([^/?#]+)/posts(?:/wall/(\d+))?"
     example = "https://fansly.com/CREATOR/posts"
 
-    def posts(self):
-        creator, wall_id = self.groups
-        account = self.api.account(creator)
-        return self.api.timeline_new(
-            account["id"], wall_id or account["walls"][0]["id"])
+    def posts_wall(self, account, wall):
+        return self.api.timeline_new(account["id"], wall["id"])
 
 
 class FanslyCreatorMediaExtractor(FanslyExtractor):
@@ -202,11 +216,8 @@ class FanslyCreatorMediaExtractor(FanslyExtractor):
     pattern = rf"{BASE_PATTERN}/([^/?#]+)/media(?:/wall/(\d+))?"
     example = "https://fansly.com/CREATOR/media"
 
-    def posts(self):
-        creator, wall_id = self.groups
-        account = self.api.account(creator)
-        return self.api.mediaoffers_location(
-            account["id"], wall_id or account["walls"][0]["id"])
+    def posts_wall(self, account, wall):
+        return self.api.mediaoffers_location(account["id"], wall["id"])
 
 
 class FanslyAPI():