funpaybotengine 0.5.4__tar.gz → 0.6.0__tar.gz

{funpaybotengine-0.5.4 → funpaybotengine-0.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: funpaybotengine
-Version: 0.5.4
+Version: 0.6.0
 Summary: Framework for creating FunPay bots.
 Project-URL: Telegram, https://t.me/funpay_hub
 Project-URL: Issues, https://github.com/funpayhub/funpaybotengine/issues

funpaybotengine-0.6.0/examples/temp.py

@@ -0,0 +1,34 @@
+from __future__ import annotations
+
+import asyncio
+
+from funpaybotengine import Bot, Dispatcher
+from funpaybotengine.types import Message
+
+
+bot: Bot = Bot(golden_key='12345678901234567890123456789012')  # Создаем экземляр бота
+dp: Dispatcher = Dispatcher()  # Создаем диспетчер - корневой роутер
+
+
+# Регистрируем хэндлер на событие о новом сообщении
+# Хэндлер отработает на абсолютно любое сообщение.
+@dp.on_new_message()
+async def print_message(message: Message) -> None:
+    print(f'Пришло новое сообщение от {message.sender_username}: ')
+    print(message.text or message.image_url)
+
+
+# Регистрируем хэндлер на событие о новом сообщении
+# Хэндлер сработает тольько в том случае, если текст сообщения == 'привет'
+@dp.on_new_message(lambda message: message.text.lower() == 'привет')
+async def echo(message: Message) -> None:
+    await message.reply('Пока')
+
+
+async def main() -> None:
+    # Запускаем цикл получения новых событий.
+    await bot.listen_events(dp)
+
+
+if __name__ == '__main__':
+    asyncio.run(main())

{funpaybotengine-0.5.4 → funpaybotengine-0.6.0}/funpaybotengine/client/bot.py

@@ -27,6 +27,7 @@ from funpaybotengine.types import (
     PrivateChatPreview,
     TransactionPreviewsBatch,
     CurrentlyViewingOfferInfo,
+    RaiseOffersResponse
 )
 from funpaybotengine.utils import (
     random_runner_tag,
@@ -143,6 +144,7 @@ class Bot:
         update_categories: bool = True,
     ) -> None:
         self._golden_key = golden_key
+        self._golden_seal: str | None = None
         self._csrf_token: str | None = None
         self._phpsessid: str | None = phpsessid
         self._logout_token: str | None = None
@@ -203,6 +205,10 @@ class Bot:
         """
         return self._golden_key
 
+    @property
+    def golden_seal(self) -> str | None:
+        return self._golden_seal
+
     @property
     def csrf_token(self) -> str:
         """
@@ -304,7 +310,7 @@ class Bot:
     async def mute_chat(self, chat_id: int, mute: bool) -> bool:
         return (await MuteChat(chat_id=chat_id, mute=mute).execute(self)).response_obj
 
-    async def raise_offers(self, category_id: int, *subcategory_ids: int) -> bool:
+    async def raise_offers(self, category_id: int, *subcategory_ids: int) -> RaiseOffersResponse:
         if not subcategory_ids:
             category = await self.storage.get_category(category_id)
             if category is None:
@@ -901,6 +907,9 @@ class Bot:
             self._phpsessid = result.cookies['PHPSESSID']
             self._session_updated_at = int(time.time())
 
+        if 'golden_seal' in result.cookies and not skip_update:
+            self._golden_seal = result.cookies['golden_seal']
+
         return result
 
     async def update(self, change_locale: Language | None = None) -> Self:
@@ -918,6 +927,7 @@ class Bot:
 
         self._csrf_token = page_obj.app_data.csrf_token
         self._phpsessid = result.cookies.get('PHPSESSID')
+        self._golden_seal = result.cookies.get('golden_seal')
         self._logout_token = page_obj.header.logout_token
 
         if not self._locale or change_locale is not None:

{funpaybotengine-0.5.4 → funpaybotengine-0.6.0}/funpaybotengine/client/session/aiohttp_session.py

@@ -89,6 +89,10 @@ class AioHttpSession(BaseSession):
             if bot.phpsessid and not skip_session_cookies:
                 session.cookie_jar.update_cookies({'PHPSESSID': bot.phpsessid})
 
+        with suppress(BotNotInitializedError):
+            if bot.golden_seal and not skip_session_cookies:
+                session.cookie_jar.update_cookies({'golden_seal': bot.golden_seal})
+
     async def make_request(
         self,
         method: FunPayMethod[MethodReturnType],

{funpaybotengine-0.5.4 → funpaybotengine-0.6.0}/funpaybotengine/methods/raise_offers.py

@@ -4,25 +4,26 @@ from __future__ import annotations
 __all__ = ('RaiseOffers',)
 
 import json
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 from collections.abc import Sequence
 
 from pydantic import Field
-from typing_extensions import Literal, Annotated
+from typing_extensions import Annotated
 
-from funpaybotengine.exceptions import RaiseOffersError
 from funpaybotengine.types.enums import Language
 from funpaybotengine.methods.base import FunPayMethod
 from funpaybotengine.client.session.http_methods import HTTPMethod
+from funpaybotengine.types.common import RaiseOffersResponse
 
 
 if TYPE_CHECKING:
     from funpaybotengine.client.session.base import RawResponse
 
 
-class RaiseOffers(FunPayMethod[Literal[True]]):
+class RaiseOffers(FunPayMethod[RaiseOffersResponse]):
     category_id: int
     subcategory_ids: Annotated[Sequence[int], Field(min_length=1)]
+    __model_to_build__ = RaiseOffersResponse
 
     def __init__(
         self,
@@ -44,18 +45,6 @@ class RaiseOffers(FunPayMethod[Literal[True]]):
             subcategory_ids=subcategory_ids,
         )
 
-    async def parse_result(self, response: RawResponse[bool]) -> Literal[True]:
+    async def parse_result(self, response: RawResponse[bool]) -> dict[str, Any]:
         data = json.loads(response.raw_response)
-        error, url, msg = data.get('error'), data.get('url'), data.get('msg')
-
-        if url or error:
-            raise RaiseOffersError(response.raw_response, self.category_id, url or msg)
-
-        return True
-
-    async def transform_result(
-        self,
-        parsing_result: Literal[True],
-        response: RawResponse[bool],
-    ) -> Literal[True]:
-        return True
+        return {'raw_source': response.raw_response} | data

{funpaybotengine-0.5.4 → funpaybotengine-0.6.0}/funpaybotengine/methods/save_offer_fields.py

@@ -35,6 +35,7 @@ class SaveOfferFields(FunPayMethod[bool], BaseModel):
             url=url,
             method=HTTPMethod.POST,
             data=offer_fields.fields_dict,
+            headers={'X-Requested-With': 'XMLHttpRequest'},
             parser_cls=OfferFieldsParser,
             locale=locale,
             offer_fields=offer_fields,
@@ -66,5 +67,3 @@ class SaveOfferFields(FunPayMethod[bool], BaseModel):
             fields_dict = {}
 
         raise InvalidOfferFieldsError(error_msg, fields_dict)
-
-

{funpaybotengine-0.5.4 → funpaybotengine-0.6.0}/funpaybotengine/types/common.py

@@ -13,6 +13,7 @@ __all__ = (
     'PaymentOption',
 )
 
+from datetime import datetime
 
 from pydantic import BaseModel
 
@@ -157,6 +158,17 @@ class RaiseOffersResponse(FunPayObject, BaseModel):
     msg: str
     """Status message."""
 
+    wait: int
+    """How long to wait until next raise is available (in seconds)."""
+
+    unlock_at: str
+    """String representation of the time when the next raise is available."""
+
+    @property
+    def unlock_at_datetime(self) -> datetime:
+        """Datetime object of the time when the next raise is available."""
+        return datetime.fromisoformat(self.unlock_at)
+
 
 class PaymentOption(FunPayObject):
     """Represents an offer payment option (typically from offer page)."""

{funpaybotengine-0.5.4 → funpaybotengine-0.6.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "funpaybotengine"
-version = "0.5.4"
+version = "0.6.0"
 description = "Framework for creating FunPay bots."
 requires-python = ">=3.10"
 readme = "README.md"

funpaybotengine-0.5.4/temp.py

@@ -1,20 +0,0 @@
-from funpaybotengine import Bot
-
-bot = Bot(golden_key='ldc86q3vuwdx30wi7koqsr9scpsejash', proxy='socks5://user148429:dgej93@45.39.104.142:19392')
-
-
-async def main():
-    result = await bot.get_my_offers_page(2418)
-    print(result.subcategory_id)
-    print(result.category_id)
-    for i in result.offers.values():
-        print(i.id)
-        print(i.title)
-        print(i.price)
-        print(i.auto_delivery)
-        print(i.seller)
-
-
-if __name__ == '__main__':
-    import asyncio
-    asyncio.run(main())