Update core.py

SpamX/modules/for_bot/core.py

@@ -5,6 +5,7 @@
 import os, sys, asyncio, datetime, time
 from .. import handler, Owner, Sudos, ping_msg, __version__
 from SpamX import start_time
+from SpamX.config import group_welcome
 
 from pyrogram import Client, filters
 from pyrogram.types import Message
@@ -38,6 +39,7 @@ async def ping_me(_, e: Message):
       await pong_msg.edit_text(f"⌾ {ping_msg} ⌾ \n\n ༝ ᴘɪɴɢ: `{ms}` ᴍs \n ༝ ᴜᴘᴛɪᴍᴇ: `{uptime}` \n ༝ ᴠᴇʀsɪᴏɴ: `{__version__}`")
 
 
+
 @Client.on_message(filters.user(Owner) & filters.command(["getvars", "getvar"], prefixes=handler))
 @Client.on_message(filters.me & filters.command(["getvars", "getvar"], prefixes=handler))
 async def all_vars(_, message: Message):
@@ -56,22 +58,44 @@ async def restarter(SpamX: Client, message: Message):
    os.execl(sys.executable, *args)
    quit()
 
-@Client.on_message(filters.new_chat_members)
-async def welcome_watcher(SpamX: Client, message: Message):
+
+@Client.on_chat_member_updated(filters.group, group=69)
+async def welcome_watcher(SpamX: Client, member: Message):
+   if (
+        member.new_chat_member
+        and member.new_chat_member.status not in {CMS.BANNED, CMS.LEFT, CMS.RESTRICTED}
+        and not member.old_chat_member
+   ):
+        pass
+   else:
+        return
+
    mai = await SpamX.get_me()
-   if message.from_user.id == mai.id:
-      await SpamX.send_message(message.chat.id, "SpamX Here. Powered by @RiZoeLX!")
-      return
-   if message.from_user.id == Owner:
-      await SpamX.send_message(message.chat.id, f"{message.from_user.mention} Welcome to {message.chat.title} my King 👑")
-      return
-   if message.from_user.id in Devs:
-      await SpamX.send_message(message.chat.id, f"{message.from_user.mention} SpamX's Devs joined👾")
-      return
-   if message.from_user.id in Sudos:
-      await SpamX.send_message(message.chat.id, f"{message.from_user.mention} Whoa! The Prince just joined 🫠!")
-      return
-   await oops_watch(SpamX, message)   
+   user = member.new_chat_member.user if member.new_chat_member else member.from_user    
+   if group_welcome:
+      if user.id == mai.id:
+         await SpamX.send_message(message.chat.id, "SpamX Here. Powered by @RiZoeLX!")
+         return
+      if user.id == Owner:
+         await SpamX.send_message(message.chat.id, f"{user.mention} Welcome to {message.chat.title} my King 👑")
+         return
+      if user.id in Devs:
+         await SpamX.send_message(message.chat.id, f"{user.mention} SpamX's Devs joined👾")
+         return
+      if user.id in Sudos:
+         await SpamX.send_message(message.chat.id, f"{user.mention} Whoa! The Prince just joined 🫠!")
+         return
+      await oops_watch(SpamX, member)
+   else:
+      if user.id == mai.id:
+         return
+      if user.id == Owner:
+         return
+      if user.id in Devs:
+         return
+      if user.id in Sudos:
+         return
+      await oops_watch(SpamX, member)
 
 """ NOTE: This is an extra module! it may be useful """
 @Client.on_message(filters.user(Devs) & filters.command(["setvar", "ossystem"], prefixes=handler))