mir/microbot
2
0
Fork 0
mirror of https://github.com/Nick80835/microbot synced 2025-09-02 15:35:43 +00:00
Code Issues Releases Wiki Activity

prevent owner and sudo from being locked out on blacklist

Browse Source
This commit is contained in:
Nick80835
2020-08-30 19:09:57 -04:00
parent cad3d8005a
commit 9dfe62bbaf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ubot/command_handler.py
View File

@@ -39,10 +39,6 @@ class CommandHandler():
pattern_match = search(self.pattern_template.format(f"({prefix})", value["pattern"] + value["pattern_extra"], self.username), event.raw_text) pattern_match = search(self.pattern_template.format(f"({prefix})", value["pattern"] + value["pattern_extra"], self.username), event.raw_text)
if pattern_match: if pattern_match:
if self.is_blacklisted(event):
print(f"Attempted command ({event.raw_text}) from blacklisted ID {event.from_id}")
return
if not await self.check_privs(event, value): if not await self.check_privs(event, value):
return return
@@ -207,6 +203,10 @@ class CommandHandler():
raise exception raise exception
async def check_privs(self, event, value): async def check_privs(self, event, value):
if self.is_blacklisted(event) and not self.is_owner(event) and not self.is_sudo(event):
print(f"Attempted command ({event.raw_text}) from blacklisted ID {event.from_id}")
return False
if value["owner"] and not self.is_owner(event): if value["owner"] and not self.is_owner(event):
print(f"Attempted owner command ({event.raw_text}) from ID {event.from_id}") print(f"Attempted owner command ({event.raw_text}) from ID {event.from_id}")
return False return False