xn-auth 0.2.46__tar.gz → 0.2.48__tar.gz

{xn_auth-0.2.46/xn_auth.egg-info → xn_auth-0.2.48}/PKG-INFO

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

{xn_auth-0.2.46 → xn_auth-0.2.48}/x_auth/controller.py

@@ -1,6 +1,8 @@
 from base64 import b64encode
 from datetime import timedelta
 
+from aiogram import Bot
+from aiogram.exceptions import TelegramForbiddenError
 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
@@ -18,7 +20,7 @@ async def retrieve_user_handler(token: Tok, _cn: ASGIConnection) -> AuthUser:
 
 
 async def revoked_token_handler(token: Tok, _cn: ASGIConnection) -> bool:
-    return token.extras["blocked"]
+    return False  # token.extras["blocked"]
 
 
 class Auth:
@@ -38,11 +40,25 @@ 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
+            if user.allows_write_to_pm is None:
+                try:
+                    await Bot(sec).send_chat_action(user.id, "typing")
+                    db_user.blocked = False
+                except TelegramForbiddenError:
+                    db_user.blocked = True
+            else:
+                db_user.blocked = not user.allows_write_to_pm
+            await db_user.save()
             res = self.jwt.login(
                 identifier=str(db_user.id),
                 token_extras={"role": db_user.role, "blocked": db_user.blocked},
                 response_body=XyncUser.model_validate(
-                    {**user.model_dump(), "xid": db_user.id, "pub": db_user.pub and b64encode(db_user.pub)}
+                    {
+                        **user.model_dump(),
+                        "xid": db_user.id,
+                        "pub": db_user.pub and b64encode(db_user.pub),
+                        "allows_write_to_pm": user.allows_write_to_pm or not db_user.blocked,
+                    }
                 ),
             )
             res.cookies[0].httponly = False

{xn_auth-0.2.46 → xn_auth-0.2.48}/x_auth/models.py

@@ -36,7 +36,7 @@ from x_auth.enums import Lang, Role, PeerType
 
 
 class Username(TortModel):
-    id: int = UInt8Field(True, description="tg_id")
+    id: int = BigIntField(True, description="tg_id")
     username: str = CharField(127, null=True)
     phone = UInt8Field(null=True)
 
@@ -51,7 +51,7 @@ class User(Model):
     first_name: str | None = CharField(63)
     pic: str | None = CharField(127, null=True)
     last_name: str | None = CharField(31, null=True)
-    blocked: bool = BooleanField(default=False)
+    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
@@ -68,7 +68,9 @@ class User(Model):
                 "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.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],
             }
         )
         if blocked is not None:

{xn_auth-0.2.46 → xn_auth-0.2.48/xn_auth.egg-info}/PKG-INFO

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