xync-bot 0.2.10__py3-none-any.whl → 0.3.2__py3-none-any.whl

xync_bot/__init__.py

@@ -1,39 +0,0 @@
-from aiogram.client.default import DefaultBotProperties
-from aiogram.types import MenuButtonWebApp, WebAppInfo
-import logging
-from os import getenv as env
-from dotenv import load_dotenv
-from aiogram import Bot, Dispatcher
-from tortoise.backends.asyncpg import AsyncpgDBClient
-
-from xync_bot.handlers import main, vpn
-
-load_dotenv()
-
-logging.basicConfig(filemode='a', level=logging.DEBUG)
-
-bot = Bot(token=env('TOKEN'), default=DefaultBotProperties(parse_mode='Markdown'))
-dp = Dispatcher(bot=bot)
-
-
-async def on_startup(wh_url: str, twa_url: str, cn: AsyncpgDBClient, mbt: str = 'Go!'):
-    """ SET DEISPATCHER GLOBAL WORKFLOW DATA FOR DB Connection """
-    dp['dbc'] = cn
-    """ WEBHOOK SETUP """
-    webhook_info = await bot.get_webhook_info()
-    if webhook_info.url != wh_url:
-        await bot.set_webhook(url=wh_url, drop_pending_updates=True)
-    """ WEBAPP URL SETUP IN MENU """
-    await bot.set_chat_menu_button(menu_button=MenuButtonWebApp(text=mbt, web_app=WebAppInfo(url=twa_url)))
-
-
-async def on_shutdown():
-    """ CLOSE BOT SESSION """
-    await bot.delete_webhook(drop_pending_updates=True)
-    await bot.session.close()
-
-
-dp.startup.register(on_startup)
-dp.shutdown.register(on_shutdown)
-
-dp.include_routers(vpn, main)

xync_bot/handlers/__init__.py

@@ -1,2 +0,0 @@
-from xync_bot.handlers.vpn import vpn
-from xync_bot.handlers.main import main

xync_bot/handlers/main.py

@@ -1,11 +1,25 @@
 import logging
+from os import path
+
 from aiogram import Router, F
-from aiogram.filters import CommandStart, CommandObject
+from aiogram.enums import ContentType
+from aiogram.filters import CommandStart, CommandObject, IS_MEMBER, IS_NOT_MEMBER, ChatMemberUpdatedFilter
 from aiogram.filters.callback_data import CallbackData
-from aiogram.types import User as TgUser, ChatMemberUpdated, Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery
+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 aiogram.utils.web_app import WebAppUser
-from xync_schema.models import User, UserStatus, Lang
+from tg_auth import Lang
+from xync_schema.models import User, UserStatus, Order, Msg, Forum
 
 from xync_bot.shared import NavCallbackData
 
@@ -18,10 +32,13 @@ class RrCallbackData(CallbackData, prefix="reg_res"):  # registration response
 
 
 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()),
-    ]])
+    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))
@@ -31,19 +48,24 @@ async def start_handler(msg: Message, command: CommandObject):
     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
+        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}😬'
+        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()
+        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...')
+            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)
 
 
@@ -53,65 +75,162 @@ async def phrases_input_request(cb: CallbackQuery, callback_data: RrCallbackData
     if callback_data.res:
         # protege.status = UserStatus.RESTRICTED
         await protege.save()
-        rs = f'{cb.from_user.full_name}, теперь Вы несете ответветвенность за {protege.username}'
+        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)
+    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.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}')
+    logging.info(f"Start: {msg.from_user.id}. Msg: {msg}")
     # todo: alert to admins! Fraud attempt!
-    await msg.answer('🤔')
+    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'
+    rr = "сначала вы должны найти поручителя, и перейти по его реферальной ссылке.\nhttps://telegra.ph/XyncNet-02-13"
     if cr:  # has ref and created now
-        await msg.answer(f'Здравствуйте {me.full_name}, что бы использовать возможности нашей сети, {rr}')
+        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)
+        await msg.answer(f"{me.full_name}, не балуйтесь, вы и так уже активный участник👌🏼", reply_markup=home_btns)
 
 
-@main.callback_query(NavCallbackData.filter(F.to == 'ref_link'))
+@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, 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..')
+    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}
+    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})
+        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
+    new_status = UserStatus[my_chat_member.new_chat_member.status.upper()]
     await user_upsert(u, status=new_status)
 
 
-@main.message()
+@main.chat_member(ChatMemberUpdatedFilter(IS_MEMBER >> IS_NOT_MEMBER))
+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!"
+    return await member.bot.send_message(member.new_chat_member.user.id, resp)
+
+
+@main.chat_join_request()
+async def on_join_request(req: ChatJoinRequest):
+    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!"
+        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))
+async def on_user_join(member: ChatMemberUpdated):
+    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):
+            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)
+    else:
+        resp = "Welcome to XyncNetwork"
+        rm = InlineKeyboardMarkup(
+            inline_keyboard=[[InlineKeyboardButton(text="Go!", web_app=WebAppInfo(url="https://t.me/XyncNetBot/test"))]]
+        )
+    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.agent.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)
+    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.LEFT_CHAT_MEMBER,
+            ContentType.SUPERGROUP_CHAT_CREATED,
+            ContentType.NEW_CHAT_PHOTO,
+            # ContentType.FORUM_TOPIC_CREATED,
+            # ContentType.FORUM_TOPIC_EDITED,
+            # ContentType.FORUM_TOPIC_CLOSED,
+        }
+    )
+)
 async def del_cbq(msg: Message):
     await msg.delete()

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.2.10.dist-info → xync_bot-0.3.2.dist-info}/METADATA

@@ -1,16 +1,17 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: xync-bot
-Version: 0.2.10
+Version: 0.3.2
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
-License: MIT
+License: EULA
 Project-URL: Homepage, https://gitlab.com/xync/back/tg-bot
 Project-URL: Repository, https://gitlab.com/xync/back/tg-bot
 Keywords: aiogram,xync-net
-Requires-Python: >=3.11
+Requires-Python: >=3.12
 Description-Content-Type: text/markdown
-Requires-Dist: aiogram
-Requires-Dist: python-dotenv
-Requires-Dist: xn-api
 Requires-Dist: xync-schema
-
+Provides-Extra: dev
+Requires-Dist: pytest; extra == "dev"
+Requires-Dist: python-dotenv; extra == "dev"
+Requires-Dist: build; extra == "dev"
+Requires-Dist: twine; extra == "dev"

xync_bot-0.3.2.dist-info/RECORD

@@ -0,0 +1,11 @@
+xync_bot/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_bot/shared.py,sha256=MlKkTrsT29l7fF6-qAN9FO14cSuXuOuYxbNY5F4S2w4,137
+xync_bot/handlers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xync_bot/handlers/main.py,sha256=WOaPXjsZ40xUPZi6EHeew-ttee_qxLACt1uVjPC0Ll0,9565
+xync_bot/handlers/order.py,sha256=ZKWDLyiWrXzcR-aHKLBTBCACwp-P0Vvnr22T-EuLHaM,274
+xync_bot/handlers/vpn.py,sha256=qKK55UrjEZeDvu7ljWXNUFBFgXTPTIEaCT2OAmKWky4,2219
+xync_bot/handlers/xicon.png,sha256=O57_kvzhVcCXSoGYZ61m0dW9pizY6gxR8Yj5aeCP0RQ,429283
+xync_bot-0.3.2.dist-info/METADATA,sha256=FwJVU_5hg8oePhgsNeCMiS3b3VThxcpOwLDGZIAh-EE,575
+xync_bot-0.3.2.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+xync_bot-0.3.2.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
+xync_bot-0.3.2.dist-info/RECORD,,

{xync_bot-0.2.10.dist-info → xync_bot-0.3.2.dist-info}/WHEEL

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

xync_bot-0.2.10.dist-info/RECORD

@@ -1,9 +0,0 @@
-xync_bot/__init__.py,sha256=A4PNsNVDgj5Cg4nIAhyhWbWLODalM3xQyrAzM6Cl2n0,1238
-xync_bot/shared.py,sha256=MlKkTrsT29l7fF6-qAN9FO14cSuXuOuYxbNY5F4S2w4,137
-xync_bot/handlers/__init__.py,sha256=lGPndTeEl1oLFMzFMtKNG2XLL8IecUFj1YIGzkZ55M8,78
-xync_bot/handlers/main.py,sha256=AfWoTjBk_kzZCkR_7XfWYzWT2KV9ni_7TguRiJzxGcg,5757
-xync_bot/handlers/vpn.py,sha256=qKK55UrjEZeDvu7ljWXNUFBFgXTPTIEaCT2OAmKWky4,2219
-xync_bot-0.2.10.dist-info/METADATA,sha256=1CsOEupFK5oWlKfBtCFbqDmqUGT9yYAj4gPnTCClVAI,473
-xync_bot-0.2.10.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-xync_bot-0.2.10.dist-info/top_level.txt,sha256=O2IjMc1ryAf0rwIXWohSNT5Kzcs9johgKRDz8lCC0rs,9
-xync_bot-0.2.10.dist-info/RECORD,,