feat: enhance error handling for dismissed join requests and deactivated users

Author: pplulee

src/api/services/approval.py

@@ -37,9 +37,16 @@ async def dismiss_join_request(chat_id: int, user_id: int) -> bool:
             logger.warning(f"Bot is not a member of chat {chat_id}")
         elif "not_enough_rights" in error_msg:
             logger.warning(f"Bot lacks permissions in chat {chat_id}")
+        elif "deactivated" in error_msg:
+            logger.warning(f"User {user_id} is deactivated, skipping dismiss")
         else:
             logger.warning(f"Telegram API error on dismiss: {e}")
         return False
+    except Exception as e:
+        if "deactivated" in str(e).lower():
+            logger.warning(f"User {user_id} is deactivated, skipping dismiss: {e}")
+            return False
+        raise
     finally:
         await bot.session.close()
 

src/bot/tasks.py

@@ -16,7 +16,14 @@ async def cleanup_and_dismiss_expired_requests() -> None:
     try:
         to_dismiss = await cleanup_expired_sessions()
         for chat_id, user_id in to_dismiss:
-            await dismiss_join_request(chat_id=chat_id, user_id=user_id)
+            try:
+                await dismiss_join_request(chat_id=chat_id, user_id=user_id)
+            except Exception as e:
+                logger.warning(
+                    "Skip dismiss for user %s (chat %s): %s",
+                    user_id, chat_id, e,
+                    exc_info=False
+                )
     except Exception as e:
         logger.exception("Error in cleanup_and_dismiss_expired_requests: %s", e)