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

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

@@ -1,17 +1,19 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.4
+Version: 0.3.6
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
-License: EULA
+License-Expression: GPL-3.0-or-later
 Project-URL: Homepage, https://gitlab.com/xync/back/tg-bot
 Project-URL: Repository, https://gitlab.com/xync/back/tg-bot
-Keywords: aiogram,xync-net
+Keywords: aiogram,cyrtranslit,xync-net
 Requires-Python: >=3.12
-Description-Content-Type: text/markdown
 Requires-Dist: xync-schema
 Provides-Extra: dev
+Requires-Dist: PGram; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: python-dotenv; extra == "dev"
+Requires-Dist: setuptools-scm; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"

{xync_bot-0.3.4 → xync_bot-0.3.6}/pyproject.toml

@@ -4,18 +4,21 @@ requires-python = ">=3.12"
 authors = [
     {name = "Artemiev", email = "mixartemev@gmail.com"},
 ]
-keywords = ["aiogram", "xync-net"]
+keywords = ["aiogram", "cyrtranslit", "xync-net"]
 description = "Telegram bot with web app for xync net"
-readme = "README.md"
-license = {text = "EULA"}
+#readme = "README.md"
+license = "GPL-3.0-or-later"
 dynamic = ["version"]
 dependencies = [
     "xync-schema",
 ]
 [project.optional-dependencies]
 dev = [
+    "PGram",
+    "pre-commit",
     "pytest",
     "python-dotenv",
+    "setuptools-scm",
     "build",
     "twine",
 ]
@@ -39,4 +42,4 @@ asyncio_default_fixture_loop_scope = "function"
 line-length = 120
 
 [tool.setuptools]
-packages = ["xync_bot", "xync_bot.handlers"]
+packages = ["xync_bot"]

xync_bot-0.3.6/xync_bot/__init__.py

@@ -0,0 +1,20 @@
+import logging
+from asyncio import run
+
+from PGram import Bot
+from aiogram.client.default import DefaultBotProperties
+from x_model import init_db
+
+from xync_bot.routers.cond import r
+
+if __name__ == '__main__':
+    from xync_bot.loader import dp, TOKEN, TORM
+
+    logging.basicConfig(level=logging.INFO)
+
+    async def main() -> None:
+        cn = await init_db(TORM)
+        bot = Bot(TOKEN, [r], cn, default=DefaultBotProperties(parse_mode='HTML'))
+        await bot.start()
+
+    run(main())

xync_bot-0.3.6/xync_bot/loader.py

@@ -0,0 +1,26 @@
+from aiogram import Bot, Dispatcher
+# from aiogram.client.default import DefaultBotProperties
+from dotenv import load_dotenv
+from os import getenv as env
+
+from xync_schema import models
+
+load_dotenv()
+
+PG_DSN = (
+    f"postgres://{env('POSTGRES_USER')}:{env('POSTGRES_PASSWORD')}@{env('POSTGRES_HOST', 'dbs')}"
+    f":{env('POSTGRES_PORT', 5432)}/{env('POSTGRES_DB', env('POSTGRES_USER'))}"
+)
+TOKEN = env("TOKEN")
+# API_URL = "https://" + env("API_DOMAIN")
+# WH_URL = API_URL + "/wh/" + TOKEN
+
+bot: Bot = Bot(token=TOKEN)  # , default=DefaultBotProperties(parse_mode="HTML")
+dp: Dispatcher = Dispatcher(bot=bot)
+
+TORM = {
+    "connections": {"default": PG_DSN},
+    "apps": {"models": {"models": [models, "aerich.models"]}},
+    "use_tz": False,
+    "timezone": "UTC",
+}

xync_bot-0.3.6/xync_bot/routers/cond/__init__.py

@@ -0,0 +1,153 @@
+import re
+from asyncio import iscoroutinefunction
+from enum import IntEnum
+from inspect import isclass
+from typing import Coroutine
+
+from aiogram import Router, F
+from aiogram.filters import CommandStart
+from aiogram.fsm.context import FSMContext
+from aiogram.types import Message, ReplyKeyboardMarkup, KeyboardButton, InlineKeyboardMarkup, InlineKeyboardButton, \
+    CallbackQuery, ReplyKeyboardRemove
+from cyrtranslit import to_latin
+from xync_schema import models
+from xync_schema.enums import SynonymType, Party, Slip, AbuserType, NameType, Boundary
+
+r = Router()
+
+async def wrap_cond(txt: str):
+    bnks = await models.Synonym.filter(typ=SynonymType.bank)
+    bnks = '|'.join('\\b'+b.txt+('\\b' if b.boundary&Boundary.right else '') for b in bnks)
+    for syn in await models.Synonym.all():
+        lb, rb = "\\b" if syn.boundary&Boundary.left else "", "\\b" if syn.boundary&Boundary.right else ""
+        if syn.typ == SynonymType.bank_side:
+            syn.txt.replace('#banks#', f'({bnks})')
+        if syn.is_re or syn.txt in txt:
+            pattern = re.compile(lb+syn.txt+rb)
+            if match := re.search(pattern, txt):
+                g = match.group()
+                val, hval = await get_val(syn.typ, syn.val)
+                val = syn.typ.name + (f'="{hval}"' if hval else '')
+                txt = re.sub(pattern, f"<code>{g}</code><tg-spoiler>[{val}]</tg-spoiler>", txt)
+    return txt
+
+async def cbanks(bnid: str) -> list[tuple[int, str]]:
+    beginning = to_latin(bnid[:2], lang_code='ru')
+    return await models.Pm.filter(norm__startswith=beginning, bank=True).values_list('id', 'norm')
+
+async def cppo(txt: str) -> list[tuple[int, str]]:
+    opts = re.findall(r'\d+', txt) or [1, 2, 3, 5, 10]
+    return [(o, str(o)) for o in opts]
+
+synopts: dict[SynonymType, list[str] | type(IntEnum) | None | Coroutine] = {
+    SynonymType.name: ["not_slavic", "slavic"],
+    SynonymType.ppo: cppo,
+    SynonymType.from_party: Party,
+    SynonymType.to_party: Party,
+    SynonymType.slip_req: Slip,
+    SynonymType.slip_send: Slip,
+    SynonymType.abuser: AbuserType,
+    SynonymType.scale: ["1", "10", "100", "1000"],
+    SynonymType.slavic: NameType,
+    SynonymType.mtl_like: None,
+    SynonymType.bank: cbanks,
+    SynonymType.bank_side: ["except", "only"],
+}
+rkm = ReplyKeyboardMarkup(keyboard=[
+    [KeyboardButton(text="ppo"), KeyboardButton(text="abuser")],
+    [KeyboardButton(text="from_party"), KeyboardButton(text="to_party")],
+    [KeyboardButton(text="slip_send"), KeyboardButton(text="slip_req")],
+    [KeyboardButton(text="name"), KeyboardButton(text="slavic")],
+    [KeyboardButton(text="scale"), KeyboardButton(text="mtl_like")],
+    [KeyboardButton(text="bank"), KeyboardButton(text="bank_side")],
+], one_time_keyboard=True)
+
+async def get_val(typ: SynonymType.__class__, val: str) -> tuple[SynonymType | int | bool, str]:
+    if isinstance(val, str) and val.isnumeric():
+        val = int(val)
+    if isclass(lst := synopts[typ]) and issubclass(lst, IntEnum):
+        return (v:=lst(val)), v.name
+    elif isinstance(lst, list):
+        return val, lst[val]
+    elif typ == SynonymType.bank:
+        return val, (await models.Pm[val]).norm
+    return val, val
+
+async def btns(typ: SynonymType.__class__, txt: str = None) -> InlineKeyboardMarkup | None:
+    if lst := synopts[typ]:
+        if isinstance(lst, list):
+            kb = [[InlineKeyboardButton(text=n, callback_data=f'st:{typ.name}:{i}')] for i, n in enumerate(lst)]
+        elif isclass(lst) and issubclass(lst, IntEnum):
+            kb = [[InlineKeyboardButton(text=i.name, callback_data=f'st:{typ.name}:{i.value}')] for i in lst]
+        else:
+            kb = [[InlineKeyboardButton(text=n, callback_data=f'st:{typ.name}:{i}')] for i, n in await lst(txt)]
+        return InlineKeyboardMarkup(inline_keyboard=kb)
+    else:
+        return lst
+
+@r.message(CommandStart())
+async def start(msg: Message, state: FSMContext):
+    cond = await models.Cond.filter(parsed__isnull=True).order_by("-created_at").first().prefetch_related('parsed')
+    await state.set_data({"cid": cond.id, "cond_txt": cond.raw_txt})
+    await msg.reply(await wrap_cond(cond.raw_txt), reply_markup=rkm)
+
+
+@r.message(F.quote)
+async def got_synonym(msg: Message, state: FSMContext):
+    if not (msg.text in {st.name for st in SynonymType} and SynonymType[msg.text]):
+        return await msg.reply_text(f'Нет раздела "{msg.text}", не пиши текст сам, выдели кусок из моего сообщения,'
+                                    f'ответь на него, выбери кнопку раздела')
+    if not msg.quote:
+        return await msg.reply_text(f'Вы забыли выделить кусок текста для {msg.text}')
+    if typ := SynonymType[msg.text]:
+        await state.update_data({"syntext": msg.quote.text, "cmsg": msg.reply_to_message})
+        await models.Synonym.update_or_create({"typ": typ}, txt=msg.quote.text)
+        if rm := await btns(typ, msg.quote.text):
+            return await msg.answer("Уточните", reply_markup=rm, reply_to_message_id=msg.message_id)
+        await syn_result(msg, f'st:{typ.name}:1', state)
+    return None
+
+@r.callback_query()
+async def got_synonym_val(cbq: CallbackQuery, state: FSMContext):
+    await syn_result(cbq.message, cbq.data, state)
+
+async def syn_result(msg: Message, data: str, state: FSMContext):
+    t, st, sv = data.split(':')
+    if t == "st":
+        typ = SynonymType[st]
+        val, hval = await get_val(typ, sv)
+        syntext = await state.get_value('syntext')
+        cid = await state.get_value('cid')
+        syn, _ = await models.Synonym.update_or_create({"val": val}, typ=typ, txt=syntext)
+        await models.CondParsed.update_or_create({typ.name: val}, cond_id=cid)
+        await msg.reply(
+            f'Текст "{syntext}" определен как синоним для `{typ.name}` со значением {hval}',
+            reply_markup=InlineKeyboardMarkup(inline_keyboard=[[
+                InlineKeyboardButton(text='Готово! Давай новый', callback_data=f'cond:complete:{cid}'),
+                InlineKeyboardButton(text='Продолжить с этим текстом', callback_data=f'cond:process:{cid}')
+            ]])
+        )
+        # await msg.reply_to_message.delete()
+        # await msg.delete()
+        # await cmsg.edit_text(wrapped_txt)
+
+    elif t == "cond":
+        if st == 'complete':
+            await models.CondParsed.update_or_create({"parsed": True}, cond_id=int(sv))
+            await start(msg, state)
+        else:
+            wrapped_txt = await wrap_cond(await state.get_value('cond_txt'))
+            # cmsg: Message = await state.get_value('cmsg')
+            await msg.reply(wrapped_txt, reply_markup=rkm)
+    else:
+        await msg.reply("Где я?")
+
+@r.message(F.reply_to_message)
+async def clear(msg: Message):
+    await msg.reply_to_message.delete_reply_markup()
+    await msg.delete()
+
+@r.message()
+async def unknown(msg: Message):
+    # user = await User.get(username_id=msg.from_user.id)
+    await msg.delete()

{xync_bot-0.3.4/xync_bot/handlers → xync_bot-0.3.6/xync_bot/routers}/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)})
     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:
+        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.4 → xync_bot-0.3.6/xync_bot.egg-info}/PKG-INFO

@@ -1,17 +1,19 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.4
+Version: 0.3.6
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
-License: EULA
+License-Expression: GPL-3.0-or-later
 Project-URL: Homepage, https://gitlab.com/xync/back/tg-bot
 Project-URL: Repository, https://gitlab.com/xync/back/tg-bot
-Keywords: aiogram,xync-net
+Keywords: aiogram,cyrtranslit,xync-net
 Requires-Python: >=3.12
-Description-Content-Type: text/markdown
 Requires-Dist: xync-schema
 Provides-Extra: dev
+Requires-Dist: PGram; extra == "dev"
+Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: python-dotenv; extra == "dev"
+Requires-Dist: setuptools-scm; extra == "dev"
 Requires-Dist: build; extra == "dev"
 Requires-Dist: twine; extra == "dev"

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

@@ -5,16 +5,19 @@ makefile
 pyproject.toml
 test_main.http
 xync_bot/__init__.py
+xync_bot/loader.py
 xync_bot/shared.py
-xync_bot/types.py
+xync_bot/typs.py
 xync_bot.egg-info/PKG-INFO
 xync_bot.egg-info/SOURCES.txt
 xync_bot.egg-info/dependency_links.txt
 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/order.py
-xync_bot/handlers/photo.py
-xync_bot/handlers/vpn.py
-xync_bot/handlers/xicon.png
+xync_bot/routers/__init__.py
+xync_bot/routers/main.py
+xync_bot/routers/order.py
+xync_bot/routers/photo.py
+xync_bot/routers/vpn.py
+xync_bot/routers/xicon.png
+xync_bot/routers/cond/__init__.py
+xync_bot/routers/cond/cond.py

{xync_bot-0.3.4 → xync_bot-0.3.6}/xync_bot.egg-info/requires.txt

@@ -1,7 +1,10 @@
 xync-schema
 
 [dev]
+PGram
+pre-commit
 pytest
 python-dotenv
+setuptools-scm
 build
 twine