Fix #1352 #1361 (#1363)

* Update PixivBrowserFactory.py

* Update PixivModelFanbox.py

* Update PixivBrowserFactory.py

PixivBrowserFactory.py

@@ -348,7 +348,7 @@ def loginUsingCookie(self, login_cookie=None):
             PixivHelper.print_and_log('info', 'Trying to log in with saved cookie')
             self.clearCookie()
             self._loadCookie(login_cookie, "pixiv.net")
-            res = self.open_with_retry('https://www.pixiv.net/en')  # + self._locale)
+            res = self.open_with_retry('https://www.pixiv.net')  # + self._locale)
             parsed = BeautifulSoup(res, features="html5lib")
             parsed_str = str(parsed.decode('utf-8'))
             PixivHelper.print_and_log("info", f'Logging in, return url: {res.geturl()}')
@@ -369,7 +369,7 @@ def loginUsingCookie(self, login_cookie=None):
                 PixivHelper.print_and_log('info', 'Login successful.')
                 PixivHelper.get_logger().info('Logged in using cookie')
                 self.getMyId(parsed_str)
-                temp_locale = str(res.geturl()).replace('https://www.pixiv.net/', '').replace('/', '')
+                temp_locale = str(res.geturl()).replace('https://www.pixiv.net', '').replace('/', '')
                 if len(temp_locale) > 0:
                     self._locale = '/' + temp_locale
                 PixivHelper.get_logger().info('Locale = %s', self._locale)
@@ -1023,10 +1023,27 @@ def fanboxGetPostsFromArtist(self, artist: FanboxArtist = None, next_url="") ->
 
         # Issue #641
         if next_url is None or next_url == "":
+            url = f"https://api.fanbox.cc/post.paginateCreator?creatorId={artist.creatorId}"
+            PixivHelper.print_and_log('info', 'Getting Pages from ' + url)
+            referer = "https://www.fanbox.cc/"
+            req = mechanize.Request(url)
+            req.add_header('Accept', 'application/json, text/plain, */*')
+            req.add_header('Referer', referer)
+            req.add_header('Origin', 'https://www.fanbox.cc')
+
+            res = self.open_with_retry(req)
+            response = res.read()
+            PixivHelper.get_logger().debug(response.decode('utf8'))
+            res.close()
+
+            artist.setPages(response)
+
             # url = f"https://api.fanbox.cc/post.listCreator?userId={artist.artistId}&limit=10"
             # Issue #1094
             # https://api.fanbox.cc/post.listCreator?creatorId=onartworks&maxPublishedDatetime=2022-02-26%2015%3A57%3A17&maxId=3468213&limit=10
-            url = f"https://api.fanbox.cc/post.listCreator?creatorId={artist.creatorId}&limit=10"
+            #url = f"https://api.fanbox.cc/post.listCreator?creatorId={artist.creatorId}&limit=10"
+
+            url = artist.Pages[artist.PageIndex]
         elif next_url.startswith("https://"):
             url = next_url
         else:

PixivModelFanbox.py

@@ -523,6 +523,9 @@ class FanboxArtist(object):
     FOLLOWING = 1
     CUSTOM = 2
 
+    Pages = None
+    PageIndex = 0
+
     @classmethod
     def parseArtistIds(cls, page):
         ids = list()
@@ -550,6 +553,16 @@ def __init__(self, artist_id, artist_name, creator_id, tzInfo=None):
     def __str__(self):
         return f"FanboxArtist({self.artistId}, {self.creatorId}, {self.artistName})"
 
+    def setPages(self, page):
+        js = demjson3.decode(page)
+
+        if "error" in js and js["error"]:
+            raise PixivException(f"Error when requesting Fanbox artist pages: {self.artistId}", 9999, page)
+
+        if js["body"] is not None:
+            js_body = js["body"]
+            self.Pages = js_body
+
     def parsePosts(self, page) -> List[FanboxPost]:
         js = demjson3.decode(page)
 
@@ -558,7 +571,7 @@ def parsePosts(self, page) -> List[FanboxPost]:
 
         if js["body"] is not None:
             js_body = js["body"]
-
+            
             posts = list()
 
             if "creator" in js_body:
@@ -571,15 +584,22 @@ def parsePosts(self, page) -> List[FanboxPost]:
                 # https://www.pixiv.net/ajax/fanbox/post?postId={0}
                 # or old api
                 post_root = js_body
+
 
-            for jsPost in post_root["items"]:
+            #for jsPost in post_root["items"]:
+            for jsPost in post_root:
                 post_id = int(jsPost["id"])
                 post = FanboxPost(post_id, self, jsPost, tzInfo=self._tzInfo)
                 posts.append(post)
                 # sanity check
                 assert (self.artistId == int(jsPost["user"]["userId"])), "Different user id from constructor!"
 
-            self.nextUrl = post_root["nextUrl"]
+            #self.nextUrl = post_root["nextUrl"]
+            self.PageIndex += 1
+            if self.PageIndex < len(self.Pages):
+                self.nextUrl = self.Pages[self.PageIndex]
+            else:
+                self.nextUrl = None
             if self.nextUrl is not None and len(self.nextUrl) > 0:
                 self.hasNextPage = True