pyrogram-client 0.0.8.dev1__tar.gz → 0.0.9__tar.gz

{pyrogram_client-0.0.8.dev1/pyrogram_client.egg-info → pyrogram_client-0.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrogram-client
-Version: 0.0.8.dev1
+Version: 0.0.9
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/pyro-client
 Project-URL: Repository, https://gitlab.com/XyncNet/pyro-client

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.9}/pyro_client/client/base.py

@@ -1,11 +1,10 @@
 import asyncio
-from collections import OrderedDict
 from io import BytesIO
 from typing import Literal
 
 from pyrogram import Client
 from pyrogram.errors import AuthKeyUnregistered, Unauthorized
-from pyrogram.filters import chat, contact, AndFilter
+from pyrogram.filters import chat, contact
 from pyrogram.handlers import MessageHandler
 from pyrogram.types import Message, InlineKeyboardMarkup, InlineKeyboardButton, ReplyKeyboardMarkup, KeyboardButton
 from x_auth.models import Session, App, Username
@@ -78,33 +77,26 @@ class BaseClient(Client):
         else:
             return await self.send_message(uid, txt, reply_markup=ikm)
 
-    async def wait_from(self, uid: int, topic: str, past: int = 0, timeout: int = 10) -> str | None:
+    def subscribe_for(self, uid: int, topic: str) -> tuple[MessageHandler, int]:
         fltr = chat(uid)
         if topic == "phone":
             fltr &= contact
-        handler = MessageHandler(self.got_msg, fltr)
-        # handler, g = self.add_handler(handler, 1)
-        g = 0
-        if g not in self.dispatcher.groups:
-            self.dispatcher.groups[g] = []
-            self.dispatcher.groups = OrderedDict(sorted(self.dispatcher.groups.items()))
-        self.dispatcher.groups[g].append(handler)
         self.storage.session.state |= {uid: {"waiting_for": topic}}
-        #
+        return self.add_handler(MessageHandler(self.got_msg, fltr))
+
+    async def wait_from(
+        self, uid: int, topic: str, hg: tuple[MessageHandler, int], past: int = 0, timeout: int = 10
+    ) -> str | None:
         while past < timeout:
             if txt := self.storage.session.state.get(uid, {}).pop(topic, None):
-                # self.remove_handler(handler)
-                self.dispatcher.groups[g].remove(handler)
-                #
+                self.remove_handler(*hg)
                 return txt
-            await asyncio.sleep(1)
-            past += 1
-        return self.remove_handler(handler, g)
+            await asyncio.sleep(2)
+            past += 2
+        return self.remove_handler(*hg)
 
     async def got_msg(self, _, msg: Message):
         if tpc := self.storage.session.state.get(msg.from_user.id, {}).pop("waiting_for", None):
-            self.storage.session.state[msg.from_user.id][tpc] = msg.contact.phone_number if tpc == "phone" else msg.text
-
-    def rm_handler(self, uid: int):
-        for gi, grp in self.dispatcher.groups.items():
-            [self.remove_handler(h, gi) for h in grp if isinstance(h.filters, AndFilter) and uid in h.filters.base]
+            self.storage.session.state[msg.from_user.id] = {
+                tpc: msg.contact.phone_number if tpc == "phone" else msg.text
+            }

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.9}/pyro_client/client/user.py

@@ -175,11 +175,14 @@ async def main():
     # await models.Proxy.load_list(WSToken)
     # session = await models.Session.filter(is_bot__isnull=True).order_by("-date").prefetch_related("proxy").first()
     bc: BotClient = BotClient(6806432376)
-    uc: UserClient = UserClient(7314099964, bc)
+    uc: UserClient = UserClient(193017646, bc)
     # try:
     await uc.start()
     # b = await uc.resolve_peer('xyncnetbot')
     await uc.send("/start", bc.me.username)
+
+    hg = uc.subscribe_for(1038938370, "code")
+    await uc.wait_from(1038938370, "code", hg)
     # except Exception as e:
     #     print(e.MESSAGE)
     #     await uc.send(e.MESSAGE)

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.9}/pyro_client/storage.py

@@ -14,6 +14,8 @@ def get_input_peer(peer_id: int, access_hash: int, peer_type: PeerType):
         return raw.types.InputPeerChat(chat_id=-peer_id)
     if peer_type in [PeerType.channel, PeerType.supergroup]:
         return raw.types.InputPeerChannel(channel_id=utils.get_channel_id(peer_id), access_hash=access_hash)
+    if peer_type in [PeerType.forum]:
+        return raw.types.InputPeerChannel(channel_id=utils.get_channel_id(peer_id), access_hash=access_hash)
     raise ValueError(f"Invalid peer type: {peer_type.name}")
 
 

{pyrogram_client-0.0.8.dev1 → pyrogram_client-0.0.9/pyrogram_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrogram-client
-Version: 0.0.8.dev1
+Version: 0.0.9
 Author-email: Mike Artemiev <mixartemev@gmail.com>
 Project-URL: Homepage, https://gitlab.com/XyncNet/pyro-client
 Project-URL: Repository, https://gitlab.com/XyncNet/pyro-client