xync-bot 0.3.1__tar.gz → 0.3.3__tar.gz

{xync_bot-0.3.1/xync_bot.egg-info → xync_bot-0.3.3}/PKG-INFO

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

xync_bot-0.3.3/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.3/xync_bot/handlers/main.py

@@ -0,0 +1,244 @@
+import logging
+from os import path
+
+from aiogram import Router, F
+from aiogram.enums import ContentType
+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,
+    ChatMemberUpdated,
+    Message,
+    InlineKeyboardMarkup,
+    InlineKeyboardButton,
+    CallbackQuery,
+    ChatJoinRequest,
+    WebAppInfo,
+    FSInputFile,
+)
+from aiogram.utils.deep_linking import create_start_link
+from xync_bot.handlers import user_upsert
+from xync_schema.models import User, Order, Msg, Forum
+
+from xync_bot.shared import NavCallbackData
+
+main = Router()
+
+
+class RrCallbackData(CallbackData, prefix="reg_res"):  # registration response
+    to: int
+    res: bool
+
+
+home_btns = InlineKeyboardMarkup(
+    inline_keyboard=[
+        [
+            InlineKeyboardButton(text="Invite", callback_data=NavCallbackData(to="ref_link").pack()),
+            InlineKeyboardButton(text="Get VPN", callback_data=NavCallbackData(to="get_vpn").pack()),
+        ]
+    ]
+)
+
+
+@main.message(CommandStart(deep_link=True, deep_link_encoded=True))
+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, 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, False)
+        await user.update_from_dict({"ref": ref}).save()
+        approve_btns = InlineKeyboardMarkup(
+            inline_keyboard=[
+                [
+                    InlineKeyboardButton(text="Отклонить", callback_data=RrCallbackData(to=user.id, res=False).pack()),
+                    InlineKeyboardButton(text="Одобрить", callback_data=RrCallbackData(to=user.id, res=True).pack()),
+                ]
+            ]
+        )
+        await msg.bot.send_message(
+            ref.id, f"{me.full_name} просит что б Вы взяли за него/ее ответственность", reply_markup=approve_btns
+        )
+        return await msg.answer(f"Please wait for @{ref.username} approving...")
+    return await msg.answer(rs, reply_markup=rm)
+
+
+@main.callback_query(RrCallbackData.filter())
+async def phrases_input_request(cb: CallbackQuery, callback_data: RrCallbackData) -> None:
+    protege = await User[callback_data.to]
+    if callback_data.res:
+        # protege.status = UserStatus.RESTRICTED
+        await protege.save()
+        rs = f"{cb.from_user.full_name}, теперь Вы несете ответветвенность за {protege.username}"
+    else:
+        rs = f'Вы отклонили запрос юзера "{protege.username}" на Вашу протекцию'
+    res = {True: "одобрил", False: "отклонил"}
+    txt = f"{cb.from_user.full_name} {res[callback_data.res]} вашу регистрацию"
+    txt, rm = (f"Поздравляем! {txt}💥", home_btns) if callback_data.res else (f"К сожалению {txt}😢", None)
+    await cb.bot.send_message(protege.id, txt, reply_markup=rm)
+    await cb.answer("👌🏼")
+    await cb.message.edit_text(rs)
+
+
+@main.message(CommandStart(deep_link=True))  # attempt to reg by fake link
+async def fraud_handler(msg: Message):
+    logging.warning(f"Start: {msg.from_user.id}. Msg: {msg}")
+    # todo: alert to admins! Fraud attempt!
+    await msg.answer("🤔")
+
+
+@main.message(CommandStart())
+async def start_no_ref_handler(msg: Message):
+    me = msg.from_user
+    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}")
+    elif not user.ref_id:
+        await msg.answer(rr.capitalize())
+    else:
+        await msg.answer(f"{me.full_name}, не балуйтесь, вы и так уже активный участник👌🏼", reply_markup=home_btns)
+
+
+@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, 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}")
+    await cbq.message.answer(
+        f"Your referrer is {u.ref_id and u.ref.username}"
+        f"\nThis is your invite link: {link}"
+        f"\nGive it to your protege, and approve his request"
+    )
+    await cbq.answer("Wait for your protege request..")
+
+
+@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
+    blocked = my_chat_member.new_chat_member.status in ("left", "kicked")
+    await user_upsert(u, blocked)
+
+
+@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!"
+    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):
+    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)
+    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 await member.bot.send_message(member.new_chat_member.user.id, resp, reply_markup=rm)
+
+
+@main.message(F.is_topic_message)
+async def order_msg(msg: Message):
+    sender = await User[msg.from_user.id]
+    cid = msg.chat.shifted_id
+    assert sender.forum == cid, "sender is not client"
+    if order := await Order.get_or_none(taker__user_id=sender.id, taker_topic=msg.message_thread_id):
+        is_taker = True
+    elif order := await Order.get_or_none(ad__agent__user_id=sender.id, maker_topic=msg.message_thread_id):
+        is_taker = False
+    else:
+        return await msg.answer("No such order")
+        # raise Exception("No such order")
+    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.LEFT_CHAT_MEMBER,
+            # ContentType.SUPERGROUP_CHAT_CREATED,
+            # ContentType.NEW_CHAT_PHOTO,
+            # ContentType.FORUM_TOPIC_CREATED,
+            # ContentType.FORUM_TOPIC_EDITED,
+            ContentType.FORUM_TOPIC_CLOSED,
+            # ContentType.GENERAL_FORUM_TOPIC_HIDDEN, # deletable
+        }
+    )
+)
+async def del_cbq(msg: Message):
+    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.3/xync_bot/handlers/order.py

@@ -0,0 +1,12 @@
+from aiogram import Router, F
+from aiogram.types import Message
+from xync_schema.models import User
+
+r = Router()
+
+
+# @main.message(F.chat.is_forum)
+@r.message(F.is_topic_message)
+async def order_msg(msg: Message):
+    await User[msg.from_user.id]
+    msg.message_thread_id

xync_bot-0.3.3/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.1 → xync_bot-0.3.3/xync_bot.egg-info}/PKG-INFO

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

{xync_bot-0.3.1 → xync_bot-0.3.3}/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
@@ -13,4 +14,7 @@ xync_bot.egg-info/requires.txt
 xync_bot.egg-info/top_level.txt
 xync_bot/handlers/__init__.py
 xync_bot/handlers/main.py
-xync_bot/handlers/vpn.py
+xync_bot/handlers/order.py
+xync_bot/handlers/photo.py
+xync_bot/handlers/vpn.py
+xync_bot/handlers/xicon.png

xync_bot-0.3.1/xync_bot/handlers/main.py

@@ -1,146 +0,0 @@
-import logging
-from aiogram import Router, F
-from aiogram.filters import CommandStart, CommandObject
-from aiogram.filters.callback_data import CallbackData
-from aiogram.types import (
-    User as TgUser,
-    ChatMemberUpdated,
-    Message,
-    InlineKeyboardMarkup,
-    InlineKeyboardButton,
-    CallbackQuery,
-)
-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
-
-from xync_bot.shared import NavCallbackData
-
-main = Router()
-
-
-class RrCallbackData(CallbackData, prefix="reg_res"):  # registration response
-    to: int
-    res: bool
-
-
-home_btns = InlineKeyboardMarkup(
-    inline_keyboard=[
-        [
-            InlineKeyboardButton(text="Invite", callback_data=NavCallbackData(to="ref_link").pack()),
-            InlineKeyboardButton(text="Get VPN", callback_data=NavCallbackData(to="get_vpn").pack()),
-        ]
-    ]
-)
-
-
-@main.message(CommandStart(deep_link=True, deep_link_encoded=True))
-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)
-    rm = None
-    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)
-        await user.update_from_dict({"ref": ref}).save()
-        approve_btns = InlineKeyboardMarkup(
-            inline_keyboard=[
-                [
-                    InlineKeyboardButton(text="Отклонить", callback_data=RrCallbackData(to=user.id, res=False).pack()),
-                    InlineKeyboardButton(text="Одобрить", callback_data=RrCallbackData(to=user.id, res=True).pack()),
-                ]
-            ]
-        )
-        await msg.bot.send_message(
-            ref.id, f"{me.full_name} просит что б Вы взяли за него/ее ответственность", reply_markup=approve_btns
-        )
-        return await msg.answer(f"Please wait for @{ref.username} approving...")
-    return await msg.answer(rs, reply_markup=rm)
-
-
-@main.callback_query(RrCallbackData.filter())
-async def phrases_input_request(cb: CallbackQuery, callback_data: RrCallbackData) -> None:
-    protege = await User[callback_data.to]
-    if callback_data.res:
-        # protege.status = UserStatus.RESTRICTED
-        await protege.save()
-        rs = f"{cb.from_user.full_name}, теперь Вы несете ответветвенность за {protege.username}"
-    else:
-        rs = f'Вы отклонили запрос юзера "{protege.username}" на Вашу протекцию'
-    res = {True: "одобрил", False: "отклонил"}
-    txt = f"{cb.from_user.full_name} {res[callback_data.res]} вашу регистрацию"
-    txt, rm = (f"Поздравляем! {txt}💥", home_btns) if callback_data.res else (f"К сожалению {txt}😢", None)
-    await cb.bot.send_message(protege.id, txt, reply_markup=rm)
-    await cb.answer("👌🏼")
-    await cb.message.edit_text(rs)
-
-
-@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}")
-    # todo: alert to admins! Fraud attempt!
-    await msg.answer("🤔")
-
-
-@main.message(CommandStart())
-async def start_no_ref_handler(msg: Message):
-    me = msg.from_user
-    user, cr = await user_upsert(me)
-    rr = "сначала вы должны найти поручителя, и перейти по его реферальной ссылке.\nhttps://telegra.ph/XyncNet-02-13"
-    if cr:  # has ref and created now
-        await msg.answer(f"Здравствуйте {me.full_name}, что бы использовать возможности нашей сети, {rr}")
-    elif not user.ref_id:
-        await msg.answer(rr.capitalize())
-    else:
-        await msg.answer(f"{me.full_name}, не балуйтесь, вы и так уже активный участник👌🏼", reply_markup=home_btns)
-
-
-@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")):
-        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}")
-    await cbq.message.answer(
-        f"Your referrer is {u.ref_id and u.ref.username}"
-        f"\nThis is your invite link: {link}"
-        f"\nGive it to your protege, and approve his request"
-    )
-    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()
-async def user_set_status(my_chat_member: ChatMemberUpdated):
-    u: TgUser = my_chat_member.from_user
-    new_status = my_chat_member.new_chat_member.status
-    await user_upsert(u, status=new_status)
-
-
-@main.message()
-async def del_cbq(msg: Message):
-    await msg.delete()