pyrogram-client 0.0.3__tar.gz → 0.0.5__tar.gz

{pyrogram_client-0.0.3/pyrogram_client.egg-info → pyrogram_client-0.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrogram-client
-Version: 0.0.3
+Version: 0.0.5
 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.3 → pyrogram_client-0.0.5}/pyro_client/client/base.py

@@ -25,7 +25,9 @@ class BaseClient(Client, metaclass=SingleMeta):
     storage: PgStorage
 
     def __init__(self, name: str, api_id, api_hash, *args, **kwargs):
-        super().__init__(name, api_id=api_id, api_hash=api_hash, *args, storage_engine=PgStorage(name), **kwargs)
+        super().__init__(
+            name, api_id=api_id, api_hash=api_hash, *args, storage_engine=PgStorage(name), workers=1, **kwargs
+        )
 
     async def send(
         self,

{pyrogram_client-0.0.3 → pyrogram_client-0.0.5}/pyro_client/client/user.py

@@ -12,7 +12,7 @@ from x_auth.models import Session, Username, Proxy
 
 from pyro_client.client.base import BaseClient, AuthTopic
 from pyro_client.client.bot import BotClient
-from pyro_client.loader import WSToken
+from pyro_client.loader import WSToken, TOKEN
 
 vers: dict[ClientPlatform, str] = {
     ClientPlatform.IOS: "18.5",
@@ -181,7 +181,7 @@ 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 = await BotClient("xyncnetbot")
+    bc: BotClient = await BotClient(TOKEN)
     uc: UserClient = await UserClient(5547330178, bc)
     # try:
     await uc.start()

{pyrogram_client-0.0.3 → pyrogram_client-0.0.5}/pyro_client/storage.py

@@ -23,6 +23,7 @@ class PgStorage(Storage):
     VERSION = 1
     USERNAME_TTL = 8 * 60 * 60
     session: Session
+
     # me_id: int
 
     async def open(self):
@@ -39,10 +40,10 @@ class PgStorage(Storage):
 
     async def update_peers(self, peers: list[tuple[int, int, str, str]]):
         for peer in peers:
-            uid, ac_hsh, typ, phn = peer
-            un, _ = await Username.get_or_create(phn and {"phone": phn}, id=uid)
+            uid, ac_hsh, typ, phone = peer
+            un, _ = await Username.update_or_create(phone and {"phone": phone}, id=uid)
             await Peer.update_or_create(
-                {"username": un, "type": typ, "phone_number": phn}, session_id=self.name, id=ac_hsh
+                {"username": un, "type": typ, "phone_number": phone}, session_id=self.name, id=ac_hsh
             )
 
     async def update_usernames(self, usernames: list[tuple[int, list[str]]]):
@@ -50,17 +51,17 @@ class PgStorage(Storage):
             for username in user_list:
                 await Username.update_or_create({"username": username}, id=telegram_id)
 
-    async def get_peer_by_id(self, peer_id_or_username: int | str):
-        attr = "id" if isinstance(peer_id_or_username, int) else "username"
-        if not (peer := await Peer.get_or_none(session_id=self.name, **{"username__" + attr: peer_id_or_username})):
-            raise KeyError(f"User not found: {peer_id_or_username}")
+    async def get_peer_by_id(self, uin: int | str):
+        peer = await (
+            Peer.get(session_id=self.name, username_id=uin) if isinstance(uin, int) else self.get_peer_by_username(uin)
+        )
         if peer.last_update_on:
             if abs(time.time() - peer.last_update_on.timestamp()) > self.USERNAME_TTL:
-                raise KeyError(f"Username expired: {peer_id_or_username}")
+                raise KeyError(f"Username expired: {uin}")
         return get_input_peer(peer.username_id, peer.id, peer.type)
 
     async def get_peer_by_username(self, username: str):
-        return await self.get_peer_by_id(username)
+        return await Peer.get(session_id=self.name, username__username=username)
 
     async def update_state(self, value: tuple[int, int, int, int, int] = object):
         if value is None:
@@ -74,12 +75,9 @@ class PgStorage(Storage):
             )
 
     async def get_peer_by_phone_number(self, phone_number: str):
-        if not (
-            peer := await Peer.filter(session_id=self.name, phone_number=phone_number).values_list(
-                "id", "access_hash", "type"
-            )
-        ):
-            raise KeyError(f"Phone number not found: {phone_number}")
+        attrs = "id", "access_hash", "type"
+        if not (peer := await Peer.get_or_none(session_id=self.name, phone_number=phone_number).values_list(*attrs)):
+            peer = await Peer.get(session_id=self.name, username__phone=phone_number).values_list(*attrs)
         return get_input_peer(*peer)
 
     async def _get(self, attr: str):
@@ -119,7 +117,9 @@ class PgStorage(Storage):
         return await self._accessor("user_id", value)
 
     async def is_bot(self, value: bool = object):
-        return await self._accessor("is_bot", value)
+        if value is not object:
+            value = self.session.is_bot if value else None  # dirty
+        return bool(await self._accessor("is_bot", value))
 
     @staticmethod
     async def version(value: int = object):

{pyrogram_client-0.0.3 → pyrogram_client-0.0.5/pyrogram_client.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyrogram-client
-Version: 0.0.3
+Version: 0.0.5
 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