v0.1.16.1

sidor0912 · sidor0912 · commit 4aadbea7bce9 · 2025-06-17T16:38:33.000+03:00
diff --git a/FunPayAPI/account.py b/FunPayAPI/account.py
@@ -835,9 +835,10 @@ def send_review(self, order_id: str, text: str, rating: Literal[1, 2, 3, 4, 5] =
             "accept": "*/*",
             "x-requested-with": "XMLHttpRequest"
         }
+        text = text.strip()
         payload = {
             "authorId": self.id,
-            "text": f"{text}{self.__bot_character}",
+            "text": f"{text}{self.__bot_character}" if text else text,
             "rating": rating,
             "csrf_token": self.csrf_token,
             "orderId": order_id
@@ -1326,7 +1327,7 @@ def get_sales(self, start_from: str | None = None, include_paid: bool = True, in
                   state: Optional[Literal["closed", "paid", "refunded"]] = None, game: Optional[int] = None,
                   section: Optional[str] = None, server: Optional[int] = None,
                   side: Optional[int] = None, locale: Literal["ru", "en", "uk"] | None = None,
-                  sudcategories: dict[str, tuple[types.SubCategoryTypes, int]] = None, **more_filters) -> \
+                  subcategories: dict[str, tuple[types.SubCategoryTypes, int]] | None = None, **more_filters) -> \
             tuple[str | None, list[types.OrderShortcut], Literal["ru", "en", "uk"],
             dict[str, types.SubCategory]]:
         """
@@ -1380,6 +1381,8 @@ def get_sales(self, start_from: str | None = None, include_paid: bool = True, in
             raise exceptions.AccountNotInitiatedError()
 
         exclude_ids = exclude_ids or []
+        _subcategories = more_filters.pop("sudcategories", None)
+        subcategories = subcategories or _subcategories
         filters = {"id": id, "buyer": buyer, "state": state, "game": game, "section": section, "server": server,
                    "side": side}
         filters = {name: filters[name] for name in filters if filters[name]}
@@ -1411,7 +1414,7 @@ def get_sales(self, start_from: str | None = None, include_paid: bool = True, in
 
         order_divs = parser.find_all("a", {"class": "tc-item"})
         if not start_from:
-            sudcategories = dict()
+            subcategories = dict()
             app_data = json.loads(parser.find("body").get("data-app-data"))
             locale = app_data.get("locale")
             self.csrf_token = app_data.get("csrf-token") or self.csrf_token
@@ -1425,11 +1428,11 @@ def get_sales(self, start_from: str | None = None, include_paid: bool = True, in
                         section_type, section_id = key.split("-")
                         section_type = types.SubCategoryTypes.COMMON if section_type == "lot" else types.SubCategoryTypes.CURRENCY
                         section_id = int(section_id)
-                        sudcategories[f"{game_name}, {section_name}"] = self.get_subcategory(section_type, section_id)
+                        subcategories[f"{game_name}, {section_name}"] = self.get_subcategory(section_type, section_id)
             else:
-                sudcategories = None
+                subcategories = None
         if not order_divs:
-            return None, [], locale, sudcategories
+            return None, [], locale, subcategories
 
         sales = []
         for div in order_divs:
@@ -1462,8 +1465,8 @@ def get_sales(self, start_from: str | None = None, include_paid: bool = True, in
             buyer_id = int(buyer_div.get("data-href")[:-1].split("/users/")[1])
             subcategory_name = div.find("div", {"class": "text-muted"}).text
             subcategory = None
-            if sudcategories:
-                subcategory = sudcategories.get(subcategory_name)
+            if subcategories:
+                subcategory = subcategories.get(subcategory_name)
 
             now = datetime.now()
             order_date_text = div.find("div", {"class": "tc-date-time"}).text
@@ -1492,7 +1495,7 @@ def get_sales(self, start_from: str | None = None, include_paid: bool = True, in
                                             order_status, order_date, subcategory_name, subcategory, str(div))
             sales.append(order_obj)
 
-        return next_order_id, sales, locale, sudcategories
+        return next_order_id, sales, locale, subcategories
 
     def get_sells(self, start_from: str | None = None, include_paid: bool = True, include_closed: bool = True,
                   include_refunded: bool = True, exclude_ids: list[str] | None = None,
diff --git a/main.py b/main.py
@@ -56,7 +56,7 @@
 [38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m'[0m[38;5;52m,[0m[38;5;0m'[0m[38;5;0m.[0m[38;5;0m"[0m[38;5;52m,[0m[38;5;0m`[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m [0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m
 [38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m"""
 
-VERSION = "0.1.16"
+VERSION = "0.1.16.1"
 
 Utils.cardinal_tools.set_console_title(f"FunPay Cardinal v{VERSION}")
 
diff --git a/requirements.txt b/requirements.txt
@@ -4,7 +4,6 @@ colorama>=0.4.6
 requests==2.28.1
 pytelegrambotapi==4.15.2
 pillow>=9.3.0
-aiohttp==3.9.0
 requests_toolbelt==0.10.1
 lxml>=5.3.0
 bcrypt>=4.2.0

-Original file line number
+Diff line change
 [38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m'[0m[38;5;52m,[0m[38;5;0m'[0m[38;5;0m.[0m[38;5;0m"[0m[38;5;52m,[0m[38;5;0m`[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m [0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m
 [38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m[38;5;0m.[0m"""
 -VERSION = "0.1.16"
 +VERSION = "0.1.16.1"
 Utils.cardinal_tools.set_console_title(f"FunPay Cardinal v{VERSION}")