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

xync_bot-0.3.1/.env.dist

@@ -0,0 +1,4 @@
+WH_DOMAIN=https://
+TWA_DOMAIN=https://
+TOKEN=
+DB_URL=postgres://user:pwd@host/db_name

xync_bot-0.3.1/.gitignore

@@ -0,0 +1,8 @@
+/.idea
+/venv
+/.env
+__pycache__
+*.pyc
+*.egg-info
+/build
+/dist

xync_bot-0.3.1/.pre-commit-config.yaml

@@ -0,0 +1,36 @@
+repos:
+- repo: local
+  hooks:
+  - id: tag
+    name: tag
+    ### make tag with next ver only if "fix" in commit_msg or starts with "feat"
+    entry: bash -c 'grep -e ^feat -e fix .git/COMMIT_EDITMSG && make patch || exit 0'
+    language: system
+    verbose: true
+    pass_filenames: false
+    always_run: true
+    stages: [post-commit]
+
+  - id: build
+    name: build
+    ### build & upload package only for "main" branch push
+    entry: bash -c 'echo $PRE_COMMIT_LOCAL_BRANCH | grep /main && make build || echo 0'
+    language: system
+    pass_filenames: false
+    verbose: true
+    require_serial: true
+    stages: [pre-push]
+
+- repo: https://github.com/astral-sh/ruff-pre-commit
+  ### Ruff version.
+  rev: v0.6.4
+  hooks:
+    ### Run the linter.
+    - id: ruff
+      args: [--fix, --unsafe-fixes]
+      stages: [pre-commit]
+    ### Run the formatter.
+    - id: ruff-format
+      types_or: [python, pyi]
+      verbose: true
+      stages: [pre-commit]

{xync_bot-0.2.10 → xync_bot-0.3.1}/PKG-INFO

@@ -1,15 +1,17 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: xync-bot
-Version: 0.2.10
+Version: 0.3.1
 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.1/makefile

@@ -0,0 +1,24 @@
+include .env
+PACKAGE := xync_bot
+VPYTHON := $(VENV)/bin/python
+
+.PHONY: all install pre-commit clean build twine patch
+
+all:
+	make install clean build
+
+install: $(VENV)
+	$(VPYTHON) -m pip install .[dev]; make pre-commit
+pre-commit: .pre-commit-config.yaml
+	pre-commit install -t pre-commit -t post-commit -t pre-push
+
+clean: dist $(PACKAGE).egg-info
+	rm -rf dist/* $(PACKAGE).egg-info $(PACKAGE)/__pycache__ dist/__pycache__
+
+build: $(VENV)
+	$(VPYTHON) -m build; make twine
+twine: dist
+	$(VPYTHON) -m twine upload dist/* --skip-existing
+
+patch:
+	git tag `$(VPYTHON) -m setuptools_scm --strip-dev`; git push --tags --prune -f

xync_bot-0.3.1/pyproject.toml

@@ -0,0 +1,42 @@
+[project]
+name = "xync-bot"
+requires-python = ">=3.12"
+authors = [
+    {name = "Artemiev", email = "mixartemev@gmail.com"},
+]
+keywords = ["aiogram", "xync-net"]
+description = "Telegram bot with web app for xync net"
+readme = "README.md"
+license = {text = "EULA"}
+dynamic = ["version"]
+dependencies = [
+    "xync-schema",
+]
+[project.optional-dependencies]
+dev = [
+    "pytest",
+    "python-dotenv",
+    "build",
+    "twine",
+]
+
+[project.urls]
+Homepage = "https://gitlab.com/xync/back/tg-bot"
+Repository = "https://gitlab.com/xync/back/tg-bot"
+
+[build-system]
+requires = ["setuptools>=64", "setuptools-scm[toml]>=8"]
+build-backend = "setuptools.build_meta"
+[tool.setuptools_scm]
+version_scheme = "python-simplified-semver" # if "feature" in `branch_name` SEMVER_MINOR++ else SEMVER_PATCH++
+local_scheme = "no-local-version"
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
+
+[tool.ruff]
+line-length = 120
+
+[tool.setuptools]
+packages = ["xync_bot", "xync_bot.handlers"]

xync_bot-0.3.1/test_main.http

@@ -0,0 +1,9 @@
+# Test your FastAPI endpoints
+
+GET http://127.0.0.1:8000/
+Accept: application/json
+###
+
+GET http://127.0.0.1:8000/hello/User
+Accept: application/json
+###

{xync_bot-0.2.10 → xync_bot-0.3.1}/xync_bot/handlers/main.py

@@ -2,10 +2,18 @@ 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.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 xync_schema.models import User, UserStatus, Lang
+from tg_auth import Lang
+from xync_schema.models import User, UserStatus
 
 from xync_bot.shared import NavCallbackData
 
@@ -18,10 +26,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 +42,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,55 +69,68 @@ 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)
 
 

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

@@ -1,15 +1,17 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: xync-bot
-Version: 0.2.10
+Version: 0.3.1
 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.2.10 → xync_bot-0.3.1}/xync_bot.egg-info/SOURCES.txt

@@ -1,4 +1,9 @@
+.env.dist
+.gitignore
+.pre-commit-config.yaml
+makefile
 pyproject.toml
+test_main.http
 xync_bot/__init__.py
 xync_bot/shared.py
 xync_bot.egg-info/PKG-INFO

{xync_bot-0.2.10 → xync_bot-0.3.1}/xync_bot.egg-info/requires.txt

@@ -1,4 +1,7 @@
-aiogram
-python-dotenv
-xn-api
 xync-schema
+
+[dev]
+pytest
+python-dotenv
+build
+twine

xync_bot-0.2.10/pyproject.toml

@@ -1,24 +0,0 @@
-[project]
-name = "xync-bot"
-requires-python = ">=3.11"
-authors = [
-    {name = "Artemiev", email = "mixartemev@gmail.com"},
-]
-keywords = ["aiogram", "xync-net"]
-description = "Telegram bot with web app for xync net"
-readme = "README.md"
-license = {text = "MIT"}
-dependencies = [
-    "aiogram",
-    "python-dotenv",
-    "xn-api",
-    "xync-schema",
-]
-version = "0.2.10"
-
-[project.urls]
-Homepage = "https://gitlab.com/xync/back/tg-bot"
-Repository = "https://gitlab.com/xync/back/tg-bot"
-
-[tool.setuptools]
-packages = ["xync_bot", "xync_bot.handlers"]

xync_bot-0.2.10/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-0.2.10/xync_bot/handlers/__init__.py

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