taslim19
commited on
Commit
·
4f7440f
1
Parent(s):
71c7dff
fix(gban): handle PeerIdInvalid and improve user lookup
Browse files
DragMusic/plugins/sudo/gban.py
CHANGED
@@ -1,6 +1,6 @@
|
|
1 |
import asyncio
|
2 |
from pyrogram import filters
|
3 |
-
from pyrogram.errors import FloodWait
|
4 |
from pyrogram.types import Message
|
5 |
from DragMusic import app
|
6 |
from DragMusic.misc import SUDOERS
|
@@ -24,9 +24,14 @@ async def global_ban(client, message: Message, _):
|
|
24 |
if len(message.command) != 2:
|
25 |
return await message.reply_text(_["general_1"])
|
26 |
user = message.command[1]
|
27 |
-
if
|
|
|
|
|
28 |
user = user.replace("@", "")
|
29 |
-
|
|
|
|
|
|
|
30 |
else:
|
31 |
user = await extract_user(message)
|
32 |
|
@@ -85,9 +90,14 @@ async def global_un(client, message: Message, _):
|
|
85 |
if len(message.command) != 2:
|
86 |
return await message.reply_text(_["general_1"])
|
87 |
user = message.command[1]
|
88 |
-
if
|
|
|
|
|
89 |
user = user.replace("@", "")
|
90 |
-
|
|
|
|
|
|
|
91 |
else:
|
92 |
user = await extract_user(message)
|
93 |
|
|
|
1 |
import asyncio
|
2 |
from pyrogram import filters
|
3 |
+
from pyrogram.errors import FloodWait, PeerIdInvalid
|
4 |
from pyrogram.types import Message
|
5 |
from DragMusic import app
|
6 |
from DragMusic.misc import SUDOERS
|
|
|
24 |
if len(message.command) != 2:
|
25 |
return await message.reply_text(_["general_1"])
|
26 |
user = message.command[1]
|
27 |
+
if user.isdigit():
|
28 |
+
user = int(user)
|
29 |
+
else:
|
30 |
user = user.replace("@", "")
|
31 |
+
try:
|
32 |
+
user = await app.get_users(user)
|
33 |
+
except PeerIdInvalid:
|
34 |
+
return await message.reply_text("Invalid user ID or username. Please check and try again.")
|
35 |
else:
|
36 |
user = await extract_user(message)
|
37 |
|
|
|
90 |
if len(message.command) != 2:
|
91 |
return await message.reply_text(_["general_1"])
|
92 |
user = message.command[1]
|
93 |
+
if user.isdigit():
|
94 |
+
user = int(user)
|
95 |
+
else:
|
96 |
user = user.replace("@", "")
|
97 |
+
try:
|
98 |
+
user = await app.get_users(user)
|
99 |
+
except PeerIdInvalid:
|
100 |
+
return await message.reply_text("Invalid user ID or username. Please check and try again.")
|
101 |
else:
|
102 |
user = await extract_user(message)
|
103 |
|