Merge Beta with Stable releases #1

Merged
profitroll merged 52 commits from dev into master 2022-12-16 16:14:41 +02:00
2 changed files with 3 additions and 4 deletions
Showing only changes of commit f471deedd2 - Show all commits

View File

@ -23,6 +23,7 @@ async def cmd_application(app, msg):
holo_user = HoloUser((await app.get_users(msg.command[1])).id)
except bad_request_400.UsernameInvalid:
await msg.reply_text(locale("no_user_application", "message").format(msg.command[1]), quote=should_quote(msg))
return
application = col_applications.find_one({"user": holo_user.id})
application_content = []

View File

@ -53,8 +53,7 @@ async def confirm_yes(app, msg):
InlineKeyboardButton(text=str(locale("reapply_no", "button")), callback_data=f"reapply_no_{holo_user.id}")
]
]
),
parse_mode=ParseMode.MARKDOWN
)
)
else:
await app.send_message(chat_id=configGet("admin_group"), text=(locale("application_got", "message")).format(str(holo_user.id), msg.from_user.first_name, msg.from_user.last_name, msg.from_user.username, "\n".join(application_content)), parse_mode=ParseMode.MARKDOWN, reply_markup=InlineKeyboardMarkup(
@ -72,8 +71,7 @@ async def confirm_yes(app, msg):
InlineKeyboardButton(text=str(locale("sub_russian", "button")), callback_data=f"sub_russian_{holo_user.id}")
]
]
),
parse_mode=ParseMode.MARKDOWN
)
)
logWrite(f"User {holo_user.id} sent his application and it will now be reviewed")