Compare commits

...

3 Commits

Author SHA1 Message Date
a3a1be241c Small keyboard fix 2023-01-17 14:38:31 +01:00
9ce05589b0 Contextual keyboard [WIP] 2023-01-17 14:38:21 +01:00
c1ee988106 Added empty callback 2023-01-17 14:37:36 +01:00
3 changed files with 27 additions and 4 deletions

View File

@@ -0,0 +1,11 @@
from app import app
from pyrogram import filters
from pyrogram.types import CallbackQuery
from pyrogram.client import Client
from modules.utils import locale
# Callback empty ===============================================================================================================
@app.on_callback_query(filters.regex("nothing"))
async def callback_query_nothing(app: Client, clb: CallbackQuery):
await clb.answer(text=locale("nothing", "callback", locale=clb.from_user))
# ==============================================================================================================================

View File

@@ -2,7 +2,7 @@ from os import sep
from pathlib import Path from pathlib import Path
from pyrogram import filters from pyrogram import filters
from pyrogram.client import Client from pyrogram.client import Client
from pyrogram.types import CallbackQuery from pyrogram.types import CallbackQuery, InlineKeyboardMarkup, InlineKeyboardButton
from modules.api_client import upload_pic from modules.api_client import upload_pic
from modules.utils import jsonLoad, jsonSave, configGet, locale from modules.utils import jsonLoad, jsonSave, configGet, locale
from modules.submissions import subBlock, subUnblock from modules.submissions import subBlock, subUnblock
@@ -44,6 +44,9 @@ async def callback_query_yes(app: Client, clb: CallbackQuery):
await submission.reply_text(locale("sub_yes", "message", locale=submission.from_user.language_code), quote=True) await submission.reply_text(locale("sub_yes", "message", locale=submission.from_user.language_code), quote=True)
await clb.answer(text=locale("sub_yes", "callback", locale=user_locale).format(fullclb[2]), show_alert=True) await clb.answer(text=locale("sub_yes", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)
# edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
# await clb.message.edit(text=clb.message.text, reply_markup=InlineKeyboardMarkup(edited_markup))
@app.on_callback_query(filters.regex("sub_no_[\s\S]*_[\s\S]*")) @app.on_callback_query(filters.regex("sub_no_[\s\S]*_[\s\S]*"))
async def callback_query_no(app: Client, clb: CallbackQuery): async def callback_query_no(app: Client, clb: CallbackQuery):
@@ -57,6 +60,9 @@ async def callback_query_no(app: Client, clb: CallbackQuery):
await submission.reply_text(locale("sub_no", "message", locale=submission.from_user.language_code), quote=True) await submission.reply_text(locale("sub_no", "message", locale=submission.from_user.language_code), quote=True)
await clb.answer(text=locale("sub_no", "callback", locale=user_locale).format(fullclb[2]), show_alert=True) await clb.answer(text=locale("sub_no", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)
# edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
# await clb.message.edit(text=clb.message.text, reply_markup=InlineKeyboardMarkup(edited_markup))
@app.on_callback_query(filters.regex("sub_block_[\s\S]*")) @app.on_callback_query(filters.regex("sub_block_[\s\S]*"))
async def callback_query_block(app: Client, clb: CallbackQuery): async def callback_query_block(app: Client, clb: CallbackQuery):
@@ -66,6 +72,9 @@ async def callback_query_block(app: Client, clb: CallbackQuery):
subBlock(int(fullclb[2])) subBlock(int(fullclb[2]))
await clb.answer(text=locale("sub_block", "callback", locale=user_locale).format(fullclb[2]), show_alert=True) await clb.answer(text=locale("sub_block", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)
# edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
# await clb.message.edit(text=clb.message.text, reply_markup=InlineKeyboardMarkup(edited_markup))
@app.on_callback_query(filters.regex("sub_unblock_[\s\S]*")) @app.on_callback_query(filters.regex("sub_unblock_[\s\S]*"))
async def callback_query_unblock(app: Client, clb: CallbackQuery): async def callback_query_unblock(app: Client, clb: CallbackQuery):
@@ -73,4 +82,7 @@ async def callback_query_unblock(app: Client, clb: CallbackQuery):
user_locale = clb.from_user.language_code user_locale = clb.from_user.language_code
await app.send_message(int(fullclb[2]), locale("sub_msg_unavail", "message", locale=configGet("locale"))) await app.send_message(int(fullclb[2]), locale("sub_msg_unavail", "message", locale=configGet("locale")))
subUnblock(int(fullclb[2])) subUnblock(int(fullclb[2]))
await clb.answer(text=locale("sub_unblock", "callback", locale=user_locale).format(fullclb[2]), show_alert=True) await clb.answer(text=locale("sub_unblock", "callback", locale=user_locale).format(fullclb[2]), show_alert=True)
# edited_markup = [[InlineKeyboardButton(text=str(locale("accepted", "button")), callback_data="nothing")]]
# await clb.message.edit(text=clb.message.text, reply_markup=InlineKeyboardMarkup(edited_markup))

View File

@@ -61,8 +61,6 @@ async def get_submission(_: Client, msg: Message):
if msg.from_user.phone_number != None: if msg.from_user.phone_number != None:
caption += f" ({msg.from_user.phone_number})" caption += f" ({msg.from_user.phone_number})"
await msg.copy(configGet("admin"), caption=caption, reply_markup=InlineKeyboardMarkup(buttons))
if msg.from_user.id != configGet("admin"): if msg.from_user.id != configGet("admin"):
buttons += [ buttons += [
[ [
@@ -76,6 +74,8 @@ async def get_submission(_: Client, msg: Message):
await msg.reply_text(locale("sub_sent", "message", locale=user_locale), quote=True) await msg.reply_text(locale("sub_sent", "message", locale=user_locale), quote=True)
subLimit(msg.from_user) subLimit(msg.from_user)
await msg.copy(configGet("admin"), caption=caption, reply_markup=InlineKeyboardMarkup(buttons))
else: else:
await msg.reply_text(locale("sub_cooldown", "message", locale=user_locale).format(str(configGet("timeout", "submission")))) await msg.reply_text(locale("sub_cooldown", "message", locale=user_locale).format(str(configGet("timeout", "submission"))))