multibotkit 0.1.25__tar.gz → 0.1.27__tar.gz

{multibotkit-0.1.25 → multibotkit-0.1.27}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: multibotkit
-Version: 0.1.25
+Version: 0.1.27
 Summary: Functional library for developing multiplatform chatbots
 Home-page: https://github.com/Appvelox/multibotkit
 Author: Appvelox LLC

{multibotkit-0.1.25 → multibotkit-0.1.27}/multibotkit/dispatchers/telegram.py

@@ -11,9 +11,17 @@ class TelegramDispatcher(BaseDispatcher):
     ):
         if event.message is not None:
             sender_id = event.message.from_.id
-        if event.callback_query is not None:
+        elif event.callback_query is not None:
             sender_id = event.callback_query.from_.id
-        
+        elif event.chat_member is not None:
+            sender_id = event.chat_member.from_.id
+        elif event.chat_join_request is not None:
+            sender_id = event.chat_join_request.from_.id
+        elif event.my_chat_member is not None:
+            sender_id = event.my_chat_member.from_.id
+        else:
+            sender_id = None
+
         state_id = f"telegram_{sender_id}"
         state_object = await self.state_manager.get_state(state_id)
 

{multibotkit-0.1.25 → multibotkit-0.1.27}/multibotkit/helpers/telegram.py

@@ -208,6 +208,66 @@ class TelegramHelper(BaseHelper):
         r = await self._perform_async_request(url, data)
         return r
 
+    def sync_create_chat_invite_link(
+        self,
+        chat_id: int,
+        creates_join_request: Optional[bool] = False,
+    ):
+        url = self.tg_base_url + "createChatInviteLink"
+        data = {"chat_id": chat_id, "creates_join_request": creates_join_request}
+        r = self._perform_sync_request(url, data)
+        return r
+
+    async def async_create_chat_invite_link(
+        self,
+        chat_id: int,
+        creates_join_request: Optional[bool] = False,
+    ):
+        url = self.tg_base_url + "createChatInviteLink"
+        data = {"chat_id": chat_id, "creates_join_request": creates_join_request}
+        r = await self._perform_async_request(url, data)
+        return r
+
+    def sync_approve_chat_join_request(
+        self,
+        chat_id: int,
+        user_id: int,
+    ):
+        url = self.tg_base_url + "approveChatJoinRequest"
+        data = {"chat_id": chat_id, "user_id": user_id}
+        r = self._perform_sync_request(url, data)
+        return r
+
+    async def async_approve_chat_join_request(
+        self,
+        chat_id: int,
+        user_id: int,
+    ):
+        url = self.tg_base_url + "approveChatJoinRequest"
+        data = {"chat_id": chat_id, "user_id": user_id}
+        r = await self._perform_async_request(url, data)
+        return r
+
+    def sync_decline_chat_join_request(
+        self,
+        chat_id: int,
+        user_id: int,
+    ):
+        url = self.tg_base_url + "declineChatJoinRequest"
+        data = {"chat_id": chat_id, "user_id": user_id}
+        r = self._perform_sync_request(url, data)
+        return r
+
+    async def async_decline_chat_join_request(
+        self,
+        chat_id: int,
+        user_id: int,
+    ):
+        url = self.tg_base_url + "declineChatJoinRequest"
+        data = {"chat_id": chat_id, "user_id": user_id}
+        r = await self._perform_async_request(url, data)
+        return r
+
     def sync_delete_message(
         self,
         chat_id: int,
@@ -237,11 +297,11 @@ class TelegramHelper(BaseHelper):
         message_id: int,
     ):
         url = self.tg_base_url + "copyMessage"
-        delete_message = CopyMessage(
+        copy_message = CopyMessage(
             chat_id=chat_id, message_id=message_id, from_chat_id=from_chat_id
         )
 
-        r = self._perform_sync_request(url, delete_message.dict())
+        r = self._perform_sync_request(url, copy_message.dict())
         return r
 
     async def async_copy_message(
@@ -251,11 +311,11 @@ class TelegramHelper(BaseHelper):
         message_id: int,
     ):
         url = self.tg_base_url + "copyMessage"
-        delete_message = DeleteMessage(
+        copy_message = CopyMessage(
             chat_id=chat_id, message_id=message_id, from_chat_id=from_chat_id
         )
 
-        r = await self._perform_async_request(url, delete_message.dict())
+        r = await self._perform_async_request(url, copy_message.dict())
         return r
 
     def sync_edit_message_text(

{multibotkit-0.1.25 → multibotkit-0.1.27}/multibotkit/schemas/telegram/outgoing.py

@@ -40,26 +40,26 @@ class DeleteWebhookParams(BaseModel):
 
 class DeleteMessage(BaseModel):
     chat_id: int = Field(
-        None,
+        ...,
         title="Unique identifier for the target chat or username of the"
         " target channel (in the format @channelusername)",
     )
-    message_id: int = Field(None, title="Identifier of the message to delete")
+    message_id: int = Field(..., title="Identifier of the message to delete")
 
 
 class CopyMessage(BaseModel):
     chat_id: int = Field(
-        None,
+        ...,
         title="Unique identifier for the target chat or username of the target channel "
               "(in the format @channelusername)",
     )
     from_chat_id: int = Field(
-        None,
+        ...,
         title="Unique identifier for the chat where the original message was sent (or channel username in "
               "the format @channelusername)",
     )
     message_id: int = Field(
-        None, title="Message identifier in the chat specified in from_chat_id"
+        ..., title="Message identifier in the chat specified in from_chat_id"
     )
 
 

{multibotkit-0.1.25 → multibotkit-0.1.27}/multibotkit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: multibotkit
-Version: 0.1.25
+Version: 0.1.27
 Summary: Functional library for developing multiplatform chatbots
 Home-page: https://github.com/Appvelox/multibotkit
 Author: Appvelox LLC

{multibotkit-0.1.25 → multibotkit-0.1.27}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="multibotkit",
-    version="0.1.25",
+    version="0.1.27",
     author="Appvelox LLC",
     author_email="team@appvelox.ru",
     description="Functional library for developing multiplatform chatbots",