electromagneticcyclone
/
duty-board-dog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

f fixes

This commit is contained in:
Egor Guslyancev 2023-12-19 02:25:42 -03:00
parent 406e47f44b
commit b43bfc5afd
Signed by: electromagneticcyclone
GPG Key ID: D7E709AA465A55F9
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bot.py
View File

@ -121,11 +121,8 @@ def mention(forum: int, uid: int) -> str | None:
stderr.write(f"Пользователя с ID {uid} нет в базе.\n")
return None
return (
"[{"
+ db.read(f"{forum}.people.{uid}.name")
+ " "
+ db.read(f"{forum}.people.{uid}.surname")
+ f"](tg://user?id={uid})"
f"[{db.read(f'{forum}.people.{uid}.name')} "
+ f"{db.read(f'{forum}.people.{uid}.surname')}](tg://user?id={uid})"
)
@ -990,7 +987,7 @@ def add_honor(message: telebot.types.Message):
"Вы в почёте, "
+ telebot.formatting.escape_markdown(
f"{people[user]['name']} {people[user]['surname']}"
)
),
)
@ -1037,8 +1034,8 @@ def add_force(message: telebot.types.Message):
chat,
"Отрабатывай, "
+ telebot.formatting.escape_markdown(
f"{people[user]["name"]} {people[user]["surname"]}"
)
f"{people[user]['name']} {people[user]['surname']}"
),
)
@ -1094,8 +1091,8 @@ def add_sick(message: telebot.types.Message):
bot.delete_message(forum, message.id)
bot.reply_to(
chat,
+ telebot.formatting.escape_markdown(
f"{people[user]["name"]} {people[user]["surname"]}"
+telebot.formatting.escape_markdown(
f"{people[user]['name']} {people[user]['surname']}"
)
+ " болеет до "
+ telebot.formatting.escape_markdown(
@ -1128,21 +1125,21 @@ def view_order(message: telebot.types.Message):
"*Очередь:*\n"
+ telebot.formatting.escape_markdown(
"\n".join(
[f"{people[u]["name"]} {people[u]["surname"]}" for u in order]
[f"{people[u]['name']} {people[u]['surname']}" for u in order]
)
)
+ "\n\n"
+ "*Почитаемые:*\n"
+ telebot.formatting.escape_markdown(
"\n".join(
[f"{people[u]["name"]} {people[u]["surname"]}" for u in honor]
[f"{people[u]['name']} {people[u]['surname']}" for u in honor]
)
)
+ "\n"
+ "*Виноватые:*\n"
+ telebot.formatting.escape_markdown(
"\n".join(
[f"{people[u]["name"]} {people[u]["surname"]}" for u in force]
[f"{people[u]['name']} {people[u]['surname']}" for u in force]
)
)
+ "\n"
@ -1150,7 +1147,7 @@ def view_order(message: telebot.types.Message):
+ telebot.formatting.escape_markdown(
"\n".join(
[
f"{people[u]["name"]} {people[u]["surname"]} до "
f"{people[u]['name']} {people[u]['surname']} до "
+ ".".join(
map(
str,
@ -1223,8 +1220,8 @@ def begin_queue(message: telebot.types.Message):
bot.reply_to(
chat,
"Держурство начнёт "
+ f"{db.read(f"{forum}.people.{start_with}.name")} "
+ f"{db.read(f"{forum}.people.{start_with}.surname")}"
+ f"{db.read(f'{forum}.people.{start_with}.name')} "
+ f"{db.read(f'{forum}.people.{start_with}.surname')}",
)