ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Changed the permissions config format again! (this might happen a few times, sorry)

Browse source
This commit is contained in:
Luke Rogers 2013-08-02 11:52:01 +12:00
parent e6af470a16
commit e281bbd62b
2 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

16
config.default
View file

@ -30,13 +30,15 @@
"twitter_access_secret": "", "twitter_access_secret": "",
"wunderground": "" "wunderground": ""
}, },
"permission_groups": { "permissions": {
"admins": ["addfactoid", "delfactoid", "ignore", "botcontrol"], "admins": {
"moderators": ["addfactoid", "delfactoid", "ignore"] "perms": ["addfactoid", "delfactoid", "ignore", "botcontrol"],
}, "users": ["examplea!user@example.com", "exampleb!user@example.com"]
"permission_users": { },
"admins": ["examplea!user@example.com", "exampleb!user@example.com"], "moderators": {
"moderators": ["examplec!user@example.com"] "perms": ["addfactoid", "delfactoid", "ignore"],
"users": ["examplec!user@example.com"]
}
}, },
plugins": plugins":
{ {

25
plugins/core_sieve.py
View file

@ -36,23 +36,23 @@ def sieve_suite(bot, input, func, kind, args):
if args.get('permissions', False): if args.get('permissions', False):
groups = bot.config.get("permission_groups", []) groups = bot.config.get("permissions", [])
group_users = bot.config.get("permission_users", [])
allowed_permissions = args.get('permissions', []) allowed_permissions = args.get('permissions', [])
allowed_groups = [] allowed_groups = []
# loop over every group # loop over every group
for name, permissions in groups.iteritems(): for key, value in groups.iteritems():
# loop over every permission the command allows # loop over every permission the command allows
for permission in allowed_permissions: for permission in allowed_permissions:
# see if the group has that permission # see if the group has that permission
if permission in permissions: print value
if permission in value["perms"]:
print "%s in %s" % (permission, value["perms"])
# if so, add the group name to the allowed_groups list # if so, add the group name to the allowed_groups list
allowed_groups.append(name) allowed_groups.append(key)
print allowed_groups
if not allowed_groups: if not allowed_groups:
print "Something is wrong. A hook requires {} but" \ print "Something is wrong. A hook requires {} but" \
@ -60,12 +60,13 @@ def sieve_suite(bot, input, func, kind, args):
mask = input.mask.lower() mask = input.mask.lower()
# make all masks lowercase
for group, masks in group_users.iteritems():
group_users[group] = [_mask.lower() for _mask in masks]
for group in allowed_groups: for group in allowed_groups:
for pattern in group_users[group]: print group
group_users = bot.config.get("permissions", {}).get(group, [])["users"]
print group_users
group_users = [_mask.lower() for _mask in group_users]
for pattern in group_users:
print mask + pattern
if fnmatch(mask, pattern): if fnmatch(mask, pattern):
return input return input