houseassassin/Solo_bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gift_code/buttons/commands

Browse Source
This commit is contained in:
Vladless
2024-12-23 01:14:28 +03:00
parent c1728d111b
commit e60797c1e0
18 changed files with 4075 additions and 2125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
handlers/buttons/gifts.py
+4
View File
@@ -0,0 +1,4 @@
GIFT = "🎁 Подарить подписку"
MY_GIFTS = "🎁 Мои подарки"
PROFILE = "👤 Личный кабинет"
BACK = "🔙 Назад"
handlers/instructions/instructions.py
+14 -3
View File
@@ -12,11 +12,16 @@ router = Router()
@router.callback_query(F.data == "instructions")
async def send_instructions(callback_query: types.CallbackQuery):
@router.message(F.text == "/instructions")
async def send_instructions(callback_query_or_message: types.CallbackQuery | types.Message):
instructions_message = INSTRUCTIONS
image_path = os.path.join("img", "instructions.jpg")
if not os.path.isfile(image_path):
await callback_query.message.answer("Файл изображения не найден.")
if isinstance(callback_query_or_message, types.CallbackQuery):
await callback_query_or_message.message.answer("Файл изображения не найден.")
else:
await callback_query_or_message.answer("Файл изображения не найден.")
return
builder = InlineKeyboardBuilder()
@@ -25,14 +30,20 @@ async def send_instructions(callback_query: types.CallbackQuery):
InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile"),
)
if isinstance(callback_query_or_message, types.CallbackQuery):
send_photo = callback_query_or_message.message.answer_photo
else:
send_photo = callback_query_or_message.answer_photo
with open(image_path, "rb") as image_from_buffer:
await callback_query.message.answer_photo(
await send_photo(
BufferedInputFile(image_from_buffer.read(), filename="instructions.jpg"),
caption=instructions_message,
reply_markup=builder.as_markup(),
)
@router.callback_query(F.data.startswith("connect_pc|"))
async def process_connect_pc(callback_query: types.CallbackQuery, session: Any):
tg_id = callback_query.message.chat.id
handlers/keys/keys.py
+90 -69
View File
@@ -35,7 +35,6 @@ from handlers.texts import (
DISCOUNTS,
INSUFFICIENT_FUNDS_MSG,
KEY_NOT_FOUND_MSG,
NO_KEYS,
PLAN_SELECTION_MSG,
SUCCESS_RENEWAL_MSG,
key_message,
@@ -49,84 +48,106 @@ router = Router()
@router.callback_query(F.data == "view_keys")
async def process_callback_view_keys(callback_query: types.CallbackQuery, session: Any):
tg_id = callback_query.message.chat.id
@router.message(F.text == "/subs")
async def process_callback_or_message_view_keys(
callback_query_or_message: types.Message | types.CallbackQuery, session: Any
):
if isinstance(callback_query_or_message, types.CallbackQuery):
chat_id = callback_query_or_message.message.chat.id
send_message = callback_query_or_message.message.answer
send_photo = callback_query_or_message.message.answer_photo
else:
chat_id = callback_query_or_message.chat.id
send_message = callback_query_or_message.answer
send_photo = callback_query_or_message.answer_photo
try:
records = await session.fetch(
"""
SELECT email, client_id FROM keys WHERE tg_id = $1
""",
tg_id,
""",
chat_id,
)
if records:
builder = InlineKeyboardBuilder()
for record in records:
key_name = record["email"]
builder.row(
InlineKeyboardButton(
text=f"🔑 {key_name}", callback_data=f"view_key|{key_name}"
)
)
builder.row(
InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
)
inline_keyboard = builder.as_markup()
response_message = (
"<b>🔑 Список ваших устройств</b>\n\n"
"<i>👇 Выберите устройство для управления подпиской:</i>"
)
image_path = os.path.join("img", "pic_keys.jpg")
if os.path.isfile(image_path):
with open(image_path, "rb") as image_file:
await callback_query.message.answer_photo(
photo=BufferedInputFile(
image_file.read(), filename="pic_keys.jpg"
),
caption=response_message,
reply_markup=inline_keyboard,
)
else:
await callback_query.message.answer(
text=response_message,
reply_markup=inline_keyboard,
)
inline_keyboard, response_message = build_keys_response(records)
else:
response_message = NO_KEYS
builder = InlineKeyboardBuilder()
builder.row(
InlineKeyboardButton(
text="➕ Создать подписку", callback_data="create_key"
)
)
builder.row(
InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
)
inline_keyboard, response_message = build_no_keys_response()
keyboard = builder.as_markup()
image_path = os.path.join("img", "pic_keys.jpg")
if os.path.isfile(image_path):
with open(image_path, "rb") as image_file:
await callback_query.message.answer_photo(
photo=BufferedInputFile(
image_file.read(), filename="pic_keys.jpg"
),
caption=response_message,
reply_markup=keyboard,
)
else:
await callback_query.message.answer(
text=response_message,
reply_markup=keyboard,
)
image_path = os.path.join("img", "pic_keys.jpg")
await send_with_optional_image(
send_message, send_photo, image_path, response_message, inline_keyboard
)
except Exception as e:
await handle_error(tg_id, callback_query, f"Ошибка при получении ключей: {e}")
error_message = f"Ошибка при получении ключей: {e}"
await send_message(text=error_message)
def build_keys_response(records):
"""
Формирует сообщение и клавиатуру, если у пользователя есть устройства.
"""
builder = InlineKeyboardBuilder()
for record in records:
key_name = record["email"]
builder.row(
InlineKeyboardButton(
text=f"🔑 {key_name}", callback_data=f"view_key|{key_name}"
)
)
builder.row(
InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
)
inline_keyboard = builder.as_markup()
response_message = (
"<b>🔑 Список ваших устройств</b>\n\n"
"<i>👇 Выберите устройство для управления подпиской:</i>"
)
return inline_keyboard, response_message
def build_no_keys_response():
"""
Формирует сообщение и клавиатуру, если у пользователя нет устройств.
"""
builder = InlineKeyboardBuilder()
builder.row(
InlineKeyboardButton(
text="➕ Создать подписку", callback_data="create_key"
)
)
builder.row(
InlineKeyboardButton(text="👤 Личный кабинет", callback_data="profile")
)
inline_keyboard = builder.as_markup()
response_message = (
"<b>❌ У вас пока нет активных устройств</b>\n\n"
"<i>Нажмите кнопку ниже, чтобы создать устройство:</i>"
)
return inline_keyboard, response_message
async def send_with_optional_image(send_message, send_photo, image_path, text, keyboard):
"""
Отправляет сообщение с изображением, если файл существует. В противном случае отправляет только текст.
"""
if os.path.isfile(image_path):
with open(image_path, "rb") as image_file:
await send_photo(
photo=BufferedInputFile(image_file.read(), filename=os.path.basename(image_path)),
caption=text,
reply_markup=keyboard,
)
else:
await send_message(
text=text,
reply_markup=keyboard,
)
@router.callback_query(F.data.startswith("view_key|"))
handlers/payments/cryprobot_pay.c
+3
View File
@@ -3,6 +3,9 @@
/* BEGIN: Cython Metadata
{
"distutils": {
"extra_compile_args": [
"-O2"
],
"name": "handlers.payments.cryprobot_pay",
"sources": [
"handlers/payments/cryprobot_pay.py"
handlers/payments/cryprobot_pay.cpython-312-x86_64-linux-gnu.so
BIN
View File
Binary file not shown.
handlers/payments/gift.c
+3948 -2052
View File
File diff suppressed because it is too large Load Diff
handlers/payments/gift.cpython-312-x86_64-linux-gnu.so
BIN
View File
Binary file not shown.
handlers/payments/robokassa_pay.c
+3
View File
@@ -3,6 +3,9 @@
/* BEGIN: Cython Metadata
{
"distutils": {
"extra_compile_args": [
"-O2"
],
"name": "handlers.payments.robokassa_pay",
"sources": [
"handlers/payments/robokassa_pay.py"
handlers/payments/robokassa_pay.cpython-312-x86_64-linux-gnu.so
BIN
View File
Binary file not shown.
handlers/payments/stars_pay.c
+3
View File
@@ -3,6 +3,9 @@
/* BEGIN: Cython Metadata
{
"distutils": {
"extra_compile_args": [
"-O2"
],
"name": "handlers.payments.stars_pay",
"sources": [
"handlers/payments/stars_pay.py"
handlers/payments/stars_pay.cpython-312-x86_64-linux-gnu.so
BIN
View File
Binary file not shown.
handlers/payments/utils.c
+3
View File
@@ -3,6 +3,9 @@
/* BEGIN: Cython Metadata
{
"distutils": {
"extra_compile_args": [
"-O2"
],
"name": "handlers.payments.utils",
"sources": [
"handlers/payments/utils.py"
handlers/payments/utils.cpython-312-x86_64-linux-gnu.so
BIN
View File
Binary file not shown.
handlers/payments/yookassa_pay.c
+3
View File
@@ -3,6 +3,9 @@
/* BEGIN: Cython Metadata
{
"distutils": {
"extra_compile_args": [
"-O2"
],
"name": "handlers.payments.yookassa_pay",
"sources": [
"handlers/payments/yookassa_pay.py"
handlers/payments/yookassa_pay.cpython-312-x86_64-linux-gnu.so
BIN
View File
Binary file not shown.
handlers/payments/yoomoney_pay.c
+3
View File
@@ -3,6 +3,9 @@
/* BEGIN: Cython Metadata
{
"distutils": {
"extra_compile_args": [
"-O2"
],
"name": "handlers.payments.yoomoney_pay",
"sources": [
"handlers/payments/yoomoney_pay.py"
handlers/payments/yoomoney_pay.cpython-312-x86_64-linux-gnu.so
BIN
View File
Binary file not shown.
handlers/start.py
+1 -1
View File
@@ -245,5 +245,5 @@ async def handle_about_vpn(callback_query: CallbackQuery):
builder.row(InlineKeyboardButton(text="⬅️ Назад", callback_data="start"))
await callback_query.message.answer(
get_about_vpn("3.2.3-beta-gifts"), reply_markup=builder.as_markup()
get_about_vpn("3.2.3"), reply_markup=builder.as_markup()
)