Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

date permissions module to use command spec args

Browse source
This commit is contained in:
jesopo 2020-01-28 01:23:40 +00:00
parent f3c31ec3c1
commit d95f5362bf
1 changed files with 23 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/core_modules/permissions/__init__.py
View file

@ -182,11 +182,9 @@ class Module(ModuleManager.BaseModule):
event["stdout"].write("Your permissions: %s" % ", ".join(permissions)) event["stdout"].write("Your permissions: %s" % ", ".join(permissions))
@utils.hook("received.command.register", private_only=True, min_args=1) @utils.hook("received.command.register")
@utils.kwarg("min_args", 1)
@utils.kwarg("private_only", True)
@utils.kwarg("help", "Register your nickname") @utils.kwarg("help", "Register your nickname")
@utils.kwarg("usage", "<password>") @utils.spec("!=privateonly !<password>string")
def register(self, event): def register(self, event):
hash, salt = self._get_hash(event["server"], event["user"].nickname) hash, salt = self._get_hash(event["server"], event["user"].nickname)
if not hash and not salt: if not hash and not salt:
@ -202,23 +200,17 @@ class Module(ModuleManager.BaseModule):
else: else:
event["stderr"].write("This nickname is already registered") event["stderr"].write("This nickname is already registered")
@utils.hook("received.command.identify", private_only=True, min_args=1) @utils.hook("received.command.identify")
@utils.kwarg("min_args", 1)
@utils.kwarg("private_only", True)
@utils.kwarg("help", "Identify for your current nickname") @utils.kwarg("help", "Identify for your current nickname")
@utils.kwarg("usage", "[account] <password>") @utils.spec("!=privateonly ?<account>aword !<password>string")
def identify(self, event): def identify(self, event):
if not event["user"].channels: if not event["user"].channels:
raise utils.EventError("You must share at least one channel " raise utils.EventError("You must share at least one channel "
"with me before you can identify") "with me before you can identify")
if not self._is_identified(event["user"]): if not self._is_identified(event["user"]):
if len(event["args_split"]) > 1: account = event["spec"][0] or event["user"].nickname
account = event["args_split"][0] password = event["spec"][1]
password = " ".join(event["args_split"][1:])
else:
account = event["user"].nickname
password = event["args"]
hash, salt = self._get_hash(event["server"], account) hash, salt = self._get_hash(event["server"], account)
if hash and salt: if hash and salt:
@ -240,29 +232,26 @@ class Module(ModuleManager.BaseModule):
self._account_name(event["user"])) self._account_name(event["user"]))
@utils.hook("received.command.permission") @utils.hook("received.command.permission")
@utils.kwarg("min_args", 2) @utils.spec("!'list,clear !<nickname>ouser")
@utils.kwarg("usage", "list <account>") @utils.spec("!'add,remove !<nickname>ouser !<permission>tstring")
@utils.kwarg("usage", "clear <account>")
@utils.kwarg("usage", "add <account> <permission>")
@utils.kwarg("usage", "remove <account> <permission>")
@utils.kwarg("permission", "permissions.change") @utils.kwarg("permission", "permissions.change")
def permission(self, event): def permission(self, event):
subcommand = event["args_split"][0].lower() subcommand = event["spec"][0].lower()
account = event["args_split"][1] target_user = event["spec"][1]
target_user = event["server"].get_user(account)
if subcommand == "list": if subcommand == "list":
event["stdout"].write("Permissions for %s: %s" % ( event["stdout"].write("Permissions for %s: %s" % (
account, ", ".join(self._get_permissions(target_user)))) target_user.nickname,
", ".join(self._get_permissions(target_user))))
elif subcommand == "clear": elif subcommand == "clear":
if not self._get_permissions(target_user): if not self._get_permissions(target_user):
raise utils.EventError("%s has no permissions" % account) raise utils.EventError("%s has no permissions"
% target_user.nickname)
target_user.del_setting("permissions") target_user.del_setting("permissions")
event["stdout"].write("Cleared permissions for %s" % account) event["stdout"].write("Cleared permissions for %s"
% target_user.nickname)
else: else:
permissions = event["args_split"][2:] permissions = event["spec"][2].split()
if not permissions:
raise utils.EventError("Please provide at least 1 permission")
user_permissions = self._get_permissions(target_user) user_permissions = self._get_permissions(target_user)
if subcommand == "add": if subcommand == "add":
@ -271,7 +260,7 @@ class Module(ModuleManager.BaseModule):
raise utils.EventError("No new permissions to give") raise utils.EventError("No new permissions to give")
target_user.set_setting("permissions", user_permissions+new) target_user.set_setting("permissions", user_permissions+new)
event["stdout"].write("Gave %s new permissions: %s" % event["stdout"].write("Gave %s new permissions: %s" %
(account, ", ".join(new))) (target_user.nickname, ", ".join(new)))
elif subcommand == "remove": elif subcommand == "remove":
permissions_set = set(permissions) permissions_set = set(permissions)
user_permissions_set = set(user_permissions) user_permissions_set = set(user_permissions)
@ -285,27 +274,22 @@ class Module(ModuleManager.BaseModule):
else: else:
target_user.set_setting("permissions", change) target_user.set_setting("permissions", change)
event["stdout"].write("Removed permissions from %s: %s" % event["stdout"].write("Removed permissions from %s: %s" %
(account, ", ".join(change))) (target_user.nickname, ", ".join(change)))
else: else:
raise utils.EventError("Unknown subcommand %s" % subcommand) raise utils.EventError("Unknown subcommand %s" % subcommand)
@utils.hook("received.command.hostmask") @utils.hook("received.command.hostmask")
@utils.kwarg("min_args", 1)
@utils.kwarg("authenticated", True) @utils.kwarg("authenticated", True)
@utils.kwarg("usage", "list") @utils.spec("!'list")
@utils.kwarg("usage", "add [hostmask]") @utils.spec("!'add,remove ?<hostmask>word")
@utils.kwarg("usage", "remove [hostmask]")
def hostmask(self, event): def hostmask(self, event):
subcommand = event["args_split"][0].lower() subcommand = event["spect"][0]
hostmasks = event["user"].get_setting(HOSTMASKS_SETTING, []) hostmasks = event["user"].get_setting(HOSTMASKS_SETTING, [])
if subcommand == "list": if subcommand == "list":
event["stdout"].write("Your hostmasks: %s" % ", ".join(hostmasks)) event["stdout"].write("Your hostmasks: %s" % ", ".join(hostmasks))
else: else:
if event["args_split"][1:]: hostmask = event["spec"][1]
hostmask = event["args_split"][1]
else:
hostmask = "*!%s" % event["user"].userhost()
account = self._account_name(event["user"]) account = self._account_name(event["user"])
if subcommand == "add": if subcommand == "add":