Feat: Automatically remove "user joined group" message in case user has been kicked

Author: MattiaFailla

tg_bot/modules/sql/users_sql.py

@@ -27,6 +27,19 @@ def __repr__(self):
         return "<User {} ({})>".format(self.username, self.user_id)
 
 
+class RemovedUser(BASE):
+    __tablename__ == "removed_user"
+    user_id = Column(BigInteger, primary_key=True)
+    chat_id = Column(String(14), primary_key=True)
+
+    def __init__(self, user_id, chat_id):
+        self.user_id = user_id
+        self.chat_id = str(chat_id)
+
+    def __repr__(self):
+        return f"<RemovedUser {self.user_id} | {self.chat_id}>"
+
+
 class Chats(BASE):
     __tablename__ = "chats"
     chat_id = Column(String(14), primary_key=True)
@@ -72,6 +85,7 @@ def __repr__(self):
 Users.__table__.create(checkfirst=True)
 Chats.__table__.create(checkfirst=True)
 ChatMembers.__table__.create(checkfirst=True)
+RemovedUser.__table__.create(checkfirst=True)
 
 INSERTION_LOCK = threading.RLock()
 
@@ -197,6 +211,16 @@ def migrate_chat(old_chat_id, new_chat_id):
 ensure_bot_in_db()
 
 
+def remove_user(user_id, chat_id):
+    with INSERTION_LOCK:
+        user = SESSION.query(RemovedUser).get((user_id, chat_id))
+        if not user:
+            user = RemovedUser(user_id, chat_id)
+            SESSION.add(user)
+            SESSION.flush()
+        SESSION.commit()
+
+
 def del_user(user_id):
     with INSERTION_LOCK:
         curr = SESSION.query(Users).get(user_id)

tg_bot/modules/welcome.py

@@ -6,7 +6,7 @@
 from telegram import Message, Chat, Update, Bot, User
 from telegram import ParseMode, InlineKeyboardMarkup
 from telegram.error import BadRequest
-from telegram.ext import MessageHandler, Filters, CommandHandler, run_async
+from telegram.ext import MessageHandler, Filters, CommandHandler, run_async, JobQueue
 from telegram.utils.helpers import mention_markdown, mention_html, escape_markdown
 
 import tg_bot.modules.sql.users_sql as user_sql
@@ -255,8 +255,9 @@ def new_member(bot: Bot, update: Update):
             else:
                 # Kicking the user because of the username
                 user_id = new_mem.id
-                message.reply_text("L'utente non ha uno username, quindi verrà rimosso.")
                 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
 
         prev_welc = sql.get_clean_pref(chat.id)
         if prev_welc: