v0.1.16 - ChipFields

Author: sidor0912

FunPayAPI/account.py

@@ -308,7 +308,7 @@ def get_subcategory_public_lots(self, subcategory_type: enums.SubCategoryTypes,
             if subcategory_type is types.SubCategoryTypes.COMMON:
                 price = float(tc_price["data-s"])
             else:
-                price = float(tc_price.find("div").text.split()[0])
+                price = float(tc_price.find("div").text.rsplit(maxsplit=1)[0].replace(" ", ""))
             if currency is None:
                 currency = parse_currency(tc_price.find("span", class_="unit").text)
                 if self.currency != currency:
@@ -1643,21 +1643,29 @@ def get_chat_by_id(self, chat_id: int, make_request: bool = False) -> types.Chat
         self.add_chats(self.request_chats())
         return self.get_chat_by_id(chat_id)
 
-    def calc(self, subcategory_type: enums.SubCategoryTypes, subcategory_id: int, price: int | float = 1000):
+    def calc(self, subcategory_type: enums.SubCategoryTypes, subcategory_id: int | None = None,
+             game_id: int | None = None, price: int | float = 1000):
         if not self.is_initiated:
             raise exceptions.AccountNotInitiatedError()
-        headers = {
-            "accept": "*/*",
-            "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
-            "x-requested-with": "XMLHttpRequest"
-        }
-        if subcategory_type.COMMON:
+
+        if subcategory_type == types.SubCategoryTypes.COMMON:
             key = "nodeId"
             type_ = "lots"
+            value = subcategory_id
         else:
             key = "game"
             type_ = "chips"
-        r = self.method("post", f"{type_}/calc", headers, {key: subcategory_id, "price": price},
+            value = game_id
+
+        assert value is not None
+
+        headers = {
+            "accept": "*/*",
+            "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
+            "x-requested-with": "XMLHttpRequest"
+        }
+
+        r = self.method("post", f"{type_}/calc", headers, {key: value, "price": price},
                         raise_not_200=True)
         json_resp = r.json()
         if (error := json_resp.get("error")):
@@ -1667,7 +1675,7 @@ def calc(self, subcategory_type: enums.SubCategoryTypes, subcategory_id: int, pr
             methods.append(PaymentMethod(method.get("name"), float(method["price"].replace(" ", "")),
                                          parse_currency(method.get("unit")), method.get("sort")))
         if "minPrice" in json_resp:
-            min_price, min_price_currency = json_resp["minPrice"].rsplirt(" ", maxsplit=1)
+            min_price, min_price_currency = json_resp["minPrice"].rsplit(" ", maxsplit=1)
             min_price = float(min_price.replace(" ", ""))
             min_price_currency = parse_currency(min_price_currency)
         else:
@@ -1720,12 +1728,24 @@ def get_lot_fields(self, lot_id: int) -> types.LotFields:
                                  float(result["price"]), None, types.Currency.UNKNOWN, currency)
         return types.LotFields(lot_id, result, subcategory, currency, calc_result)
 
-    def save_lot(self, lot_fields: types.LotFields):
+    def get_chip_fields(self, subcategory_id: int) -> types.ChipFields:
+        if not self.is_initiated:
+            raise exceptions.AccountNotInitiatedError()
+        headers = {}
+        response = self.method("get", f"chips/{subcategory_id}/trade", headers, {}, raise_not_200=True)
+
+        html_response = response.content.decode()
+        bs = BeautifulSoup(html_response, "lxml")
+        result = {field["name"]: field.get("value") or "" for field in bs.find_all("input") if field["name"] != "query"}
+        result.update({field["name"]: "on" for field in bs.find_all("input", {"type": "checkbox"}, checked=True)})
+        return types.ChipFields(self.id, subcategory_id, result)
+
+    def save_offer(self, offer_fields: types.LotFields | types.ChipFields):
         """
         Сохраняет лот на FunPay.
 
-        :param lot_fields: объект с полями лота.
-        :type lot_fields: :class:`FunPayAPI.types.LotFields`
+        :param offer_fields: объект с полями лота.
+        :type offer_fields: :class:`FunPayAPI.types.LotFields`
         """
         if not self.is_initiated:
             raise exceptions.AccountNotInitiatedError()
@@ -1734,19 +1754,32 @@ def save_lot(self, lot_fields: types.LotFields):
             "content-type": "application/x-www-form-urlencoded; charset=UTF-8",
             "x-requested-with": "XMLHttpRequest",
         }
-        lot_fields.csrf_token = self.csrf_token
-        fields = lot_fields.renew_fields().fields
-        fields["location"] = "trade"
+        offer_fields.csrf_token = self.csrf_token
 
-        response = self.method("post", "lots/offerSave", headers, fields, raise_not_200=True)
+        if isinstance(offer_fields, types.LotFields):
+            id_ = offer_fields.lot_id
+            fields = offer_fields.renew_fields().fields
+            fields["location"] = "trade"
+            api_method = "lots/offerSave"
+        else:
+            id_ = offer_fields.subcategory_id
+            fields = offer_fields.renew_fields().fields
+            api_method = "chips/saveOffers"
+        response = self.method("post", api_method, headers, fields, raise_not_200=True)
         json_response = response.json()
         errors_dict = {}
         if (errors := json_response.get("errors")) or json_response.get("error"):
             if errors:
                 for k, v in errors:
                     errors_dict.update({k: v})
 
-            raise exceptions.LotSavingError(response, json_response.get("error"), lot_fields.lot_id, errors_dict)
+            raise exceptions.LotSavingError(response, json_response.get("error"), id_, errors_dict)
+
+    def save_chip(self, chip_fields: types.ChipFields):
+        self.save_offer(chip_fields)
+
+    def save_lot(self, lot_fields: types.LotFields):
+        self.save_offer(lot_fields)
 
     def delete_lot(self, lot_id: int) -> None:
         """

FunPayAPI/types.py

@@ -2,6 +2,8 @@
 В данном модуле описаны все типы пакета FunPayAPI
 """
 from __future__ import annotations
+
+import re
 from typing import Literal, overload, Optional
 
 import FunPayAPI.common.enums
@@ -783,6 +785,90 @@ def renew_fields(self) -> LotFields:
         return self
 
 
+class ChipOffer:
+    def __init__(self, lot_id: str, active: bool = False, server: str | None = None,
+                 side: str | None = None, price: float | None = None, amount: int | None = None):
+        self.lot_id = lot_id
+        self.active = active
+        self.server = server
+        self.side = side
+        self.price = price
+        self.amount = amount
+
+    @property
+    def key(self):
+        s = "".join([f"[{i}]" for i in self.lot_id.split("-")[3:]])
+        return f"offers{s}"
+
+
+class ChipFields:
+    def __init__(self, account_id: int, subcategory_id: int, fields: dict[str, str]):
+        self.subcategory_id = subcategory_id
+        self.__fields = fields
+
+        self.min_sum = float(i) if (i := self.__fields.get("options[chip_min_sum]")) else None
+        self.account_id: int = account_id
+        """ID аккаунта FunPay"""
+        self.game_id = int(self.__fields.get("game"))
+        """ID игры"""
+        self.csrf_token: str | None = self.__fields.get("csrf_token")
+        """CSRF-токен"""
+
+        self.chip_offers: dict[str, ChipOffer] = {}
+        self.__parse_offers()
+
+    @property
+    def fields(self) -> dict[str, str]:
+        """
+        Возвращает все поля лота в виде словаря.
+
+        :return: все поля лота в виде словаря.
+        :rtype: :obj:`dict` {:obj:`str`: :obj:`str`}
+        """
+        return self.__fields
+
+    def renew_fields(self) -> ChipFields:
+        """
+        Обновляет :py:obj:`~__fields` (возвращается в методе :meth:`FunPayAPI.types.ChipFields.get_fields`),
+        основываясь на свойствах экземпляра.
+        Необходимо вызвать перед сохранением лота на FunPay после изменения любого свойства экземпляра.
+
+        :return: экземпляр класса :class:`FunPayAPI.types.ChipFields` с новыми полями лота.
+        :rtype: :class:`FunPayAPI.types.ChipFields`
+        """
+        self.__fields["game"] = str(self.game_id)
+        self.__fields["chip"] = str(self.subcategory_id)
+        self.__fields["options[chip_min_sum]"] = str(self.min_sum) if self.min_sum is not None else ""
+        self.__fields["csrf_token"] = self.csrf_token
+        for chip_offer in self.chip_offers.values():
+            key = chip_offer.key
+            self.__fields[f"{key}[amount]"] = str(chip_offer.amount) if chip_offer.amount is not None else ""
+            self.__fields[f"{key}[price]"] = str(chip_offer.price) if chip_offer.price is not None else ""
+            if chip_offer.active:
+                self.__fields[f"{key}[active]"] = "on"
+            else:
+                self.__fields.pop(f"{key}[active]", None)
+        return self
+
+    def __parse_offers(self):
+        for k, v in self.__fields.items():
+            if not k.startswith("offers"):
+                continue
+            nums = re.findall(r'\d+', k)
+            key = "-".join(list(map(str, nums)))
+            offer_id = f"{self.account_id}-{self.game_id}-{self.subcategory_id}-{key}"
+            if offer_id not in self.chip_offers:
+                self.chip_offers[offer_id] = ChipOffer(offer_id)
+            chip_offer = self.chip_offers[offer_id]
+            field = k.split("[")[-1].rstrip("]")
+            if field == "active":
+                chip_offer.active = v == "on"
+            elif field == "price":
+                chip_offer.price = float(v) if v else None
+            elif field == "amount":
+                chip_offer.amount = int(v) if v else None
+
+
 class LotPage:
     """
     Класс, описывающий поля лота со страницы лота (https://funpay.com/lots/offer?id=XXXXXXXXXX).

main.py

@@ -56,7 +56,7 @@
 ......................','.",`............ ..................
 ............................................................"""
 
-VERSION = "0.1.15.19"
+VERSION = "0.1.16"
 
 Utils.cardinal_tools.set_console_title(f"FunPay Cardinal v{VERSION}")