From 8bc272cadbf4f5a481dcf90bb2b2dd7f26f513d4 Mon Sep 17 00:00:00 2001
From: Parvshah-01 <108631149+Parvshah-01@users.noreply.github.com>
Date: Thu, 5 Jun 2025 20:38:06 +0530
Subject: [PATCH] Update tools.py (#472)

---
 pyUltroid/fns/tools.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyUltroid/fns/tools.py b/pyUltroid/fns/tools.py
index eaafc70..daceef3 100644
--- a/pyUltroid/fns/tools.py
+++ b/pyUltroid/fns/tools.py
@@ -1081,10 +1081,12 @@ def safe_load(file, *args, **kwargs):
 
 
 def get_chat_and_msgid(link):
-    m = re.findall(r"t\.me\/(c\/)?(\d+)\/(\d+)", link)
+    m = re.findall(r"t\.me\/(c\/)?([^\/]+)\/(\d+)", link)
     if m:
-        _, chat, msg_id = m[0]
-        return int("-100" + chat) if _ else chat, int(msg_id)
+        is_channel, chat, msg_id = m[0]
+        if is_channel:
+            chat = int("-100" + chat)
+        return chat, int(msg_id)
 
     m = re.findall(r"user_id=(\d+)&message_id=(\d+)", link)
     if m: