Skip to content

Commit 353617e

Browse files
An0nXAn0nX
committed
feat: moved from html to markdown parse mode
1 parent 50d434a commit 353617e

File tree

3 files changed

+45
-49
lines changed

3 files changed

+45
-49
lines changed

‎userbot/locales/core/en.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"account_list_header": "<b>Accounts in the database:</b>",
3-
"account_list_none": "\n<i>No accounts found in the database.</i>",
4-
"account_list_entry": "{status_icon} <code>{account_name}</code> (ID: {account_id}) - {status_text}{last_used}",
2+
"account_list_header": "**Accounts in the database:**",
3+
"account_list_none": "\n*No accounts found in the database.*",
4+
"account_list_entry": "{status_icon} `{account_name}` (ID: {account_id}) - {status_text}{last_used}",
55
"status_enabled": "Enabled",
66
"status_disabled": "Disabled",
77
"last_active": " | Last active: {datetime}",
@@ -34,18 +34,18 @@
3434
"lang_downloading": "📥 Downloading language pack...",
3535
"lang_download_fail": "❌ Failed to download language pack: {error}",
3636
"restarting_now": "🔄 **Restarting...**",
37-
"ping_response": "🏓 <b>Pong!</b>\n\n<b>User → Server:</b> <code>{user_server} ms</code>\n<b>Server → Telegram:</b> <code>{server_api} ms</code>\n<b>Total Round-trip:</b> <code>{total} ms</code>",
37+
"ping_response": "🏓 **Pong!**\n\n**User → Server:** `{user_server} ms`\n**Server → Telegram:** `{server_api} ms`\n**Total Round-trip:** `{total} ms`",
3838
"logs_processing": "⏳ Processing logs request...",
3939
"logs_err_args": "❌ Error in command arguments.",
40-
"help_logs_usage": "<b>Usage:</b> <code>.logs [head|tail] [count] [level=LEVEL] [source=SOURCE]</code>\n<b>Example:</b> <code>.logs tail 200 level=error source=my_module</code>\n<b>Purge:</b> <code>.logs purge</code>",
40+
"help_logs_usage": "**Usage:** `.logs [head|tail] [count] [level=LEVEL] [source=SOURCE]`\n**Example:** `.logs tail 200 level=error source=my_module`\n**Purge:** `.logs purge`",
4141
"logs_confirm_purge": "️⚠️ Are you sure you want to **PERMANENTLY** delete all logs from the database?\n\nSend `yes` to confirm.",
4242
"logs_purge_success": "✅ All {count} log entries have been deleted.",
4343
"logs_purge_cancelled": "Log purge cancelled.",
4444
"logs_not_found": "❌ No logs matching your query were found.",
45-
"logs_caption": "📄 <b>Logs Report</b>\n\n<b>Mode:</b> <code>{mode}</code>\n<b>Line Limit:</b> <code>{lines}</code>\n<b>Level:</b> <code>{level}</code>\n<b>Source:</b> <code>{source}</code>\n\n<b>Entries Found:</b> <code>{found}</code>",
46-
"help_header_management": "<b>➖ Management</b>",
47-
"help_header_modules": "<b>➖ Modules</b>",
48-
"help_header_utils": "<b>➖ Utilities</b>",
45+
"logs_caption": "📄 **Logs Report**\n\n**Mode:** `{mode}`\n**Line Limit:** `{lines}`\n**Level:** `{level}`\n**Source:** `{source}`\n\n**Entries Found:** `{found}`",
46+
"help_header_management": "**➖ Management**",
47+
"help_header_modules": "**➖ Modules**",
48+
"help_header_utils": "**➖ Utilities**",
4949
"help_listaccs": "List all accounts",
5050
"help_addacc": "Add a new account",
5151
"help_delacc": "Delete an account",
@@ -61,5 +61,5 @@
6161
"help_logs": "Show logs with filters",
6262
"help_logs_purge": "Purge all logs",
6363
"help_about": "About the userbot",
64-
"about_text": "<b>DeBot Userbot on SQLAlchemy</b>"
64+
"about_text": "**DeBot Userbot on SQLAlchemy**"
6565
}

‎userbot/locales/core/ru.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"account_list_header": "<b>Аккаунты в базе данных:</b>",
3-
"account_list_none": "\n<i>Нет аккаунтов в базе данных.</i>",
4-
"account_list_entry": "{status_icon} <code>{account_name}</code> (ID: {account_id}) - {status_text}{last_used}",
2+
"account_list_header": "**Аккаунты в базе данных:**",
3+
"account_list_none": "\n*Нет аккаунтов в базе данных.*",
4+
"account_list_entry": "{status_icon} `{account_name}` (ID: {account_id}) - {status_text}{last_used}",
55
"status_enabled": "Включен",
66
"status_disabled": "Выключен",
77
"last_active": " | Последняя активность: {datetime}",
@@ -34,18 +34,18 @@
3434
"lang_downloading": "📥 Загружаю языковой пакет...",
3535
"lang_download_fail": "❌ Не удалось загрузить языковой пакет: {error}",
3636
"restarting_now": "🔄 **Перезагрузка...**",
37-
"ping_response": "🏓 <b>Pong!</b>\n\n<b>Пользователь → Сервер:</b> <code>{user_server} ms</code>\n<b>Сервер → Telegram:</b> <code>{server_api} ms</code>\n<b>Общая задержка:</b> <code>{total} ms</code>",
37+
"ping_response": "🏓 **Pong!**\n\n**Пользователь → Сервер:** `{user_server} ms`\n**Сервер → Telegram:** `{server_api} ms`\n**Общая задержка:** `{total} ms`",
3838
"logs_processing": "⏳ Обрабатываю запрос логов...",
3939
"logs_err_args": "❌ Ошибка в аргументах команды.",
40-
"help_logs_usage": "<b>Использование:</b> <code>.logs [head|tail] [кол-во] [level=УРОВЕНЬ] [source=ИСТОЧНИК]</code>\n<b>Пример:</b> <code>.logs tail 200 level=error source=my_module</code>\n<b>Очистка:</b> <code>.logs purge</code>",
40+
"help_logs_usage": "**Использование:** `.logs [head|tail] [кол-во] [level=УРОВЕНЬ] [source=ИСТОЧНИК]`\n**Пример:** `.logs tail 200 level=error source=my_module`\n**Очистка:** `.logs purge`",
4141
"logs_confirm_purge": "️⚠️ Вы уверены, что хотите **НАВСЕГДА** удалить все логи из базы данных?\n\nОтправьте `да` для подтверждения.",
4242
"logs_purge_success": "✅ Все {count} записей логов были удалены.",
4343
"logs_purge_cancelled": "Очистка логов отменена.",
4444
"logs_not_found": "❌ Логи, соответствующие вашему запросу, не найдены.",
45-
"logs_caption": "📄 <b>Отчет по логам</b>\n\n<b>Режим:</b> <code>{mode}</code>\n<b>Лимит строк:</b> <code>{lines}</code>\n<b>Уровень:</b> <code>{level}</code>\n<b>Источник:</b> <code>{source}</code>\n\n<b>Найдено записей:</b> <code>{found}</code>",
46-
"help_header_management": "<b>➖ Управление</b>",
47-
"help_header_modules": "<b>➖ Модули</b>",
48-
"help_header_utils": "<b>➖ Утилиты</b>",
45+
"logs_caption": "📄 **Отчет по логам**\n\n**Режим:** `{mode}`\n**Лимит строк:** `{lines}`\n**Уровень:** `{level}`\n**Источник:** `{source}`\n\n**Найдено записей:** `{found}`",
46+
"help_header_management": "**➖ Управление**",
47+
"help_header_modules": "**➖ Модули**",
48+
"help_header_utils": "**➖ Утилиты**",
4949
"help_listaccs": "Показать все аккаунты",
5050
"help_addacc": "Добавить новый аккаунт",
5151
"help_delacc": "Удалить аккаунт",
@@ -61,5 +61,5 @@
6161
"help_logs": "Показать логи с фильтрами",
6262
"help_logs_purge": "Очистить все логи",
6363
"help_about": "О юзерботе",
64-
"about_text": "<b>DeBot Userbot на SQLAlchemy</b>"
64+
"about_text": "**DeBot Userbot на SQLAlchemy**"
6565
}

‎userbot/src/core_handlers.py‎

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ async def logs_handler(event: events.NewMessage.Event):
6565
return
6666

6767
if not args:
68-
await event.edit(await event.client.get_string("help_logs_usage"))
68+
await event.edit(await event.client.get_string("help_logs_usage"), parse_mode="markdown")
6969
return
7070

7171
command: str = args[0].lower()
@@ -83,6 +83,8 @@ async def logs_handler(event: events.NewMessage.Event):
8383
await conv.send_message(await event.client.get_string("logs_purge_cancelled"))
8484
except asyncio.TimeoutError:
8585
await event.respond(await event.client.get_string("delete_timeout"))
86+
finally:
87+
await event.delete()
8688
return
8789

8890
# --- Log Fetching Logic ---
@@ -91,8 +93,7 @@ async def logs_handler(event: events.NewMessage.Event):
9193
level: Optional[str] = None
9294
source: Optional[str] = None
9395

94-
# Parse arguments
95-
if args[0].lower() in ["head", "tail"]:
96+
if args and args[0].lower() in ["head", "tail"]:
9697
mode = args.pop(0).lower()
9798

9899
if args and args[0].isdigit():
@@ -113,7 +114,6 @@ async def logs_handler(event: events.NewMessage.Event):
113114
await event.edit(await event.client.get_string("logs_not_found"))
114115
return
115116

116-
# Prepare file and caption
117117
log_content: str = "\n".join(
118118
f"[{log.timestamp.strftime('%Y-%m-%d %H:%M:%S')}] [{log.level}] [{log.module_name or 'System'}] {log.message}"
119119
for log in logs_list
@@ -137,7 +137,7 @@ async def logs_handler(event: events.NewMessage.Event):
137137
file=log_file,
138138
caption=caption,
139139
attributes=[DocumentAttributeFilename(filename)],
140-
parse_mode="HTML"
140+
parse_mode="markdown"
141141
)
142142

143143
# --- Account Management Handlers ---
@@ -165,7 +165,7 @@ async def list_accounts_handler(event: events.NewMessage.Event):
165165
account_id=acc.account_id, status_text=status_text, last_used=last_used
166166
)
167167
)
168-
await event.edit("\n".join(response_lines), parse_mode="html")
168+
await event.edit("\n".join(response_lines), parse_mode="markdown")
169169

170170
async def add_account_handler(event: events.NewMessage.Event):
171171
account_name: str = event.pattern_match.group(1)
@@ -298,47 +298,43 @@ async def set_lang_handler(event: events.NewMessage.Event):
298298
await event.edit(await event.client.get_string("lang_update_fail"))
299299

300300
async def help_commands_handler(event: events.NewMessage.Event):
301-
# Part 1: Management
302301
help_management = "\n".join([
303-
f"<code>.listaccs</code> - {await event.client.get_string('help_listaccs')}",
304-
f"<code>.addacc &lt;name&gt;</code> - {await event.client.get_string('help_addacc')}",
305-
f"<code>.delacc &lt;name&gt;</code> - {await event.client.get_string('help_delacc')}",
306-
f"<code>.toggleacc &lt;name&gt;</code> - {await event.client.get_string('help_toggleacc')}",
307-
f"<code>.setlang &lt;code|url&gt;</code> - {await event.client.get_string('help_setlang')}"
302+
f"`{'.listaccs'}` - {await event.client.get_string('help_listaccs')}",
303+
f"`{'.addacc <name>'}` - {await event.client.get_string('help_addacc')}",
304+
f"`{'.delacc <name>'}` - {await event.client.get_string('help_delacc')}",
305+
f"`{'.toggleacc <name>'}` - {await event.client.get_string('help_toggleacc')}",
306+
f"`{'.setlang <code|url>'}` - {await event.client.get_string('help_setlang')}"
308307
])
309308

310-
# Part 2: Module Management
311309
help_modules = "\n".join([
312-
f"<code>.addmod</code> - {await event.client.get_string('help_addmod')}",
313-
f"<code>.delmod &lt;name&gt;</code> - {await event.client.get_string('help_delmod')}",
314-
f"<code>.trustmod &lt;name&gt;</code> - {await event.client.get_string('help_trustmod')}",
315-
f"<code>.configmod &lt;...&gt;</code> - {await event.client.get_string('help_configmod')}"
310+
f"`{'.addmod'}` - {await event.client.get_string('help_addmod')}",
311+
f"`{'.delmod <name>'}` - {await event.client.get_string('help_delmod')}",
312+
f"`{'.trustmod <name>'}` - {await event.client.get_string('help_trustmod')}",
313+
f"`{'.configmod <...>'}` - {await event.client.get_string('help_configmod')}"
316314
])
317315

318-
# Part 3: Utilities
319316
help_utils = "\n".join([
320-
f"<code>.ping</code> - {await event.client.get_string('help_ping')}",
321-
f"<code>.restart</code> - {await event.client.get_string('help_restart')}",
322-
f"<code>.logs</code> - {await event.client.get_string('help_logs')}",
323-
f"<code>.logs purge</code> - {await event.client.get_string('help_logs_purge')}",
324-
f"<code>.updatemodules</code> - {await event.client.get_string('help_updatemodules')}",
325-
f"<code>.about</code> - {await event.client.get_string('help_about')}"
317+
f"`{'.ping'}` - {await event.client.get_string('help_ping')}",
318+
f"`{'.restart'}` - {await event.client.get_string('help_restart')}",
319+
f"`{'.logs'}` - {await event.client.get_string('help_logs')}",
320+
f"`{'.logs purge'}` - {await event.client.get_string('help_logs_purge')}",
321+
f"`{'.updatemodules'}` - {await event.client.get_string('help_updatemodules')}",
322+
f"`{'.about'}` - {await event.client.get_string('help_about')}"
326323
])
327324

328-
# Combine all parts
329325
final_text = (
330326
f"{await event.client.get_string('help_header_management')}\n{help_management}\n\n"
331327
f"{await event.client.get_string('help_header_modules')}\n{help_modules}\n\n"
332328
f"{await event.client.get_string('help_header_utils')}\n{help_utils}"
333329
)
334330

335-
await event.edit(final_text, parse_mode="HTML")
331+
await event.edit(final_text, parse_mode="markdown")
336332

337333
async def about_command_handler(event: events.NewMessage.Event):
338-
await event.edit(await event.client.get_string("about_text"), parse_mode="HTML")
334+
await event.edit(await event.client.get_string("about_text"), parse_mode="markdown")
339335

340336
async def restart_handler(event: events.NewMessage.Event):
341-
await event.edit(await event.client.get_string("restarting_now"))
337+
await event.edit(await event.client.get_string("restarting_now"), parse_mode="markdown")
342338
await asyncio.sleep(1)
343339
sys.exit(0)
344340

@@ -362,4 +358,4 @@ async def ping_handler(event: events.NewMessage.Event):
362358
server_api=f"{api_latency:.2f}",
363359
total=f"{total_latency:.2f}"
364360
)
365-
await event.edit(response_text, parse_mode="HTML")
361+
await event.edit(response_text, parse_mode="markdown")

0 commit comments

Comments
 (0)