xync-bot 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

xync_bot/handlers/main.py

@@ -1,5 +1,4 @@
 import logging
-from os import path
 
 from aiogram import Router, F
 from aiogram.enums import ContentType
@@ -13,9 +12,7 @@ from aiogram.types import (
     InlineKeyboardMarkup,
     InlineKeyboardButton,
     CallbackQuery,
-    ChatJoinRequest,
     WebAppInfo,
-    FSInputFile,
 )
 from aiogram.utils.deep_linking import create_start_link
 from xync_bot.handlers import user_upsert
@@ -132,63 +129,44 @@ async def my_user_set_status(my_chat_member: ChatMemberUpdated):
 
 @main.my_chat_member()
 async def user_set_status(my_chat_member: ChatMemberUpdated):
+    if my_chat_member.new_chat_member.user.username == "XyncNetBot":  # удалена группа где бот был добавлен админом
+        if forum := await Forum.get_or_none(id=my_chat_member.chat.id):
+            await forum.delete()
+        res = f"I {my_chat_member.new_chat_member.status} from {my_chat_member.chat.id}:{my_chat_member.chat.title}"
+        return logging.info(res)
     logging.info({"my_chat_member": my_chat_member.model_dump(exclude_none=True)})
     u: TgUser = my_chat_member.from_user
     blocked = my_chat_member.new_chat_member.status in ("left", "kicked")
+    if blocked:
+        if forum := await Forum.get_or_none(id=my_chat_member.chat.id, user_id=u.id):
+            if forum.joined:
+                forum.joined = False
+                await forum.save()
     await user_upsert(u, blocked)
 
 
-@main.chat_member(ChatMemberUpdatedFilter(LEAVE_TRANSITION))
+@main.chat_member(ChatMemberUpdatedFilter(LEAVE_TRANSITION))  # юзер покинул группу Ордеров
 async def on_user_leave(member: ChatMemberUpdated):
     logging.info({"user_leave": member.model_dump(exclude_none=True)})
-    forum = await Forum[member.chat.id]
-    if not forum.joined:
-        resp = (
-            f"{member.from_user.username or member.from_user.full_name}#{member.from_user.id} "
-            f"already leaved from {member.chat.title}#{member.chat.id}"
-        )
-        logging.error(resp)
-    else:
-        forum.joined = False
-        await forum.save()
-        resp = "Bye!"
+    if forum := await Forum[member.chat.id]:
+        if forum.joined:
+            forum.joined = False
+            await forum.save()
+            resp = "Bye!"
     return await member.bot.send_message(member.new_chat_member.user.id, resp)
 
 
-@main.chat_join_request()
-async def on_join_request(req: ChatJoinRequest):
-    logging.info({"join_request": req.model_dump(exclude_none=True)})
-    forum = await Forum[req.chat.id]
-    if forum.user_id != req.from_user.id:
-        resp = f"{req.chat.title} is chat for user#{forum.user_id}"
-        logging.error(resp)
-        forum.joined = not await req.decline()
-    else:
-        resp = "Your request approved"
-        forum.joined = await req.approve()
-    await forum.save()
-    return await req.bot.send_message(req.user_chat_id, resp)
-
-
-@main.chat_member(ChatMemberUpdatedFilter(JOIN_TRANSITION))
-async def on_user_join(member: ChatMemberUpdated):
+@main.chat_member(ChatMemberUpdatedFilter(JOIN_TRANSITION))  # Юзер добавился в группу Ордеров
+async def on_user_join(member: ChatMemberUpdated, app_url: str):
     logging.info({"user_join": member.model_dump(exclude_none=True)})
-    forum = await Forum[member.chat.id]
-    rm = None
-    if forum.user_id != member.new_chat_member.user.id:
-        if member.new_chat_member.user.id in (6806432376, forum.created_by_id):  # 6806432376=xyncNetBot
-            return
-        resp = f"{member.chat.title} is chat for user#{forum.user_id}"
-        logging.error(resp)
-        await member.bot.ban_chat_member(member.chat.id, member.new_chat_member.user.id)
+    if forum := await Forum.get_or_none(id=member.chat.id):
+        if not forum.joined:
+            forum.joined = True
+            await forum.save()
     else:
-        if not (await member.bot.get_chat(member.chat.id)).photo:
-            pth = path.join(path.dirname(path.abspath(__file__)), "xicon.png")
-            await member.chat.set_photo(FSInputFile(pth))
-        resp = "Welcome to XyncNetwork"
-        rm = InlineKeyboardMarkup(
-            inline_keyboard=[[InlineKeyboardButton(text="Go!", web_app=WebAppInfo(url="https://test.xync.net/"))]]
-        )
+        return
+    resp = "Welcome to XyncNetwork"
+    rm = InlineKeyboardMarkup(inline_keyboard=[[InlineKeyboardButton(text="Go!", web_app=WebAppInfo(url=app_url))]])
     return await member.bot.send_message(member.new_chat_member.user.id, resp, reply_markup=rm)
 
 

{xync_bot-0.3.3.dist-info → xync_bot-0.3.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.3
+Version: 0.3.5
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License: EULA

{xync_bot-0.3.3.dist-info → xync_bot-0.3.5.dist-info}/RECORD

@@ -2,12 +2,12 @@ xync_bot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_bot/shared.py,sha256=MlKkTrsT29l7fF6-qAN9FO14cSuXuOuYxbNY5F4S2w4,137
 xync_bot/types.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 xync_bot/handlers/__init__.py,sha256=0CwHTSgAWzKRZ7PtsaLGA8PtjWQtZqsEXKyncNbCKLA,374
-xync_bot/handlers/main.py,sha256=lisWrtONG3P2aJdgXQNYMPoeaAuy0rIATqAV7GKtQQ4,10104
+xync_bot/handlers/main.py,sha256=eIgorrJXzRJfsO7fx1XxVHFJDfMiJyWt7myS4qSqS8U,9521
 xync_bot/handlers/order.py,sha256=ZKWDLyiWrXzcR-aHKLBTBCACwp-P0Vvnr22T-EuLHaM,274
 xync_bot/handlers/photo.py,sha256=aq6ImIOoZQYTW-lEy26qjgj5TYAuk4bQjgiCv64mPJs,1203
 xync_bot/handlers/vpn.py,sha256=qKK55UrjEZeDvu7ljWXNUFBFgXTPTIEaCT2OAmKWky4,2219
 xync_bot/handlers/xicon.png,sha256=O57_kvzhVcCXSoGYZ61m0dW9pizY6gxR8Yj5aeCP0RQ,429283
-xync_bot-0.3.3.dist-info/METADATA,sha256=GcRnoo6pjNxKMCaOav3OLexTHUI8OFYOPfTOk8sFE7g,575
-xync_bot-0.3.3.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-xync_bot-0.3.3.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
-xync_bot-0.3.3.dist-info/RECORD,,
+xync_bot-0.3.5.dist-info/METADATA,sha256=Ixje9jeQi2Xf6sJXWbag5W2Tbz3TrsfLv5-2QIpaaEk,575
+xync_bot-0.3.5.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+xync_bot-0.3.5.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
+xync_bot-0.3.5.dist-info/RECORD,,

{xync_bot-0.3.3.dist-info → xync_bot-0.3.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (77.0.3)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any