xync-bot 0.3.2__tar.gz → 0.3.4__tar.gz

{xync_bot-0.3.2/xync_bot.egg-info → xync_bot-0.3.4}/PKG-INFO

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

xync_bot-0.3.4/xync_bot/handlers/__init__.py

@@ -0,0 +1,8 @@
+from aiogram.types import User
+from aiogram.utils.web_app import WebAppUser
+from xync_schema import models
+
+
+async def user_upsert(u: User | WebAppUser, blocked: bool = None) -> tuple[User, bool]:
+    user_in: models.User.Upd = await models.User.tg2in(u, blocked)
+    return await models.User.update_or_create(user_in.model_dump(exclude_none=True, exclude={"id"}), id=u.id)

{xync_bot-0.3.2 → xync_bot-0.3.4}/xync_bot/handlers/main.py

@@ -3,7 +3,8 @@ from os import path
 
 from aiogram import Router, F
 from aiogram.enums import ContentType
-from aiogram.filters import CommandStart, CommandObject, IS_MEMBER, IS_NOT_MEMBER, ChatMemberUpdatedFilter
+from aiogram.exceptions import TelegramBadRequest
+from aiogram.filters import CommandStart, CommandObject, ChatMemberUpdatedFilter, JOIN_TRANSITION, LEAVE_TRANSITION
 from aiogram.filters.callback_data import CallbackData
 from aiogram.types import (
     User as TgUser,
@@ -17,9 +18,8 @@ from aiogram.types import (
     FSInputFile,
 )
 from aiogram.utils.deep_linking import create_start_link
-from aiogram.utils.web_app import WebAppUser
-from tg_auth import Lang
-from xync_schema.models import User, UserStatus, Order, Msg, Forum
+from xync_bot.handlers import user_upsert
+from xync_schema.models import User, Order, Msg, Forum
 
 from xync_bot.shared import NavCallbackData
 
@@ -45,14 +45,15 @@ home_btns = InlineKeyboardMarkup(
 async def start_handler(msg: Message, command: CommandObject):
     me: TgUser = msg.from_user
     ref_id: int = command.args.isnumeric() and int(command.args)
-    user = await User.get_or_none(id=me.id, status__gte=UserStatus.RESTRICTED)
+    user = await User.get_or_none(id=me.id, blocked=False)
     rm = None
+    logging.info(msg, {"src": "start"})
     if user:
         rs, rm = f"{me.full_name}, you have registered already😉", home_btns
     elif not (ref := await User.get_or_none(id=ref_id)):
         rs = f"No registered user #{ref_id}😬"
     else:  # new user created
-        user, cr = await user_upsert(me)
+        user, cr = await user_upsert(me, False)
         await user.update_from_dict({"ref": ref}).save()
         approve_btns = InlineKeyboardMarkup(
             inline_keyboard=[
@@ -88,7 +89,7 @@ async def phrases_input_request(cb: CallbackQuery, callback_data: RrCallbackData
 
 @main.message(CommandStart(deep_link=True))  # attempt to reg by fake link
 async def fraud_handler(msg: Message):
-    logging.info(f"Start: {msg.from_user.id}. Msg: {msg}")
+    logging.warning(f"Start: {msg.from_user.id}. Msg: {msg}")
     # todo: alert to admins! Fraud attempt!
     await msg.answer("🤔")
 
@@ -96,7 +97,7 @@ async def fraud_handler(msg: Message):
 @main.message(CommandStart())
 async def start_no_ref_handler(msg: Message):
     me = msg.from_user
-    user, cr = await user_upsert(me)
+    user, cr = await user_upsert(me, False)
     rr = "сначала вы должны найти поручителя, и перейти по его реферальной ссылке.\nhttps://telegra.ph/XyncNet-02-13"
     if cr:  # has ref and created now
         await msg.answer(f"Здравствуйте {me.full_name}, что бы использовать возможности нашей сети, {rr}")
@@ -109,7 +110,7 @@ async def start_no_ref_handler(msg: Message):
 @main.callback_query(NavCallbackData.filter(F.to == "ref_link"))
 async def ref_link_handler(cbq: CallbackQuery):
     me = cbq.from_user
-    if not (u := await User.get_or_none(id=me.id, status__gt=UserStatus.RESTRICTED).prefetch_related("ref")):
+    if not (u := await User.get_or_none(id=me.id, blocked=False).prefetch_related("ref")):
         return await cbq.answer(f"{me.full_name}, сначала сами получите одобрение поручителя😉")
     link = await create_start_link(cbq.bot, str(u.id), encode=True)
     logging.info(f"Start: {me.id}. Msg: {cbq}")
@@ -121,80 +122,72 @@ async def ref_link_handler(cbq: CallbackQuery):
     await cbq.answer("Wait for your protege request..")
 
 
-async def user_upsert(u: TgUser | WebAppUser, status: UserStatus = None) -> (User, bool):
-    pic = (
-        (gpp := await u.get_profile_photos(0, 1)).photos and gpp.photos[0][-1].file_unique_id
-        if type(u) is TgUser
-        else (u.photo_url[0] if u.photo_url else None)
-    )
-    udf = {
-        "username": u.username,
-        "first_name": u.first_name,
-        "last_name": u.last_name,
-        "status": UserStatus.MEMBER,
-        "lang": u.language_code and Lang[u.language_code],
-        "pic": pic,
-    }
-    if status:
-        udf.update({"status": status})
-    return await User.update_or_create(udf, id=u.id)
+@main.my_chat_member(F.chat.type == "private")  # my_chat_member is fired on add bot to any chat. filter for preventing
+async def my_user_set_status(my_chat_member: ChatMemberUpdated):
+    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")
+    await user_upsert(u, blocked)
 
 
 @main.my_chat_member()
 async def user_set_status(my_chat_member: ChatMemberUpdated):
+    logging.info({"my_chat_member": my_chat_member.model_dump(exclude_none=True)})
     u: TgUser = my_chat_member.from_user
-    new_status = UserStatus[my_chat_member.new_chat_member.status.upper()]
-    await user_upsert(u, status=new_status)
+    blocked = my_chat_member.new_chat_member.status in ("left", "kicked")
+    await user_upsert(u, blocked)
 
 
-@main.chat_member(ChatMemberUpdatedFilter(IS_MEMBER >> IS_NOT_MEMBER))
+@main.chat_member(ChatMemberUpdatedFilter(LEAVE_TRANSITION))
 async def on_user_leave(member: ChatMemberUpdated):
-    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!"
+    logging.info({"user_leave": member.model_dump(exclude_none=True)})
+    if 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!"
     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 = "Welcome!"
+        resp = "Your request approved"
         forum.joined = await req.approve()
-        cp = (await req.bot.get_chat(req.chat.id)).photo
-        if not cp:
-            pth = path.join(path.dirname(path.abspath(__file__)), "xicon.png")
-            await req.chat.set_photo(FSInputFile(pth))
     await forum.save()
     return await req.bot.send_message(req.user_chat_id, resp)
 
 
-@main.chat_member(ChatMemberUpdatedFilter(IS_NOT_MEMBER >> IS_MEMBER))
+@main.chat_member(ChatMemberUpdatedFilter(JOIN_TRANSITION))
 async def on_user_join(member: ChatMemberUpdated):
+    logging.info({"user_join": member.model_dump(exclude_none=True)})
     forum = await Forum[member.chat.id]
     rm = None
-    if forum.user_id != member.from_user.id:
-        if member.from_user.id in (6806432376, forum.created_by):
+    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.from_user.id)
+        await member.bot.ban_chat_member(member.chat.id, member.new_chat_member.user.id)
     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://t.me/XyncNetBot/test"))]]
+            inline_keyboard=[[InlineKeyboardButton(text="Go!", web_app=WebAppInfo(url="https://test.xync.net/"))]]
         )
     return await member.bot.send_message(member.new_chat_member.user.id, resp, reply_markup=rm)
 
@@ -211,26 +204,41 @@ async def order_msg(msg: Message):
     else:
         return await msg.answer("No such order")
         # raise Exception("No such order")
-    receiver: User = await (order.ad.agent.user if is_taker else order.taker.user)
+    receiver: User = await (order.ad.maker.user if is_taker else order.taker.user)
     rcv_topic = order.taker_topic if is_taker else order.maker_topic
     await Msg.create(tgid=msg.message_id, txt=msg.text, order_id=order.id, receiver=receiver)
+    logging.info(msg, {"src": "order_msg"})
     return await msg.send_copy(receiver.forum, message_thread_id=rcv_topic)
 
 
 @main.message(
     F.content_type.not_in(
         {
-            # ContentType.NEW_CHAT_MEMBERS,
-            ContentType.FORUM_TOPIC_CLOSED,
-            ContentType.GENERAL_FORUM_TOPIC_HIDDEN,
+            ContentType.NEW_CHAT_MEMBERS,
             # ContentType.LEFT_CHAT_MEMBER,
-            ContentType.SUPERGROUP_CHAT_CREATED,
-            ContentType.NEW_CHAT_PHOTO,
+            # ContentType.SUPERGROUP_CHAT_CREATED,
+            # ContentType.NEW_CHAT_PHOTO,
             # ContentType.FORUM_TOPIC_CREATED,
             # ContentType.FORUM_TOPIC_EDITED,
-            # ContentType.FORUM_TOPIC_CLOSED,
+            ContentType.FORUM_TOPIC_CLOSED,
+            # ContentType.GENERAL_FORUM_TOPIC_HIDDEN, # deletable
         }
     )
 )
 async def del_cbq(msg: Message):
-    await msg.delete()
+    try:
+        await msg.delete()
+        logging.info({"DELETED": msg.model_dump(exclude_none=True)})
+    except TelegramBadRequest:
+        logging.error({"NOT_DELETED": msg.model_dump(exclude_none=True)})
+
+
+@main.message()
+async def all_rest(msg: Message):
+    logging.warning(
+        {
+            "NO_HANDLED": msg.model_dump(
+                exclude_none=True,
+            )
+        }
+    )

xync_bot-0.3.4/xync_bot/handlers/photo.py

@@ -0,0 +1,36 @@
+from aiogram import Router, F
+from aiogram.fsm.context import FSMContext
+from aiogram.fsm.state import State
+from aiogram.types import User as TgUser, Message
+from x_auth.enums import Role
+from xync_schema.models import User, Ex
+
+photo = Router()
+exns = State("ex_name")
+
+
+@photo.message(F.photo | F.sticker)
+async def photo_upload(msg: Message, state: FSMContext):
+    u: TgUser = msg.from_user
+    if not await User.get_or_none(id=u.id, blocked=False, role=Role.ADMIN):
+        return await msg.answer("No user")
+    if f := msg.sticker:
+        await state.set_data({"fid": f.file_id})
+        await state.set_state(exns)
+        return await msg.answer("Ex name pls")
+    res = await set_ex_name(msg.caption, msg.photo[-1].file_id)
+    return await msg.answer(res or "No ex", parse_mode="HTML")
+
+
+async def set_ex_name(name: str, fid: str) -> str | None:
+    if ex := await Ex.get_or_none(name=name):
+        ex.logo = fid
+        await ex.save()
+        return fid
+    return None
+
+
+@photo.message(exns)
+async def ex_name(msg: Message, state: FSMContext):
+    res = await set_ex_name(msg.text, await state.get_value("fid"))
+    return await msg.answer(res or "No ex" + msg.text, parse_mode="HTML")

{xync_bot-0.3.2 → xync_bot-0.3.4/xync_bot.egg-info}/PKG-INFO

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

{xync_bot-0.3.2 → xync_bot-0.3.4}/xync_bot.egg-info/SOURCES.txt

@@ -6,6 +6,7 @@ pyproject.toml
 test_main.http
 xync_bot/__init__.py
 xync_bot/shared.py
+xync_bot/types.py
 xync_bot.egg-info/PKG-INFO
 xync_bot.egg-info/SOURCES.txt
 xync_bot.egg-info/dependency_links.txt
@@ -14,5 +15,6 @@ xync_bot.egg-info/top_level.txt
 xync_bot/handlers/__init__.py
 xync_bot/handlers/main.py
 xync_bot/handlers/order.py
+xync_bot/handlers/photo.py
 xync_bot/handlers/vpn.py
 xync_bot/handlers/xicon.png