xn-auth 0.2.49__tar.gz → 0.2.51__tar.gz

{xn_auth-0.2.49/xn_auth.egg-info → xn_auth-0.2.51}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xn-auth
-Version: 0.2.49
+Version: 0.2.51
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT

{xn_auth-0.2.49 → xn_auth-0.2.51}/x_auth/controller.py

@@ -2,7 +2,7 @@ from base64 import b64encode
 from datetime import timedelta
 
 from aiogram import Bot
-from aiogram.exceptions import TelegramForbiddenError
+from aiogram.exceptions import TelegramForbiddenError, TelegramBadRequest
 from aiogram.utils.auth_widget import check_signature
 from aiogram.utils.web_app import WebAppInitData, safe_parse_webapp_init_data, WebAppUser
 from litestar import Response, post
@@ -38,13 +38,12 @@ class Auth:
         )
 
         async def user_proc(user: WebAppUser) -> Response[XyncUser]:
-            user_in = await user_model.tg2in(user)
-            db_user, cr = await user_model.update_or_create(**user_in.df_unq())  # on login: update user in db from tg
+            db_user, cr = await user_model.tg_upsert(user)  # on login: update user in db from tg
             if user.allows_write_to_pm is None:
                 try:
                     await Bot(sec).send_chat_action(user.id, "typing")
                     db_user.blocked = False
-                except TelegramForbiddenError:
+                except (TelegramForbiddenError, TelegramBadRequest):
                     db_user.blocked = True
             else:
                 db_user.blocked = not user.allows_write_to_pm

{xn_auth-0.2.49 → xn_auth-0.2.51}/x_auth/enums.py

@@ -13,6 +13,7 @@ class PeerType(IntEnum):
     supergroup = 4
     user = 5
     forum = 6
+    direct = 7
 
 
 class RoleScope(IntEnum):

{xn_auth-0.2.49 → xn_auth-0.2.51}/x_auth/models.py

@@ -27,10 +27,9 @@ from tortoise.fields import (
 from tortoise.fields.data import CharEnumFieldInstance
 
 from x_auth import types
-from x_model.field import DatetimeSecField, UInt8Field, UniqBinaryField, UInt1Field, UInt2Field
+from x_model.field import DatetimeSecField, UInt8Field, UInt1Field, UInt2Field
 from x_model.models import Model, TsTrait
 from tortoise import Model as TortModel
-from x_model.types import BaseUpd
 
 from x_auth.enums import Lang, Role, PeerType
 
@@ -54,41 +53,38 @@ class User(Model):
     blocked: bool = BooleanField(null=True)
     lang: Lang | None = IntEnumField(Lang, default=Lang.ru, null=True)
     role: Role = IntEnumField(Role, default=Role.READER)
-    prv = UniqBinaryField(unique=True, null=True)  # len=32
-    pub = UniqBinaryField(unique=True, null=True)  # len=32
 
     app: BackwardOneToOneRelation["App"]
 
     @classmethod
-    async def tg2in(cls, u: PyroUser | AioUser | WebAppUser, blocked: bool = None) -> BaseUpd:
+    async def tg2in(cls, u: PyroUser | AioUser | WebAppUser, blocked: bool = None) -> dict:
         un, _ = await cls._meta.fields_map["username"].related_model.update_or_create({"username": u.username}, id=u.id)
-        user = cls.validate(
-            {
-                "first_name": u.first_name,
-                "last_name": u.last_name,
-                "username_id": un.id,
-                "lang": u.language_code and Lang[u.language_code],
-                "pic": hasattr(u, "photo_url")
-                and u.photo_url
-                and u.photo_url.replace("https://t.me/i/userpic/320/", "")[:-4],
-            }
+        pic = hasattr(u, "photo_url") and u.photo_url and u.photo_url.replace("https://t.me/i/userpic/320/", "")[:-4]
+        pic = (
+            pic
+            or isinstance(u, AioUser)
+            and (photos := (await u.bot.get_user_profile_photos(u.id)).photos)
+            and photos[0][-1].file_id
+            or None
         )
+        user_dict = {
+            "first_name": u.first_name,
+            "last_name": u.last_name,
+            "lang": u.language_code and Lang[u.language_code],
+            "pic": pic,
+        }
         if blocked is not None:
-            user.blocked = blocked
-        return user
+            user_dict["blocked"] = blocked
+        return user_dict
 
     @classmethod
     async def is_blocked(cls, sid: str) -> bool:
         return (await cls[int(sid)]).blocked
 
     @classmethod
-    async def tg_upsert(cls, u: PyroUser | AioUser, blocked: bool = None) -> tuple["User", bool]:
-        user_in: cls.in_type() = await cls.tg2in(u, blocked)
-        prms = user_in.df_unq()
-        return await cls.update_or_create(**prms)
-
-    # class Meta:
-    #     abstract = True
+    async def tg_upsert(cls, u: PyroUser | AioUser | WebAppUser, blocked: bool = None) -> tuple["User", bool]:
+        user_in: dict = await cls.tg2in(u, blocked)
+        return await cls.update_or_create(user_in, username_id=u.id)
 
 
 class Country(Model):

{xn_auth-0.2.49 → xn_auth-0.2.51/xn_auth.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xn-auth
-Version: 0.2.49
+Version: 0.2.51
 Summary: Auth adapter for XN-Api framework
 Author-email: Artemiev <mixartemev@gmail.com>
 License: MIT