xync-bot 0.3.27__tar.gz → 0.3.29__tar.gz

{xync_bot-0.3.27/xync_bot.egg-info → xync_bot-0.3.29}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.27
+Version: 0.3.29
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License-Expression: GPL-3.0-or-later

xync_bot-0.3.29/xync_bot/__init__.py

@@ -0,0 +1,28 @@
+from PGram import Bot
+from aiogram.client.default import DefaultBotProperties
+from aiogram.enums import UpdateType
+
+from xync_bot.store import Store
+from xync_bot.routers import last
+from xync_bot.routers.main.handler import mr
+from xync_bot.routers.pay.handler import pr
+from xync_bot.routers.cond import cr
+from xync_bot.routers.send import sd
+
+
+au = [
+    UpdateType.MESSAGE,
+    UpdateType.CALLBACK_QUERY,
+    UpdateType.CHAT_MEMBER,
+    UpdateType.MY_CHAT_MEMBER,
+]  # , UpdateType.CHAT_JOIN_REQUEST
+
+
+class XyncBot(Bot):
+    def __init__(self, token, cn):
+        super().__init__(token, cn, [sd, cr, pr, mr, last], Store(), DefaultBotProperties(parse_mode="HTML"))
+
+    async def start(self, wh_host: str = None):
+        await super().start(au, wh_host)
+        self.dp.workflow_data["store"].glob = await Store.Global()  # todo: refact store loading
+        return self

{xync_bot-0.3.27 → xync_bot-0.3.29}/xync_bot/__main__.py

@@ -3,7 +3,6 @@ from asyncio import run
 
 from PGram import Bot
 from aiogram.client.default import DefaultBotProperties
-from aiogram.enums import UpdateType
 from x_model import init_db
 
 from xync_bot.store import Store
@@ -12,26 +11,19 @@ from xync_bot.routers.cond import cr
 from xync_bot.routers.pay.handler import pr
 from xync_bot.routers import last
 from xync_bot.routers.send import sd
+from xync_bot.loader import TOKEN
 
-au = [
-    UpdateType.MESSAGE,
-    UpdateType.CALLBACK_QUERY,
-    UpdateType.CHAT_MEMBER,
-    UpdateType.MY_CHAT_MEMBER,
-]  # , UpdateType.CHAT_JOIN_REQUEST
-bot = Bot([sd, cr, pr, mr, last], Store(), au, default=DefaultBotProperties(parse_mode="HTML"))
 
 if __name__ == "__main__":
-    from xync_bot.loader import TOKEN, TORM
+    from xync_bot.loader import TORM
 
     logging.basicConfig(level=logging.INFO)
 
     async def main() -> None:
         cn = await init_db(TORM)
+        bot = Bot(TOKEN, cn, [sd, cr, pr, mr, last], DefaultBotProperties(parse_mode="HTML"))
+
+        await bot.start()
         bot.dp.workflow_data["store"].glob = await Store.Global()  # todo: refact store loading
-        await bot.start(
-            TOKEN,
-            cn,
-        )
 
     run(main())

{xync_bot-0.3.27 → xync_bot-0.3.29}/xync_bot/routers/main/handler.py

@@ -75,6 +75,8 @@ async def arg_handler(msg: Message, command: CommandObject):
     arg: dict[str, int | str] = {"id": int(command.args)} if command.args.isnumeric() else {"username": command.args}
     if ref := await models.Username.get_or_none(**arg):
         txt = f"Вас пригласил {ref.username and '@'+ref.username or ref.id}, бонус: комиссия 0% на первые $100 000"
+    else:
+        txt = f"Привет, {msg.from_user.full_name}! \nWelcome бонус: комиссия 0% на первые $10 000"
     await msg.answer(txt, reply_markup=rm, parse_mode="Markdown")
 
 

{xync_bot-0.3.27 → xync_bot-0.3.29/xync_bot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: xync-bot
-Version: 0.3.27
+Version: 0.3.29
 Summary: Telegram bot with web app for xync net
 Author-email: Artemiev <mixartemev@gmail.com>
 License-Expression: GPL-3.0-or-later

{xync_bot-0.3.27 → xync_bot-0.3.29}/xync_bot.egg-info/SOURCES.txt

@@ -5,6 +5,7 @@ makefile
 pager.py
 pyproject.toml
 test_main.http
+xync_bot/__init__.py
 xync_bot/__main__.py
 xync_bot/loader.py
 xync_bot/shared.py