From 6cd52935f6ff404aa38a12a2eb58e31f64be8c7c Mon Sep 17 00:00:00 2001 From: Sayan Biswas Date: Mon, 3 Jan 2022 19:46:39 +0100 Subject: [PATCH] feds: fedadmins: handle deleted accounts --- AstrakoBot/modules/feds.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AstrakoBot/modules/feds.py b/AstrakoBot/modules/feds.py index 0ac68600b0..3418da436f 100644 --- a/AstrakoBot/modules/feds.py +++ b/AstrakoBot/modules/feds.py @@ -538,8 +538,8 @@ def fed_admin(update: Update, context: CallbackContext): owner = bot.get_chat(info["owner"]) try: owner_name = owner.first_name + " " + owner.last_name - except: - owner_name = owner.first_name + except BaseException: + owner_name = owner.first_name or 'Deleted' text += " • {}\n".format(mention_html(owner.id, owner_name)) members = sql.all_fed_members(fed_id) @@ -549,6 +549,7 @@ def fed_admin(update: Update, context: CallbackContext): text += "\n🔱 Admin:\n" for x in members: user = bot.get_chat(x) + name = user.first_name or 'Deleted' text += " • {}\n".format(mention_html(user.id, user.first_name)) update.effective_message.reply_text(text, parse_mode=ParseMode.HTML)