telegrinder 0.1.dev12__tar.gz → 0.1.dev14__tar.gz

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: telegrinder
-Version: 0.1.dev12
+Version: 0.1.dev14
 Summary: async telegram bot building
 License: MIT
 Author: timoniq

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "telegrinder"
-version = "0.1.dev12"
+version = "0.1.dev14"
 description = "async telegram bot building"
 authors = ["timoniq <tesseradecades@mail.ru>"]
 license = "MIT"

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/setup.py

@@ -35,7 +35,7 @@ install_requires = \
 
 setup_kwargs = {
     'name': 'telegrinder',
-    'version': '0.1.dev12',
+    'version': '0.1.dev14',
     'description': 'async telegram bot building',
     'long_description': 'None',
     'author': 'timoniq',

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/telegrinder/__init__.py

@@ -19,6 +19,7 @@ from .bot import (
     ABCMiddleware,
     ABCScenario,
     Checkbox,
+    SingleChoice,
 )
 from .tools import (
     Keyboard,

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/telegrinder/api/abc.py

@@ -17,6 +17,10 @@ class Token(str):
             env.read_envfile()
         return cls(env.str(var_name))
 
+    @property
+    def bot_id(self) -> int:
+        return int(self.split(":")[0])
+
 
 class ABCAPI(ABC):
     http: ABCClient

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/telegrinder/bot/__init__.py

@@ -12,4 +12,4 @@ from .dispatch import (
 from .bot import Telegrinder
 from .cute_types import MessageCute, CallbackQueryCute, InlineQueryCute
 from .rules import ABCRule, ABCMessageRule
-from .scenario import ABCScenario, Checkbox
+from .scenario import ABCScenario, Checkbox, SingleChoice

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/telegrinder/bot/cute_types/message.py

@@ -40,6 +40,8 @@ class MessageCute(Message):
         **other
     ) -> Result["Message", APIError]:
         params = get_params(locals())
+        if "message_thread_id" not in params and self.is_topic_message:
+            params["message_thread_id"] = self.message_thread_id
         return await self.ctx_api.send_message(chat_id=self.chat.id, **params)
 
     async def reply(
@@ -62,6 +64,10 @@ class MessageCute(Message):
         **other
     ) -> Result["Message", APIError]:
         params = get_params(locals())
+        if "message_thread_id" not in params and self.is_topic_message:
+            params["message_thread_id"] = self.message_thread_id
         return await self.ctx_api.send_message(
-            chat_id=self.chat.id, reply_to_message_id=self.message_id, **params
+            chat_id=self.chat.id,
+            reply_to_message_id=self.message_id,
+            **params
         )

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/telegrinder/bot/dispatch/handler/func.py

@@ -5,6 +5,7 @@ from telegrinder.tools import magic_bundle
 from telegrinder.types import Update
 from telegrinder.api.abc import ABCAPI
 from .abc import ABCHandler
+from telegrinder.modules import logger
 
 T = typing.TypeVar("T")
 
@@ -38,6 +39,7 @@ class FuncHandler(ABCHandler, typing.Generic[T]):
                     api=api,
                 )
             if not await rule.run_check(e, self.ctx):
+                logger.debug("Rule {} failed", rule)
                 return False
         return True
 

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/telegrinder/bot/scenario/__init__.py

@@ -1,2 +1,3 @@
 from .abc import ABCScenario
 from .checkbox import Checkbox
+from .choice import SingleChoice

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/telegrinder/bot/scenario/checkbox.py

@@ -35,13 +35,11 @@ class Checkbox(ABCScenario):
         self,
         chat_id: int,
         msg: str,
-        multiple_choice: bool = True,
         ready_text: str = "Ready",
         max_in_row: int = 3,
     ):
         self.chat_id = chat_id
         self.msg = msg
-        self.multiple_choice = multiple_choice
         self.choices: typing.List[Choice] = []
         self.ready = ready_text
         self.max_in_row = max_in_row
@@ -100,7 +98,7 @@ class Checkbox(ABCScenario):
         assert len(self.choices) > 1
         message = (
             await api.send_message(
-                self.chat_id, self.msg, self.PARSE_MODE, reply_markup=self.get_markup()
+                self.chat_id, text=self.msg, parse_mode=self.PARSE_MODE, reply_markup=self.get_markup()
             )
         ).unwrap()
         while True:

telegrinder-0.1.dev14/telegrinder/bot/scenario/choice.py

@@ -0,0 +1,39 @@
+from .checkbox import Checkbox
+from telegrinder.bot.cute_types import CallbackQueryCute
+import typing
+
+if typing.TYPE_CHECKING:
+    from telegrinder.api import API
+    from telegrinder.bot.dispatch import Dispatch
+
+
+class SingleChoice(Checkbox):
+    async def handle(self, cb: CallbackQueryCute) -> bool:
+        code = cb.data.replace(self.random_code + "/", "", 1)
+
+        if code == "ready":
+            return False
+
+        for choice in self.choices:
+            choice.is_picked = False
+
+        for i, choice in enumerate(self.choices):
+            if choice.code == code:
+                self.choices[i].is_picked = True
+                await cb.ctx_api.edit_message_text(
+                    cb.message.chat.id,
+                    cb.message.message_id,
+                    text=self.msg,
+                    parse_mode=self.PARSE_MODE,
+                    reply_markup=self.get_markup(),
+                )
+
+        return True
+
+    async def wait(
+        self, api: "API", dispatch: "Dispatch"
+    ) -> typing.Tuple[str, int]:
+        if len([choice for choice in self.choices if choice.is_picked]) != 1:
+            raise ValueError("Exactly one choice must be picked")
+        choices, m_id = await super().wait(api, dispatch)
+        return list(choices.keys())[list(choices.values()).index(True)], m_id

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/telegrinder/types/methods.py

@@ -63,6 +63,7 @@ class APIMethods:
     async def send_message(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         text: typing.Optional[str] = None,
         parse_mode: typing.Optional[str] = None,
         entities: typing.Optional[typing.List[MessageEntity]] = None,
@@ -87,6 +88,7 @@ class APIMethods:
     async def forward_message(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         from_chat_id: typing.Optional[typing.Union[int, str]] = None,
         disable_notification: typing.Optional[bool] = None,
         protect_content: typing.Optional[bool] = None,
@@ -99,6 +101,7 @@ class APIMethods:
     async def copy_message(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         from_chat_id: typing.Optional[typing.Union[int, str]] = None,
         message_id: typing.Optional[int] = None,
         caption: typing.Optional[str] = None,
@@ -124,6 +127,7 @@ class APIMethods:
     async def send_photo(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         photo: typing.Optional[typing.Union[InputFile, str]] = None,
         caption: typing.Optional[str] = None,
         parse_mode: typing.Optional[str] = None,
@@ -148,6 +152,7 @@ class APIMethods:
     async def send_audio(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         audio: typing.Optional[typing.Union[InputFile, str]] = None,
         caption: typing.Optional[str] = None,
         parse_mode: typing.Optional[str] = None,
@@ -176,6 +181,7 @@ class APIMethods:
     async def send_document(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         document: typing.Optional[typing.Union[InputFile, str]] = None,
         thumb: typing.Optional[typing.Union[InputFile, str]] = None,
         caption: typing.Optional[str] = None,
@@ -202,6 +208,7 @@ class APIMethods:
     async def send_video(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         video: typing.Optional[typing.Union[InputFile, str]] = None,
         duration: typing.Optional[int] = None,
         width: typing.Optional[int] = None,
@@ -231,6 +238,7 @@ class APIMethods:
     async def send_animation(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         animation: typing.Optional[typing.Union[InputFile, str]] = None,
         duration: typing.Optional[int] = None,
         width: typing.Optional[int] = None,
@@ -259,6 +267,7 @@ class APIMethods:
     async def send_voice(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         voice: typing.Optional[typing.Union[InputFile, str]] = None,
         caption: typing.Optional[str] = None,
         parse_mode: typing.Optional[str] = None,
@@ -284,6 +293,7 @@ class APIMethods:
     async def send_video_note(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         video_note: typing.Optional[typing.Union[InputFile, str]] = None,
         duration: typing.Optional[int] = None,
         length: typing.Optional[int] = None,
@@ -308,6 +318,7 @@ class APIMethods:
     async def send_media_group(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         media: typing.Optional[
             typing.List[
                 typing.Union[
@@ -330,6 +341,7 @@ class APIMethods:
     async def send_location(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         latitude: typing.Optional[float] = None,
         longitude: typing.Optional[float] = None,
         horizontal_accuracy: typing.Optional[float] = None,
@@ -387,6 +399,7 @@ class APIMethods:
     async def send_venue(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         latitude: typing.Optional[float] = None,
         longitude: typing.Optional[float] = None,
         title: typing.Optional[str] = None,
@@ -415,6 +428,7 @@ class APIMethods:
     async def send_contact(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         phone_number: typing.Optional[str] = None,
         first_name: typing.Optional[str] = None,
         last_name: typing.Optional[str] = None,
@@ -439,6 +453,7 @@ class APIMethods:
     async def send_poll(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         question: typing.Optional[str] = None,
         options: typing.Optional[typing.List[str]] = None,
         is_anonymous: typing.Optional[bool] = None,
@@ -471,6 +486,7 @@ class APIMethods:
     async def send_dice(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         emoji: typing.Optional[str] = None,
         disable_notification: typing.Optional[bool] = None,
         protect_content: typing.Optional[bool] = None,
@@ -563,6 +579,7 @@ class APIMethods:
         can_change_info: typing.Optional[bool] = None,
         can_invite_users: typing.Optional[bool] = None,
         can_pin_messages: typing.Optional[bool] = None,
+        can_manage_topics: typing.Optional[bool] = None,
         **other
     ) -> Result[bool, APIError]:
         result = await self.api.request_raw("promoteChatMember", get_params(locals()))
@@ -787,6 +804,74 @@ class APIMethods:
         )
         return full_result(result, bool)
 
+    async def get_forum_topic_icon_stickers(
+        self, **other
+    ) -> Result[typing.List[Sticker], APIError]:
+        result = await self.api.request_raw(
+            "getForumTopicIconStickers", get_params(locals())
+        )
+        return full_result(result, typing.List[Sticker])
+
+    async def create_forum_topic(
+        self,
+        chat_id: typing.Optional[typing.Union[int, str]] = None,
+        name: typing.Optional[str] = None,
+        icon_color: typing.Optional[int] = None,
+        icon_custom_emoji_id: typing.Optional[str] = None,
+        **other
+    ) -> Result[ForumTopic, APIError]:
+        result = await self.api.request_raw("createForumTopic", get_params(locals()))
+        return full_result(result, ForumTopic)
+
+    async def edit_forum_topic(
+        self,
+        chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
+        name: typing.Optional[str] = None,
+        icon_custom_emoji_id: typing.Optional[str] = None,
+        **other
+    ) -> Result[bool, APIError]:
+        result = await self.api.request_raw("editForumTopic", get_params(locals()))
+        return full_result(result, bool)
+
+    async def close_forum_topic(
+        self,
+        chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
+        **other
+    ) -> Result[bool, APIError]:
+        result = await self.api.request_raw("closeForumTopic", get_params(locals()))
+        return full_result(result, bool)
+
+    async def reopen_forum_topic(
+        self,
+        chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
+        **other
+    ) -> Result[bool, APIError]:
+        result = await self.api.request_raw("reopenForumTopic", get_params(locals()))
+        return full_result(result, bool)
+
+    async def delete_forum_topic(
+        self,
+        chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
+        **other
+    ) -> Result[bool, APIError]:
+        result = await self.api.request_raw("deleteForumTopic", get_params(locals()))
+        return full_result(result, bool)
+
+    async def unpin_all_forum_topic_messages(
+        self,
+        chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
+        **other
+    ) -> Result[bool, APIError]:
+        result = await self.api.request_raw(
+            "unpinAllForumTopicMessages", get_params(locals())
+        )
+        return full_result(result, bool)
+
     async def answer_callback_query(
         self,
         callback_query_id: typing.Optional[str] = None,
@@ -937,6 +1022,7 @@ class APIMethods:
     async def send_sticker(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         sticker: typing.Optional[typing.Union[InputFile, str]] = None,
         disable_notification: typing.Optional[bool] = None,
         protect_content: typing.Optional[bool] = None,
@@ -1063,6 +1149,7 @@ class APIMethods:
     async def send_invoice(
         self,
         chat_id: typing.Optional[typing.Union[int, str]] = None,
+        message_thread_id: typing.Optional[int] = None,
         title: typing.Optional[str] = None,
         description: typing.Optional[str] = None,
         payload: typing.Optional[str] = None,
@@ -1158,6 +1245,7 @@ class APIMethods:
     async def send_game(
         self,
         chat_id: typing.Optional[int] = None,
+        message_thread_id: typing.Optional[int] = None,
         game_short_name: typing.Optional[str] = None,
         disable_notification: typing.Optional[bool] = None,
         protect_content: typing.Optional[bool] = None,

{telegrinder-0.1.dev12 → telegrinder-0.1.dev14}/telegrinder/types/objects.py

@@ -75,7 +75,10 @@ class Chat(Model):
     username: typing.Optional[str] = None
     first_name: typing.Optional[str] = None
     last_name: typing.Optional[str] = None
+    is_forum: typing.Optional[bool] = None
     photo: typing.Optional["ChatPhoto"] = None
+    active_usernames: typing.Optional[typing.List[str]] = None
+    emoji_status_custom_emoji_id: typing.Optional[str] = None
     bio: typing.Optional[str] = None
     has_private_forwards: typing.Optional[bool] = None
     has_restricted_voice_and_video_messages: typing.Optional[bool] = None
@@ -99,6 +102,7 @@ class Message(Model):
     Docs: https://core.telegram.org/bots/api/#message"""
 
     message_id: int
+    message_thread_id: typing.Optional[int] = None
     from_: typing.Optional["User"] = None
     sender_chat: typing.Optional["Chat"] = None
     date: int
@@ -109,6 +113,7 @@ class Message(Model):
     forward_signature: typing.Optional[str] = None
     forward_sender_name: typing.Optional[str] = None
     forward_date: typing.Optional[int] = None
+    is_topic_message: typing.Optional[bool] = None
     is_automatic_forward: typing.Optional[bool] = None
     reply_to_message: typing.Optional["Message"] = None
     via_bot: typing.Optional["User"] = None
@@ -153,6 +158,9 @@ class Message(Model):
     connected_website: typing.Optional[str] = None
     passport_data: typing.Optional["PassportData"] = None
     proximity_alert_triggered: typing.Optional["ProximityAlertTriggered"] = None
+    forum_topic_created: typing.Optional["ForumTopicCreated"] = None
+    forum_topic_closed: typing.Optional["ForumTopicClosed"] = None
+    forum_topic_reopened: typing.Optional["ForumTopicReopened"] = None
     video_chat_scheduled: typing.Optional["VideoChatScheduled"] = None
     video_chat_started: typing.Optional["VideoChatStarted"] = None
     video_chat_ended: typing.Optional["VideoChatEnded"] = None
@@ -398,6 +406,32 @@ class MessageAutoDeleteTimerChanged(Model):
     message_auto_delete_time: int
 
 
+class ForumTopicCreated(Model):
+    """This object represents a service message about a new forum topic created
+    in the chat.
+    Docs: https://core.telegram.org/bots/api/#forumtopiccreated"""
+
+    name: str
+    icon_color: int
+    icon_custom_emoji_id: typing.Optional[str] = None
+
+
+class ForumTopicClosed(Model):
+    """This object represents a service message about a forum topic closed in the
+    chat. Currently holds no information.
+    Docs: https://core.telegram.org/bots/api/#forumtopicclosed"""
+
+    pass
+
+
+class ForumTopicReopened(Model):
+    """This object represents a service message about a forum topic reopened in
+    the chat. Currently holds no information.
+    Docs: https://core.telegram.org/bots/api/#forumtopicreopened"""
+
+    pass
+
+
 class VideoChatScheduled(Model):
     """This object represents a service message about a video chat scheduled in
     the chat.
@@ -625,6 +659,7 @@ class ChatAdministratorRights(Model):
     can_post_messages: typing.Optional[bool] = None
     can_edit_messages: typing.Optional[bool] = None
     can_pin_messages: typing.Optional[bool] = None
+    can_manage_topics: typing.Optional[bool] = None
 
 
 class ChatMember(Model):
@@ -660,6 +695,7 @@ class ChatMember(Model):
     can_post_messages: typing.Optional[bool] = None
     can_edit_messages: typing.Optional[bool] = None
     can_pin_messages: typing.Optional[bool] = None
+    can_manage_topics: typing.Optional[bool] = None
     is_member: typing.Optional[bool] = None
     can_send_messages: typing.Optional[bool] = None
     can_send_media_messages: typing.Optional[bool] = None
@@ -699,6 +735,7 @@ class ChatMemberAdministrator(Model):
     can_post_messages: typing.Optional[bool] = None
     can_edit_messages: typing.Optional[bool] = None
     can_pin_messages: typing.Optional[bool] = None
+    can_manage_topics: typing.Optional[bool] = None
     custom_title: typing.Optional[str] = None
 
 
@@ -722,6 +759,7 @@ class ChatMemberRestricted(Model):
     can_change_info: bool
     can_invite_users: bool
     can_pin_messages: bool
+    can_manage_topics: bool
     can_send_messages: bool
     can_send_media_messages: bool
     can_send_polls: bool
@@ -786,6 +824,7 @@ class ChatPermissions(Model):
     can_change_info: typing.Optional[bool] = None
     can_invite_users: typing.Optional[bool] = None
     can_pin_messages: typing.Optional[bool] = None
+    can_manage_topics: typing.Optional[bool] = None
 
 
 class ChatLocation(Model):
@@ -796,6 +835,16 @@ class ChatLocation(Model):
     address: str
 
 
+class ForumTopic(Model):
+    """This object represents a forum topic.
+    Docs: https://core.telegram.org/bots/api/#forumtopic"""
+
+    message_thread_id: int
+    name: str
+    icon_color: int
+    icon_custom_emoji_id: typing.Optional[str] = None
+
+
 class BotCommand(Model):
     """This object represents a bot command.
     Docs: https://core.telegram.org/bots/api/#botcommand"""