xync-bot 0.2.10__tar.gz → 0.3.2__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of xync-bot might be problematic. Click here for more details.
- xync_bot-0.3.2/.env.dist +4 -0
- xync_bot-0.3.2/.gitignore +8 -0
- xync_bot-0.3.2/.pre-commit-config.yaml +36 -0
- {xync_bot-0.2.10 → xync_bot-0.3.2}/PKG-INFO +9 -7
- xync_bot-0.3.2/makefile +24 -0
- xync_bot-0.3.2/pyproject.toml +42 -0
- xync_bot-0.3.2/test_main.http +9 -0
- xync_bot-0.3.2/xync_bot/__init__.py +0 -0
- xync_bot-0.3.2/xync_bot/handlers/__init__.py +0 -0
- xync_bot-0.3.2/xync_bot/handlers/main.py +236 -0
- xync_bot-0.3.2/xync_bot/handlers/order.py +12 -0
- xync_bot-0.3.2/xync_bot/handlers/xicon.png +0 -0
- {xync_bot-0.2.10 → xync_bot-0.3.2}/xync_bot.egg-info/PKG-INFO +9 -7
- {xync_bot-0.2.10 → xync_bot-0.3.2}/xync_bot.egg-info/SOURCES.txt +8 -1
- {xync_bot-0.2.10 → xync_bot-0.3.2}/xync_bot.egg-info/requires.txt +6 -3
- xync_bot-0.2.10/pyproject.toml +0 -24
- xync_bot-0.2.10/xync_bot/__init__.py +0 -39
- xync_bot-0.2.10/xync_bot/handlers/__init__.py +0 -2
- xync_bot-0.2.10/xync_bot/handlers/main.py +0 -117
- {xync_bot-0.2.10 → xync_bot-0.3.2}/setup.cfg +0 -0
- {xync_bot-0.2.10 → xync_bot-0.3.2}/xync_bot/handlers/vpn.py +0 -0
- {xync_bot-0.2.10 → xync_bot-0.3.2}/xync_bot/shared.py +0 -0
- {xync_bot-0.2.10 → xync_bot-0.3.2}/xync_bot.egg-info/dependency_links.txt +0 -0
- {xync_bot-0.2.10 → xync_bot-0.3.2}/xync_bot.egg-info/top_level.txt +0 -0
xync_bot-0.3.2/.env.dist
ADDED
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
repos:
|
|
2
|
+
- repo: local
|
|
3
|
+
hooks:
|
|
4
|
+
- id: tag
|
|
5
|
+
name: tag
|
|
6
|
+
### make tag with next ver only if "fix" in commit_msg or starts with "feat"
|
|
7
|
+
entry: bash -c 'grep -e ^feat -e fix .git/COMMIT_EDITMSG && make patch || exit 0'
|
|
8
|
+
language: system
|
|
9
|
+
verbose: true
|
|
10
|
+
pass_filenames: false
|
|
11
|
+
always_run: true
|
|
12
|
+
stages: [post-commit]
|
|
13
|
+
|
|
14
|
+
- id: build
|
|
15
|
+
name: build
|
|
16
|
+
### build & upload package only for "main" branch push
|
|
17
|
+
entry: bash -c 'echo $PRE_COMMIT_LOCAL_BRANCH | grep /main && make build || echo 0'
|
|
18
|
+
language: system
|
|
19
|
+
pass_filenames: false
|
|
20
|
+
verbose: true
|
|
21
|
+
require_serial: true
|
|
22
|
+
stages: [pre-push]
|
|
23
|
+
|
|
24
|
+
- repo: https://github.com/astral-sh/ruff-pre-commit
|
|
25
|
+
### Ruff version.
|
|
26
|
+
rev: v0.6.4
|
|
27
|
+
hooks:
|
|
28
|
+
### Run the linter.
|
|
29
|
+
- id: ruff
|
|
30
|
+
args: [--fix, --unsafe-fixes]
|
|
31
|
+
stages: [pre-commit]
|
|
32
|
+
### Run the formatter.
|
|
33
|
+
- id: ruff-format
|
|
34
|
+
types_or: [python, pyi]
|
|
35
|
+
verbose: true
|
|
36
|
+
stages: [pre-commit]
|
|
@@ -1,15 +1,17 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.2
|
|
2
2
|
Name: xync-bot
|
|
3
|
-
Version: 0.2
|
|
3
|
+
Version: 0.3.2
|
|
4
4
|
Summary: Telegram bot with web app for xync net
|
|
5
5
|
Author-email: Artemiev <mixartemev@gmail.com>
|
|
6
|
-
License:
|
|
6
|
+
License: EULA
|
|
7
7
|
Project-URL: Homepage, https://gitlab.com/xync/back/tg-bot
|
|
8
8
|
Project-URL: Repository, https://gitlab.com/xync/back/tg-bot
|
|
9
9
|
Keywords: aiogram,xync-net
|
|
10
|
-
Requires-Python: >=3.
|
|
10
|
+
Requires-Python: >=3.12
|
|
11
11
|
Description-Content-Type: text/markdown
|
|
12
|
-
Requires-Dist: aiogram
|
|
13
|
-
Requires-Dist: python-dotenv
|
|
14
|
-
Requires-Dist: xn-api
|
|
15
12
|
Requires-Dist: xync-schema
|
|
13
|
+
Provides-Extra: dev
|
|
14
|
+
Requires-Dist: pytest; extra == "dev"
|
|
15
|
+
Requires-Dist: python-dotenv; extra == "dev"
|
|
16
|
+
Requires-Dist: build; extra == "dev"
|
|
17
|
+
Requires-Dist: twine; extra == "dev"
|
xync_bot-0.3.2/makefile
ADDED
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
include .env
|
|
2
|
+
PACKAGE := xync_bot
|
|
3
|
+
VPYTHON := $(VENV)/bin/python
|
|
4
|
+
|
|
5
|
+
.PHONY: all install pre-commit clean build twine patch
|
|
6
|
+
|
|
7
|
+
all:
|
|
8
|
+
make install clean build
|
|
9
|
+
|
|
10
|
+
install: $(VENV)
|
|
11
|
+
$(VPYTHON) -m pip install .[dev]; make pre-commit
|
|
12
|
+
pre-commit: .pre-commit-config.yaml
|
|
13
|
+
pre-commit install -t pre-commit -t post-commit -t pre-push
|
|
14
|
+
|
|
15
|
+
clean: dist $(PACKAGE).egg-info
|
|
16
|
+
rm -rf dist/* $(PACKAGE).egg-info $(PACKAGE)/__pycache__ dist/__pycache__
|
|
17
|
+
|
|
18
|
+
build: $(VENV)
|
|
19
|
+
$(VPYTHON) -m build; make twine
|
|
20
|
+
twine: dist
|
|
21
|
+
$(VPYTHON) -m twine upload dist/* --skip-existing
|
|
22
|
+
|
|
23
|
+
patch:
|
|
24
|
+
git tag `$(VPYTHON) -m setuptools_scm --strip-dev`; git push --tags --prune -f
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
[project]
|
|
2
|
+
name = "xync-bot"
|
|
3
|
+
requires-python = ">=3.12"
|
|
4
|
+
authors = [
|
|
5
|
+
{name = "Artemiev", email = "mixartemev@gmail.com"},
|
|
6
|
+
]
|
|
7
|
+
keywords = ["aiogram", "xync-net"]
|
|
8
|
+
description = "Telegram bot with web app for xync net"
|
|
9
|
+
readme = "README.md"
|
|
10
|
+
license = {text = "EULA"}
|
|
11
|
+
dynamic = ["version"]
|
|
12
|
+
dependencies = [
|
|
13
|
+
"xync-schema",
|
|
14
|
+
]
|
|
15
|
+
[project.optional-dependencies]
|
|
16
|
+
dev = [
|
|
17
|
+
"pytest",
|
|
18
|
+
"python-dotenv",
|
|
19
|
+
"build",
|
|
20
|
+
"twine",
|
|
21
|
+
]
|
|
22
|
+
|
|
23
|
+
[project.urls]
|
|
24
|
+
Homepage = "https://gitlab.com/xync/back/tg-bot"
|
|
25
|
+
Repository = "https://gitlab.com/xync/back/tg-bot"
|
|
26
|
+
|
|
27
|
+
[build-system]
|
|
28
|
+
requires = ["setuptools>=64", "setuptools-scm[toml]>=8"]
|
|
29
|
+
build-backend = "setuptools.build_meta"
|
|
30
|
+
[tool.setuptools_scm]
|
|
31
|
+
version_scheme = "python-simplified-semver" # if "feature" in `branch_name` SEMVER_MINOR++ else SEMVER_PATCH++
|
|
32
|
+
local_scheme = "no-local-version"
|
|
33
|
+
|
|
34
|
+
[tool.pytest.ini_options]
|
|
35
|
+
asyncio_mode = "auto"
|
|
36
|
+
asyncio_default_fixture_loop_scope = "function"
|
|
37
|
+
|
|
38
|
+
[tool.ruff]
|
|
39
|
+
line-length = 120
|
|
40
|
+
|
|
41
|
+
[tool.setuptools]
|
|
42
|
+
packages = ["xync_bot", "xync_bot.handlers"]
|
|
File without changes
|
|
File without changes
|
|
@@ -0,0 +1,236 @@
|
|
|
1
|
+
import logging
|
|
2
|
+
from os import path
|
|
3
|
+
|
|
4
|
+
from aiogram import Router, F
|
|
5
|
+
from aiogram.enums import ContentType
|
|
6
|
+
from aiogram.filters import CommandStart, CommandObject, IS_MEMBER, IS_NOT_MEMBER, ChatMemberUpdatedFilter
|
|
7
|
+
from aiogram.filters.callback_data import CallbackData
|
|
8
|
+
from aiogram.types import (
|
|
9
|
+
User as TgUser,
|
|
10
|
+
ChatMemberUpdated,
|
|
11
|
+
Message,
|
|
12
|
+
InlineKeyboardMarkup,
|
|
13
|
+
InlineKeyboardButton,
|
|
14
|
+
CallbackQuery,
|
|
15
|
+
ChatJoinRequest,
|
|
16
|
+
WebAppInfo,
|
|
17
|
+
FSInputFile,
|
|
18
|
+
)
|
|
19
|
+
from aiogram.utils.deep_linking import create_start_link
|
|
20
|
+
from aiogram.utils.web_app import WebAppUser
|
|
21
|
+
from tg_auth import Lang
|
|
22
|
+
from xync_schema.models import User, UserStatus, Order, Msg, Forum
|
|
23
|
+
|
|
24
|
+
from xync_bot.shared import NavCallbackData
|
|
25
|
+
|
|
26
|
+
main = Router()
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
class RrCallbackData(CallbackData, prefix="reg_res"): # registration response
|
|
30
|
+
to: int
|
|
31
|
+
res: bool
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
home_btns = InlineKeyboardMarkup(
|
|
35
|
+
inline_keyboard=[
|
|
36
|
+
[
|
|
37
|
+
InlineKeyboardButton(text="Invite", callback_data=NavCallbackData(to="ref_link").pack()),
|
|
38
|
+
InlineKeyboardButton(text="Get VPN", callback_data=NavCallbackData(to="get_vpn").pack()),
|
|
39
|
+
]
|
|
40
|
+
]
|
|
41
|
+
)
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
@main.message(CommandStart(deep_link=True, deep_link_encoded=True))
|
|
45
|
+
async def start_handler(msg: Message, command: CommandObject):
|
|
46
|
+
me: TgUser = msg.from_user
|
|
47
|
+
ref_id: int = command.args.isnumeric() and int(command.args)
|
|
48
|
+
user = await User.get_or_none(id=me.id, status__gte=UserStatus.RESTRICTED)
|
|
49
|
+
rm = None
|
|
50
|
+
if user:
|
|
51
|
+
rs, rm = f"{me.full_name}, you have registered already😉", home_btns
|
|
52
|
+
elif not (ref := await User.get_or_none(id=ref_id)):
|
|
53
|
+
rs = f"No registered user #{ref_id}😬"
|
|
54
|
+
else: # new user created
|
|
55
|
+
user, cr = await user_upsert(me)
|
|
56
|
+
await user.update_from_dict({"ref": ref}).save()
|
|
57
|
+
approve_btns = InlineKeyboardMarkup(
|
|
58
|
+
inline_keyboard=[
|
|
59
|
+
[
|
|
60
|
+
InlineKeyboardButton(text="Отклонить", callback_data=RrCallbackData(to=user.id, res=False).pack()),
|
|
61
|
+
InlineKeyboardButton(text="Одобрить", callback_data=RrCallbackData(to=user.id, res=True).pack()),
|
|
62
|
+
]
|
|
63
|
+
]
|
|
64
|
+
)
|
|
65
|
+
await msg.bot.send_message(
|
|
66
|
+
ref.id, f"{me.full_name} просит что б Вы взяли за него/ее ответственность", reply_markup=approve_btns
|
|
67
|
+
)
|
|
68
|
+
return await msg.answer(f"Please wait for @{ref.username} approving...")
|
|
69
|
+
return await msg.answer(rs, reply_markup=rm)
|
|
70
|
+
|
|
71
|
+
|
|
72
|
+
@main.callback_query(RrCallbackData.filter())
|
|
73
|
+
async def phrases_input_request(cb: CallbackQuery, callback_data: RrCallbackData) -> None:
|
|
74
|
+
protege = await User[callback_data.to]
|
|
75
|
+
if callback_data.res:
|
|
76
|
+
# protege.status = UserStatus.RESTRICTED
|
|
77
|
+
await protege.save()
|
|
78
|
+
rs = f"{cb.from_user.full_name}, теперь Вы несете ответветвенность за {protege.username}"
|
|
79
|
+
else:
|
|
80
|
+
rs = f'Вы отклонили запрос юзера "{protege.username}" на Вашу протекцию'
|
|
81
|
+
res = {True: "одобрил", False: "отклонил"}
|
|
82
|
+
txt = f"{cb.from_user.full_name} {res[callback_data.res]} вашу регистрацию"
|
|
83
|
+
txt, rm = (f"Поздравляем! {txt}💥", home_btns) if callback_data.res else (f"К сожалению {txt}😢", None)
|
|
84
|
+
await cb.bot.send_message(protege.id, txt, reply_markup=rm)
|
|
85
|
+
await cb.answer("👌🏼")
|
|
86
|
+
await cb.message.edit_text(rs)
|
|
87
|
+
|
|
88
|
+
|
|
89
|
+
@main.message(CommandStart(deep_link=True)) # attempt to reg by fake link
|
|
90
|
+
async def fraud_handler(msg: Message):
|
|
91
|
+
logging.info(f"Start: {msg.from_user.id}. Msg: {msg}")
|
|
92
|
+
# todo: alert to admins! Fraud attempt!
|
|
93
|
+
await msg.answer("🤔")
|
|
94
|
+
|
|
95
|
+
|
|
96
|
+
@main.message(CommandStart())
|
|
97
|
+
async def start_no_ref_handler(msg: Message):
|
|
98
|
+
me = msg.from_user
|
|
99
|
+
user, cr = await user_upsert(me)
|
|
100
|
+
rr = "сначала вы должны найти поручителя, и перейти по его реферальной ссылке.\nhttps://telegra.ph/XyncNet-02-13"
|
|
101
|
+
if cr: # has ref and created now
|
|
102
|
+
await msg.answer(f"Здравствуйте {me.full_name}, что бы использовать возможности нашей сети, {rr}")
|
|
103
|
+
elif not user.ref_id:
|
|
104
|
+
await msg.answer(rr.capitalize())
|
|
105
|
+
else:
|
|
106
|
+
await msg.answer(f"{me.full_name}, не балуйтесь, вы и так уже активный участник👌🏼", reply_markup=home_btns)
|
|
107
|
+
|
|
108
|
+
|
|
109
|
+
@main.callback_query(NavCallbackData.filter(F.to == "ref_link"))
|
|
110
|
+
async def ref_link_handler(cbq: CallbackQuery):
|
|
111
|
+
me = cbq.from_user
|
|
112
|
+
if not (u := await User.get_or_none(id=me.id, status__gt=UserStatus.RESTRICTED).prefetch_related("ref")):
|
|
113
|
+
return await cbq.answer(f"{me.full_name}, сначала сами получите одобрение поручителя😉")
|
|
114
|
+
link = await create_start_link(cbq.bot, str(u.id), encode=True)
|
|
115
|
+
logging.info(f"Start: {me.id}. Msg: {cbq}")
|
|
116
|
+
await cbq.message.answer(
|
|
117
|
+
f"Your referrer is {u.ref_id and u.ref.username}"
|
|
118
|
+
f"\nThis is your invite link: {link}"
|
|
119
|
+
f"\nGive it to your protege, and approve his request"
|
|
120
|
+
)
|
|
121
|
+
await cbq.answer("Wait for your protege request..")
|
|
122
|
+
|
|
123
|
+
|
|
124
|
+
async def user_upsert(u: TgUser | WebAppUser, status: UserStatus = None) -> (User, bool):
|
|
125
|
+
pic = (
|
|
126
|
+
(gpp := await u.get_profile_photos(0, 1)).photos and gpp.photos[0][-1].file_unique_id
|
|
127
|
+
if type(u) is TgUser
|
|
128
|
+
else (u.photo_url[0] if u.photo_url else None)
|
|
129
|
+
)
|
|
130
|
+
udf = {
|
|
131
|
+
"username": u.username,
|
|
132
|
+
"first_name": u.first_name,
|
|
133
|
+
"last_name": u.last_name,
|
|
134
|
+
"status": UserStatus.MEMBER,
|
|
135
|
+
"lang": u.language_code and Lang[u.language_code],
|
|
136
|
+
"pic": pic,
|
|
137
|
+
}
|
|
138
|
+
if status:
|
|
139
|
+
udf.update({"status": status})
|
|
140
|
+
return await User.update_or_create(udf, id=u.id)
|
|
141
|
+
|
|
142
|
+
|
|
143
|
+
@main.my_chat_member()
|
|
144
|
+
async def user_set_status(my_chat_member: ChatMemberUpdated):
|
|
145
|
+
u: TgUser = my_chat_member.from_user
|
|
146
|
+
new_status = UserStatus[my_chat_member.new_chat_member.status.upper()]
|
|
147
|
+
await user_upsert(u, status=new_status)
|
|
148
|
+
|
|
149
|
+
|
|
150
|
+
@main.chat_member(ChatMemberUpdatedFilter(IS_MEMBER >> IS_NOT_MEMBER))
|
|
151
|
+
async def on_user_leave(member: ChatMemberUpdated):
|
|
152
|
+
forum = await Forum[member.chat.id]
|
|
153
|
+
if not forum.joined:
|
|
154
|
+
resp = (
|
|
155
|
+
f"{member.from_user.username or member.from_user.full_name}#{member.from_user.id} "
|
|
156
|
+
f"already leaved from {member.chat.title}#{member.chat.id}"
|
|
157
|
+
)
|
|
158
|
+
logging.error(resp)
|
|
159
|
+
else:
|
|
160
|
+
forum.joined = False
|
|
161
|
+
await forum.save()
|
|
162
|
+
resp = "Bye!"
|
|
163
|
+
return await member.bot.send_message(member.new_chat_member.user.id, resp)
|
|
164
|
+
|
|
165
|
+
|
|
166
|
+
@main.chat_join_request()
|
|
167
|
+
async def on_join_request(req: ChatJoinRequest):
|
|
168
|
+
forum = await Forum[req.chat.id]
|
|
169
|
+
if forum.user_id != req.from_user.id:
|
|
170
|
+
resp = f"{req.chat.title} is chat for user#{forum.user_id}"
|
|
171
|
+
logging.error(resp)
|
|
172
|
+
forum.joined = not await req.decline()
|
|
173
|
+
else:
|
|
174
|
+
resp = "Welcome!"
|
|
175
|
+
forum.joined = await req.approve()
|
|
176
|
+
cp = (await req.bot.get_chat(req.chat.id)).photo
|
|
177
|
+
if not cp:
|
|
178
|
+
pth = path.join(path.dirname(path.abspath(__file__)), "xicon.png")
|
|
179
|
+
await req.chat.set_photo(FSInputFile(pth))
|
|
180
|
+
await forum.save()
|
|
181
|
+
return await req.bot.send_message(req.user_chat_id, resp)
|
|
182
|
+
|
|
183
|
+
|
|
184
|
+
@main.chat_member(ChatMemberUpdatedFilter(IS_NOT_MEMBER >> IS_MEMBER))
|
|
185
|
+
async def on_user_join(member: ChatMemberUpdated):
|
|
186
|
+
forum = await Forum[member.chat.id]
|
|
187
|
+
rm = None
|
|
188
|
+
if forum.user_id != member.from_user.id:
|
|
189
|
+
if member.from_user.id in (6806432376, forum.created_by):
|
|
190
|
+
return
|
|
191
|
+
resp = f"{member.chat.title} is chat for user#{forum.user_id}"
|
|
192
|
+
logging.error(resp)
|
|
193
|
+
await member.bot.ban_chat_member(member.chat.id, member.from_user.id)
|
|
194
|
+
else:
|
|
195
|
+
resp = "Welcome to XyncNetwork"
|
|
196
|
+
rm = InlineKeyboardMarkup(
|
|
197
|
+
inline_keyboard=[[InlineKeyboardButton(text="Go!", web_app=WebAppInfo(url="https://t.me/XyncNetBot/test"))]]
|
|
198
|
+
)
|
|
199
|
+
return await member.bot.send_message(member.new_chat_member.user.id, resp, reply_markup=rm)
|
|
200
|
+
|
|
201
|
+
|
|
202
|
+
@main.message(F.is_topic_message)
|
|
203
|
+
async def order_msg(msg: Message):
|
|
204
|
+
sender = await User[msg.from_user.id]
|
|
205
|
+
cid = msg.chat.shifted_id
|
|
206
|
+
assert sender.forum == cid, "sender is not client"
|
|
207
|
+
if order := await Order.get_or_none(taker__user_id=sender.id, taker_topic=msg.message_thread_id):
|
|
208
|
+
is_taker = True
|
|
209
|
+
elif order := await Order.get_or_none(ad__agent__user_id=sender.id, maker_topic=msg.message_thread_id):
|
|
210
|
+
is_taker = False
|
|
211
|
+
else:
|
|
212
|
+
return await msg.answer("No such order")
|
|
213
|
+
# raise Exception("No such order")
|
|
214
|
+
receiver: User = await (order.ad.agent.user if is_taker else order.taker.user)
|
|
215
|
+
rcv_topic = order.taker_topic if is_taker else order.maker_topic
|
|
216
|
+
await Msg.create(tgid=msg.message_id, txt=msg.text, order_id=order.id, receiver=receiver)
|
|
217
|
+
return await msg.send_copy(receiver.forum, message_thread_id=rcv_topic)
|
|
218
|
+
|
|
219
|
+
|
|
220
|
+
@main.message(
|
|
221
|
+
F.content_type.not_in(
|
|
222
|
+
{
|
|
223
|
+
# ContentType.NEW_CHAT_MEMBERS,
|
|
224
|
+
ContentType.FORUM_TOPIC_CLOSED,
|
|
225
|
+
ContentType.GENERAL_FORUM_TOPIC_HIDDEN,
|
|
226
|
+
# ContentType.LEFT_CHAT_MEMBER,
|
|
227
|
+
ContentType.SUPERGROUP_CHAT_CREATED,
|
|
228
|
+
ContentType.NEW_CHAT_PHOTO,
|
|
229
|
+
# ContentType.FORUM_TOPIC_CREATED,
|
|
230
|
+
# ContentType.FORUM_TOPIC_EDITED,
|
|
231
|
+
# ContentType.FORUM_TOPIC_CLOSED,
|
|
232
|
+
}
|
|
233
|
+
)
|
|
234
|
+
)
|
|
235
|
+
async def del_cbq(msg: Message):
|
|
236
|
+
await msg.delete()
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
from aiogram import Router, F
|
|
2
|
+
from aiogram.types import Message
|
|
3
|
+
from xync_schema.models import User
|
|
4
|
+
|
|
5
|
+
r = Router()
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
# @main.message(F.chat.is_forum)
|
|
9
|
+
@r.message(F.is_topic_message)
|
|
10
|
+
async def order_msg(msg: Message):
|
|
11
|
+
await User[msg.from_user.id]
|
|
12
|
+
msg.message_thread_id
|
|
Binary file
|
|
@@ -1,15 +1,17 @@
|
|
|
1
|
-
Metadata-Version: 2.
|
|
1
|
+
Metadata-Version: 2.2
|
|
2
2
|
Name: xync-bot
|
|
3
|
-
Version: 0.2
|
|
3
|
+
Version: 0.3.2
|
|
4
4
|
Summary: Telegram bot with web app for xync net
|
|
5
5
|
Author-email: Artemiev <mixartemev@gmail.com>
|
|
6
|
-
License:
|
|
6
|
+
License: EULA
|
|
7
7
|
Project-URL: Homepage, https://gitlab.com/xync/back/tg-bot
|
|
8
8
|
Project-URL: Repository, https://gitlab.com/xync/back/tg-bot
|
|
9
9
|
Keywords: aiogram,xync-net
|
|
10
|
-
Requires-Python: >=3.
|
|
10
|
+
Requires-Python: >=3.12
|
|
11
11
|
Description-Content-Type: text/markdown
|
|
12
|
-
Requires-Dist: aiogram
|
|
13
|
-
Requires-Dist: python-dotenv
|
|
14
|
-
Requires-Dist: xn-api
|
|
15
12
|
Requires-Dist: xync-schema
|
|
13
|
+
Provides-Extra: dev
|
|
14
|
+
Requires-Dist: pytest; extra == "dev"
|
|
15
|
+
Requires-Dist: python-dotenv; extra == "dev"
|
|
16
|
+
Requires-Dist: build; extra == "dev"
|
|
17
|
+
Requires-Dist: twine; extra == "dev"
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
+
.env.dist
|
|
2
|
+
.gitignore
|
|
3
|
+
.pre-commit-config.yaml
|
|
4
|
+
makefile
|
|
1
5
|
pyproject.toml
|
|
6
|
+
test_main.http
|
|
2
7
|
xync_bot/__init__.py
|
|
3
8
|
xync_bot/shared.py
|
|
4
9
|
xync_bot.egg-info/PKG-INFO
|
|
@@ -8,4 +13,6 @@ xync_bot.egg-info/requires.txt
|
|
|
8
13
|
xync_bot.egg-info/top_level.txt
|
|
9
14
|
xync_bot/handlers/__init__.py
|
|
10
15
|
xync_bot/handlers/main.py
|
|
11
|
-
xync_bot/handlers/
|
|
16
|
+
xync_bot/handlers/order.py
|
|
17
|
+
xync_bot/handlers/vpn.py
|
|
18
|
+
xync_bot/handlers/xicon.png
|
xync_bot-0.2.10/pyproject.toml
DELETED
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
[project]
|
|
2
|
-
name = "xync-bot"
|
|
3
|
-
requires-python = ">=3.11"
|
|
4
|
-
authors = [
|
|
5
|
-
{name = "Artemiev", email = "mixartemev@gmail.com"},
|
|
6
|
-
]
|
|
7
|
-
keywords = ["aiogram", "xync-net"]
|
|
8
|
-
description = "Telegram bot with web app for xync net"
|
|
9
|
-
readme = "README.md"
|
|
10
|
-
license = {text = "MIT"}
|
|
11
|
-
dependencies = [
|
|
12
|
-
"aiogram",
|
|
13
|
-
"python-dotenv",
|
|
14
|
-
"xn-api",
|
|
15
|
-
"xync-schema",
|
|
16
|
-
]
|
|
17
|
-
version = "0.2.10"
|
|
18
|
-
|
|
19
|
-
[project.urls]
|
|
20
|
-
Homepage = "https://gitlab.com/xync/back/tg-bot"
|
|
21
|
-
Repository = "https://gitlab.com/xync/back/tg-bot"
|
|
22
|
-
|
|
23
|
-
[tool.setuptools]
|
|
24
|
-
packages = ["xync_bot", "xync_bot.handlers"]
|
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
from aiogram.client.default import DefaultBotProperties
|
|
2
|
-
from aiogram.types import MenuButtonWebApp, WebAppInfo
|
|
3
|
-
import logging
|
|
4
|
-
from os import getenv as env
|
|
5
|
-
from dotenv import load_dotenv
|
|
6
|
-
from aiogram import Bot, Dispatcher
|
|
7
|
-
from tortoise.backends.asyncpg import AsyncpgDBClient
|
|
8
|
-
|
|
9
|
-
from xync_bot.handlers import main, vpn
|
|
10
|
-
|
|
11
|
-
load_dotenv()
|
|
12
|
-
|
|
13
|
-
logging.basicConfig(filemode='a', level=logging.DEBUG)
|
|
14
|
-
|
|
15
|
-
bot = Bot(token=env('TOKEN'), default=DefaultBotProperties(parse_mode='Markdown'))
|
|
16
|
-
dp = Dispatcher(bot=bot)
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
async def on_startup(wh_url: str, twa_url: str, cn: AsyncpgDBClient, mbt: str = 'Go!'):
|
|
20
|
-
""" SET DEISPATCHER GLOBAL WORKFLOW DATA FOR DB Connection """
|
|
21
|
-
dp['dbc'] = cn
|
|
22
|
-
""" WEBHOOK SETUP """
|
|
23
|
-
webhook_info = await bot.get_webhook_info()
|
|
24
|
-
if webhook_info.url != wh_url:
|
|
25
|
-
await bot.set_webhook(url=wh_url, drop_pending_updates=True)
|
|
26
|
-
""" WEBAPP URL SETUP IN MENU """
|
|
27
|
-
await bot.set_chat_menu_button(menu_button=MenuButtonWebApp(text=mbt, web_app=WebAppInfo(url=twa_url)))
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
async def on_shutdown():
|
|
31
|
-
""" CLOSE BOT SESSION """
|
|
32
|
-
await bot.delete_webhook(drop_pending_updates=True)
|
|
33
|
-
await bot.session.close()
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
dp.startup.register(on_startup)
|
|
37
|
-
dp.shutdown.register(on_shutdown)
|
|
38
|
-
|
|
39
|
-
dp.include_routers(vpn, main)
|
|
@@ -1,117 +0,0 @@
|
|
|
1
|
-
import logging
|
|
2
|
-
from aiogram import Router, F
|
|
3
|
-
from aiogram.filters import CommandStart, CommandObject
|
|
4
|
-
from aiogram.filters.callback_data import CallbackData
|
|
5
|
-
from aiogram.types import User as TgUser, ChatMemberUpdated, Message, InlineKeyboardMarkup, InlineKeyboardButton, CallbackQuery
|
|
6
|
-
from aiogram.utils.deep_linking import create_start_link
|
|
7
|
-
from aiogram.utils.web_app import WebAppUser
|
|
8
|
-
from xync_schema.models import User, UserStatus, Lang
|
|
9
|
-
|
|
10
|
-
from xync_bot.shared import NavCallbackData
|
|
11
|
-
|
|
12
|
-
main = Router()
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
class RrCallbackData(CallbackData, prefix="reg_res"): # registration response
|
|
16
|
-
to: int
|
|
17
|
-
res: bool
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
home_btns = InlineKeyboardMarkup(
|
|
21
|
-
inline_keyboard=[[
|
|
22
|
-
InlineKeyboardButton(text='Invite', callback_data=NavCallbackData(to='ref_link').pack()),
|
|
23
|
-
InlineKeyboardButton(text='Get VPN', callback_data=NavCallbackData(to='get_vpn').pack()),
|
|
24
|
-
]])
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
@main.message(CommandStart(deep_link=True, deep_link_encoded=True))
|
|
28
|
-
async def start_handler(msg: Message, command: CommandObject):
|
|
29
|
-
me: TgUser = msg.from_user
|
|
30
|
-
ref_id: int = command.args.isnumeric() and int(command.args)
|
|
31
|
-
user = await User.get_or_none(id=me.id, status__gte=UserStatus.RESTRICTED)
|
|
32
|
-
rm = None
|
|
33
|
-
if user:
|
|
34
|
-
rs, rm = f'{me.full_name}, you have registered already😉', home_btns
|
|
35
|
-
elif not (ref := await User.get_or_none(id=ref_id)):
|
|
36
|
-
rs = f'No registered user #{ref_id}😬'
|
|
37
|
-
else: # new user created
|
|
38
|
-
user, cr = await user_upsert(me)
|
|
39
|
-
await user.update_from_dict({'ref': ref}).save()
|
|
40
|
-
approve_btns = InlineKeyboardMarkup(
|
|
41
|
-
inline_keyboard=[[
|
|
42
|
-
InlineKeyboardButton(text='Отклонить', callback_data=RrCallbackData(to=user.id, res=False).pack()),
|
|
43
|
-
InlineKeyboardButton(text='Одобрить', callback_data=RrCallbackData(to=user.id, res=True).pack())
|
|
44
|
-
]])
|
|
45
|
-
await msg.bot.send_message(ref.id, f'{me.full_name} просит что б Вы взяли за него/ее ответственность', reply_markup=approve_btns)
|
|
46
|
-
return await msg.answer(f'Please wait for @{ref.username} approving...')
|
|
47
|
-
return await msg.answer(rs, reply_markup=rm)
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
@main.callback_query(RrCallbackData.filter())
|
|
51
|
-
async def phrases_input_request(cb: CallbackQuery, callback_data: RrCallbackData) -> None:
|
|
52
|
-
protege = await User[callback_data.to]
|
|
53
|
-
if callback_data.res:
|
|
54
|
-
# protege.status = UserStatus.RESTRICTED
|
|
55
|
-
await protege.save()
|
|
56
|
-
rs = f'{cb.from_user.full_name}, теперь Вы несете ответветвенность за {protege.username}'
|
|
57
|
-
else:
|
|
58
|
-
rs = f'Вы отклонили запрос юзера "{protege.username}" на Вашу протекцию'
|
|
59
|
-
res = {True: 'одобрил', False: 'отклонил'}
|
|
60
|
-
txt = f'{cb.from_user.full_name} {res[callback_data.res]} вашу регистрацию'
|
|
61
|
-
txt, rm = (f'Поздравляем! {txt}💥', home_btns) if callback_data.res else (f'К сожалению {txt}😢', None)
|
|
62
|
-
await cb.bot.send_message(protege.id, txt, reply_markup=rm)
|
|
63
|
-
await cb.answer('👌🏼')
|
|
64
|
-
await cb.message.edit_text(rs)
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
@main.message(CommandStart(deep_link=True)) # attempt to reg by fake link
|
|
68
|
-
async def fraud_handler(msg: Message):
|
|
69
|
-
logging.info(f'Start: {msg.from_user.id}. Msg: {msg}')
|
|
70
|
-
# todo: alert to admins! Fraud attempt!
|
|
71
|
-
await msg.answer('🤔')
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
@main.message(CommandStart())
|
|
75
|
-
async def start_no_ref_handler(msg: Message):
|
|
76
|
-
me = msg.from_user
|
|
77
|
-
user, cr = await user_upsert(me)
|
|
78
|
-
rr = 'сначала вы должны найти поручителя, и перейти по его реферальной ссылке.\nhttps://telegra.ph/XyncNet-02-13'
|
|
79
|
-
if cr: # has ref and created now
|
|
80
|
-
await msg.answer(f'Здравствуйте {me.full_name}, что бы использовать возможности нашей сети, {rr}')
|
|
81
|
-
elif not user.ref_id:
|
|
82
|
-
await msg.answer(rr.capitalize())
|
|
83
|
-
else:
|
|
84
|
-
await msg.answer(f'{me.full_name}, не балуйтесь, вы и так уже активный участник👌🏼', reply_markup=home_btns)
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
@main.callback_query(NavCallbackData.filter(F.to == 'ref_link'))
|
|
88
|
-
async def ref_link_handler(cbq: CallbackQuery):
|
|
89
|
-
me = cbq.from_user
|
|
90
|
-
if not (u := await User.get_or_none(id=me.id, status__gt=UserStatus.RESTRICTED).prefetch_related('ref')):
|
|
91
|
-
return await cbq.answer(f"{me.full_name}, сначала сами получите одобрение поручителя😉")
|
|
92
|
-
link = await create_start_link(cbq.bot, str(u.id), encode=True)
|
|
93
|
-
logging.info(f'Start: {me.id}. Msg: {cbq}')
|
|
94
|
-
await cbq.message.answer(f"Your referrer is {u.ref_id and u.ref.username}"
|
|
95
|
-
f"\nThis is your invite link: {link}"
|
|
96
|
-
f"\nGive it to your protege, and approve his request")
|
|
97
|
-
await cbq.answer('Wait for your protege request..')
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
async def user_upsert(u: TgUser | WebAppUser, status: UserStatus = None) -> (User, bool):
|
|
101
|
-
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)
|
|
102
|
-
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}
|
|
103
|
-
if status:
|
|
104
|
-
udf.update({'status': status})
|
|
105
|
-
return await User.update_or_create(udf, id=u.id)
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
@main.my_chat_member()
|
|
109
|
-
async def user_set_status(my_chat_member: ChatMemberUpdated):
|
|
110
|
-
u: TgUser = my_chat_member.from_user
|
|
111
|
-
new_status = my_chat_member.new_chat_member.status
|
|
112
|
-
await user_upsert(u, status=new_status)
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
@main.message()
|
|
116
|
-
async def del_cbq(msg: Message):
|
|
117
|
-
await msg.delete()
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|