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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xync-bot
-Version: 0.3.1
+Version: 0.3.2
 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.2}/xync_bot/handlers/main.py

@@ -1,6 +1,9 @@
 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,
@@ -9,11 +12,14 @@ from aiogram.types import (
     InlineKeyboardMarkup,
     InlineKeyboardButton,
     CallbackQuery,
+    ChatJoinRequest,
+    WebAppInfo,
+    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
+from xync_schema.models import User, UserStatus, Order, Msg, Forum
 
 from xync_bot.shared import NavCallbackData
 
@@ -137,10 +143,94 @@ async def user_upsert(u: TgUser | WebAppUser, status: UserStatus = None) -> (Use
 @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-0.3.2/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.1 → xync_bot-0.3.2/xync_bot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: xync-bot
-Version: 0.3.1
+Version: 0.3.2
 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.2}/xync_bot.egg-info/SOURCES.txt

@@ -13,4 +13,6 @@ 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/vpn.py
+xync_bot/handlers/xicon.png