отклик добавит
This commit is contained in:
1 parent
48df539ee6
commit
80ecdaea02
3 files changed
+65
-31
No files matched your search
+42
-28
@@ -671,7 +671,7 @@ async def edit_prompt_callback(callback: CallbackQuery):
|
||||
],
|
||||
[
|
||||
InlineKeyboardButton(
|
||||
text="⬅️ назад", callback_data=f"vp%{user_id}%{prompt_id}"
|
||||
text="⬅️ назад", callback_data=f"vp%{user_id}%{prompt_id}", style="primary"
|
||||
),
|
||||
]
|
||||
]
|
||||
@@ -808,8 +808,8 @@ async def set_prompt_callback(callback: CallbackQuery):
|
||||
|
||||
set_user_setting(
|
||||
user_id,
|
||||
"prompt": new_status,
|
||||
"prompts": get_user_config(user_id).get("prompts")
|
||||
prompt=new_status,
|
||||
prompts=get_user_config(user_id).get("prompts")
|
||||
)
|
||||
|
||||
if msg_type == 0:
|
||||
@@ -863,7 +863,7 @@ async def add_prompt_callback(callback: CallbackQuery, dataalo="", alo=True):
|
||||
|
||||
set_user_setting(
|
||||
user_id,
|
||||
"prompts": new_prompts
|
||||
prompts=new_prompts
|
||||
)
|
||||
|
||||
if alo:
|
||||
@@ -917,7 +917,7 @@ async def set_markdown_callback(callback: CallbackQuery, message=None):
|
||||
config = get_user_config(user_id)
|
||||
set_user_setting(
|
||||
user_id,
|
||||
"markdown": "new"
|
||||
markdown="new"
|
||||
)
|
||||
if message:
|
||||
await message.delete()
|
||||
@@ -936,7 +936,7 @@ async def set_markdown_callback(callback: CallbackQuery, message=None):
|
||||
config = get_user_config(user_id)
|
||||
set_user_setting(
|
||||
user_id,
|
||||
"markdown": "old"
|
||||
markdown="old"
|
||||
)
|
||||
if message:
|
||||
await message.delete()
|
||||
@@ -1064,15 +1064,9 @@ async def group_cancel_callback(callback: CallbackQuery):
|
||||
await group_settings_handler(callback, dataalo=f"group%{group_id}")
|
||||
|
||||
|
||||
@router.callback_query(F.data.startswith("call%"))
|
||||
async def call_callback(callback: CallbackQuery):
|
||||
data = callback.data.split("%", 1)
|
||||
user_id = data[1]
|
||||
if user_id != str(callback.from_user.id):
|
||||
await callback.answer("прости но нет")
|
||||
return
|
||||
|
||||
def build_call_menu(user_id):
|
||||
config = get_user_config(user_id)
|
||||
calling = config.get("calling") or []
|
||||
calling_dots = ""
|
||||
call_dots = ""
|
||||
|
||||
@@ -1090,23 +1084,23 @@ async def call_callback(callback: CallbackQuery):
|
||||
# хуй хуй хуй
|
||||
# сиськам сись писькам пись
|
||||
|
||||
if config["calling"] == []:
|
||||
if calling == []:
|
||||
calling_status = "свои слова отклика ->"
|
||||
calling_status2 = ["✅", ""]
|
||||
else:
|
||||
calling_status = ", ".join(config["calling"])[:35]
|
||||
calling_status = ", ".join(calling)[:35]
|
||||
calling_status2 = ["", "✅"]
|
||||
|
||||
if len(", ".join(config["calling"])) > 35:
|
||||
if len(", ".join(calling)) > 35:
|
||||
calling_dots = "..."
|
||||
|
||||
|
||||
if len(", ".join(BOT_CALLS)) > 35:
|
||||
call_dots = "..."
|
||||
|
||||
buttons = [
|
||||
[
|
||||
InlineKeyboardButton(
|
||||
text=f"{call_status} отклик на слова: {call_status2} {call_status}",
|
||||
text=f"{call_status} отклик на слова: {call_status2} {call_status}",
|
||||
callback_data=f"set%call%{user_id}%{call_cb}",
|
||||
style=call_style
|
||||
),
|
||||
@@ -1128,23 +1122,36 @@ async def call_callback(callback: CallbackQuery):
|
||||
buttons += [
|
||||
[
|
||||
InlineKeyboardButton(
|
||||
text=f"⬅️ назад",
|
||||
text="⬅️ назад",
|
||||
callback_data=f"settings%{user_id}",
|
||||
style="primary"
|
||||
)
|
||||
]
|
||||
]
|
||||
|
||||
await callback.message.edit_text(
|
||||
return (
|
||||
"меню выбора на что звать меня дорогой друг",
|
||||
reply_markup=InlineKeyboardMarkup(inline_keyboard=buttons),
|
||||
InlineKeyboardMarkup(inline_keyboard=buttons),
|
||||
)
|
||||
|
||||
|
||||
@router.callback_query(F.data.startswith("call%"))
|
||||
async def call_callback(callback: CallbackQuery):
|
||||
data = callback.data.split("%", 1)
|
||||
user_id = data[1]
|
||||
if user_id != str(callback.from_user.id):
|
||||
await callback.answer("прости но нет")
|
||||
return
|
||||
|
||||
text, keyboard = build_call_menu(user_id)
|
||||
|
||||
await callback.message.edit_text(text, reply_markup=keyboard)
|
||||
|
||||
await callback.answer()
|
||||
|
||||
|
||||
@router.callback_query(F.data.startswith("scall%"))
|
||||
async def call_callback(callback: CallbackQuery):
|
||||
async def scall_callback(callback: CallbackQuery):
|
||||
# чем выше забор, тем ниже плинтус
|
||||
data = callback.data.split("%", 2)
|
||||
user_id = data[1]
|
||||
@@ -1153,16 +1160,23 @@ async def call_callback(callback: CallbackQuery):
|
||||
await callback.answer("прости но нет")
|
||||
return
|
||||
|
||||
config = get_user_config(user_id)
|
||||
|
||||
if call_type == "1":
|
||||
set_user_setting
|
||||
|
||||
set_user_setting(user_id, calling=[])
|
||||
text, keyboard = build_call_menu(user_id)
|
||||
await callback.message.edit_text(text, reply_markup=keyboard)
|
||||
await callback.answer("✅ слова отклика сброшены на стандартные")
|
||||
return
|
||||
|
||||
alo_command[int(user_id)] = {
|
||||
"action": "calling",
|
||||
"chat_id": callback.message.chat.id,
|
||||
"message_id": callback.message.message_id,
|
||||
}
|
||||
|
||||
buttons = [
|
||||
[
|
||||
InlineKeyboardButton(
|
||||
text=f"⬅️ назад",
|
||||
text="⬅️ назад",
|
||||
callback_data=f"call%{user_id}",
|
||||
style="primary"
|
||||
)
|
||||
|
||||
Reference in new issue
Block a user