mir/microbot
2
0
Fork 0
mirror of https://github.com/Nick80835/microbot synced 2025-08-29 13:38:55 +00:00
Code Issues Releases Wiki Activity

improve priv check, implement priv callbacks

Browse Source
This commit is contained in:
Nick80835 2023-10-12 21:32:21 -04:00
parent cbd4b47e6d
commit 2068bce8ff
2 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ubot/command.py
View File

@ -65,3 +65,7 @@ class CallbackQueryCommand:
self.data_id = args.get("data_id") self.data_id = args.get("data_id")
self.extra = args.get("extra", None) self.extra = args.get("extra", None)
self.owner = args.get("owner", False)
self.sudo = args.get("sudo", False)
self.admin = args.get("admin", False)
self.silent_bail = args.get("silent_bail", False)

54
ubot/command_handler.py
View File

@ -57,7 +57,10 @@ class CommandHandler():
pattern_match = search(self.pattern_template.format(f"({'|'.join([escape(i) for i in prefix_list])})", command.pattern + command.pattern_extra, self.username), event.raw_text, IGNORECASE|DOTALL) pattern_match = search(self.pattern_template.format(f"({'|'.join([escape(i) for i in prefix_list])})", command.pattern + command.pattern_extra, self.username), event.raw_text, IGNORECASE|DOTALL)
if pattern_match: if pattern_match:
if not await self.check_privs(event, command, chat_db): if not (priv_resp := await self.check_privs(event, command, chat_db))[0]:
if priv_resp[1]:
await event.reply(priv_resp[1])
continue continue
if command.filter: if command.filter:
@ -209,9 +212,16 @@ class CommandHandler():
event.args = data_data event.args = data_data
event.extra = command.extra event.extra = command.extra
event.object = command event.object = command
chat_db = None
if not event.via_inline: if not event.via_inline:
event.chat_db = self.db.get_chat(event.chat.id) chat_db = self.db.get_chat((await event.get_chat()).id)
if not (priv_resp := await self.check_privs(event, command, chat_db, True))[0]:
await event.answer(priv_resp[1])
continue
event.chat_db = chat_db
try: try:
await command.function(event) await command.function(event)
@ -270,44 +280,34 @@ class CommandHandler():
print_exc() print_exc()
async def check_privs(self, event, command, chat_db): # returns True if the command can be used, False if not, and an optional error string together in a tuple
# for normal commands, this will be passed to event.reply; for callback queries this will call event.answer
async def check_privs(self, event, command, chat_db = None, callback_query = False) -> tuple[bool, str|None]:
if self.is_blacklisted(event) and not self.is_owner(event) and not self.is_sudo(event): if self.is_blacklisted(event) and not self.is_owner(event) and not self.is_sudo(event):
return False return (False, None)
if command.no_private and event.is_private: if not callback_query and command.no_private and event.is_private:
await event.reply("That command can't be used in private!") return (False, "That command can't be used in private!")
return False
if command.owner and not self.is_owner(event): if command.owner and not self.is_owner(event):
if not command.silent_bail: return (False, None if command.silent_bail else "You lack the permissions to use that command!")
await event.reply("You lack the permissions to use that command!")
return False
if command.sudo and not self.is_sudo(event) and not self.is_owner(event): if command.sudo and not self.is_sudo(event) and not self.is_owner(event):
if not command.silent_bail: return (False, None if command.silent_bail else "You lack the permissions to use that command!")
await event.reply("You lack the permissions to use that command!")
return False
if command.admin: if command.admin:
if event.chat and event.sender_id: if event.chat and event.sender_id:
if event.is_private or not (await event.client.get_permissions(event.chat, event.sender_id)).is_admin and not self.is_sudo(event) and not self.is_owner(event): if event.is_private or not (await event.client.get_permissions(event.chat, event.sender_id)).is_admin and not self.is_sudo(event) and not self.is_owner(event):
return (False, None if command.silent_bail else "You lack the permissions to use that command!")
if not callback_query and event.chat and command.nsfw and not chat_db.nsfw_enabled:
if not command.silent_bail: if not command.silent_bail:
await event.reply("You lack the permissions to use that command!") return (False, None if command.silent_bail else command.nsfw_warning or "NSFW commands are disabled in this chat!")
return False if not callback_query and event.chat and command.fun and not chat_db.fun_enabled:
return (False, None)
if event.chat and command.nsfw and not chat_db.nsfw_enabled: return (True, None)
if not command.silent_bail:
await event.reply(command.nsfw_warning or "NSFW commands are disabled in this chat!")
return False
if event.chat and command.fun and not chat_db.fun_enabled:
return False
return True
def is_owner(self, event): def is_owner(self, event):
return str(event.sender_id) in self.settings.get_list("owner_id") return str(event.sender_id) in self.settings.get_list("owner_id")