fix: preserve requested review filter and add ReviewsBatch.next_batch

funpaybotengine/methods/get_reviews.py

@@ -4,6 +4,8 @@
 __all__ = ('GetReviews',)
 
 
+from typing import TYPE_CHECKING, Any
+
 from pydantic import BaseModel
 from funpayparsers.types import Language
 from funpayparsers.parsers import ReviewsParser
@@ -14,6 +16,10 @@
 from funpaybotengine.client.session.http_methods import HTTPMethod
 
 
+if TYPE_CHECKING:
+    from funpaybotengine.client.session.base import RawResponse
+
+
 STATE_FILTERS = {
     OrderStatus.COMPLETED: 'closed',
     OrderStatus.PAID: 'paid',
@@ -51,3 +57,16 @@ def __init__(
             from_review_id=from_review_id,
             filter=filter,
         )
+
+    async def transform_result(
+        self,
+        parsing_result: Any,
+        response: RawResponse[Any],
+    ) -> ReviewsBatch:
+        batch = await super().transform_result(parsing_result, response)
+        # FunPay omits the hidden ``filter`` and ``user_id`` inputs in some responses,
+        # so the scraped values are unreliable. Stamp the ones actually requested to
+        # keep the filter (and the profile id needed for pagination) across batches.
+        batch.filter = self.filter
+        batch.user_id = self.user_id
+        return batch

funpaybotengine/types/reviews.py

@@ -126,3 +126,21 @@ class ReviewsBatch(FunPayObject, BaseModel):
     If present, this value should be included in the next request to fetch
     the following batch of reviews. If ``None``, there are no more reviews to load.
     """
+
+    async def next_batch(self) -> ReviewsBatch:
+        if not self.next_review_id:
+            raise ValueError('Last batch.')
+
+        if self.user_id is None:
+            raise ValueError('Unknown user id.')
+
+        # Imported lazily to avoid a circular import between types and methods.
+        from funpaybotengine.methods.get_reviews import GetReviews
+
+        return (
+            await GetReviews(
+                user_id=self.user_id,
+                from_review_id=self.next_review_id,
+                filter=self.filter or '',
+            ).execute(self.get_bound_bot())
+        ).response_obj