fix: improve ban/unban commands

Author: devcarron

blackjackbot/commands/admin/commands.py

@@ -18,43 +18,48 @@
 @admin_method
 def ban_user_cmd(update, context):
     """Bans a user from using the bot"""
+    usage_message = r"Please provide a valid userid\. Usage: `/ban <userid>`"
     # Try to get user_id from command
     if len(context.args) != 1:
-        update.message.reply_text("Please provide a valid user_id - `/ban <user_id>`", parse_mode=ParseMode.MARKDOWN_V2)
+        update.effective_message.reply_text(usage_message, parse_mode=ParseMode.MARKDOWN_V2)
         return
 
     match = re.search(r"^\d+$", context.args[0])
     if not match:
-        logger.error(f"The user_id did not match: {context.args}")
+        logger.error(f"The user_id did not match. Args: {context.args}")
+        update.effective_message.reply_text(usage_message, parse_mode=ParseMode.MARKDOWN_V2)
         return
     user_id = match.group(0)
 
     db = Database()
     db.ban_user(user_id=user_id)
 
     logger.info(f"Admin '{update.effective_user.id}' banned user '{user_id}'!")
-    notify_admins(f"Admin '{update.effective_user.id}' banned user '{user_id}'!")
+    notify_admins(f"Admin '{update.effective_user.id}' banned user '{user_id}'!", context)
 
 
 @admin_method
 def unban_user_cmd(update, context):
     """Unbans a user from using the bot"""
+    usage_message = r"Please provide a valid userid\. Usage: `/unban <userid>`"
+
     # Try to get user_id from command
     if len(context.args) != 1:
-        update.message.reply_text("Please provide a valid user_id - `/unban <user_id>`", parse_mode=ParseMode.MARKDOWN_V2)
+        update.message.reply_text(usage_message, parse_mode=ParseMode.MARKDOWN_V2)
         return
 
     match = re.search(r"^\d+$", context.args[0])
     if not match:
-        logger.error(f"The user_id did not match: {context.args}")
+        logger.error(f"The user_id did not match. Args: {context.args}")
+        update.effective_message.reply_text(usage_message, parse_mode=ParseMode.MARKDOWN_V2)
         return
     user_id = match.group(0)
 
     db = Database()
     db.unban_user(user_id=user_id)
 
     logger.info(f"Admin '{update.effective_user.id}' unbanned user '{user_id}'!")
-    notify_admins(f"Admin '{update.effective_user.id}' unbanned user '{user_id}'!")
+    notify_admins(f"Admin '{update.effective_user.id}' unbanned user '{user_id}'!", context)
 
 
 @admin_method