Fix: Improve kicked user handler

Author: MattiaFailla

tg_bot/modules/sql/users_sql.py

@@ -28,16 +28,18 @@ def __repr__(self):
 
 
 class RemovedUser(BASE):
-    __tablename__ == "removed_user"
+    __tablename__ = "removed_user"
     user_id = Column(BigInteger, primary_key=True)
     chat_id = Column(String(14), primary_key=True)
+    username = Column(UnicodeText)
 
-    def __init__(self, user_id, chat_id):
+    def __init__(self, user_id, chat_id, username):
         self.user_id = user_id
         self.chat_id = str(chat_id)
+        self.username = str(username)
 
     def __repr__(self):
-        return f"<RemovedUser {self.user_id} | {self.chat_id}>"
+        return f"<RemovedUser {self.user_id}, {self.username} | {self.chat_id}>"
 
 
 class Chats(BASE):
@@ -211,11 +213,11 @@ def migrate_chat(old_chat_id, new_chat_id):
 ensure_bot_in_db()
 
 
-def remove_user(user_id, chat_id):
+def remove_user(user_id, chat_id, username):
     with INSERTION_LOCK:
         user = SESSION.query(RemovedUser).get((user_id, chat_id))
         if not user:
-            user = RemovedUser(user_id, chat_id)
+            user = RemovedUser(user_id, chat_id, username)
             SESSION.add(user)
             SESSION.flush()
         SESSION.commit()

tg_bot/modules/welcome.py

@@ -253,11 +253,11 @@ def new_member(bot: Bot, update: Update):
                                 "Diamine, non riesco a bannare questo utente."
                             )
             else:
-                # Kicking the user because of the username
+                # Kicking the user because of the empty username
                 user_id = new_mem.id
                 chat.kick_member(user_id, until_date=time.time() + 300)
-                user_sql.remove_user(user_id, chat.id)  # Keep track of whom we removed and where
-                bot.delete_message(chat.id, message.message_id)  # Delete " user joined group" message
+                user_sql.remove_user(user_id, chat.id, new_mem.first_name)  # Keep track of whom we removed and where
+                bot.delete_message(chat.id, message.message_id)  # Delete "user joined group" message
 
         prev_welc = sql.get_clean_pref(chat.id)
         if prev_welc: