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

lots of nonworking code

Browse source
This commit is contained in:
Luke Rogers 2013-10-13 17:32:08 +13:00
parent ed2eefb9cd
commit d330df5711
9 changed files with 75 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/core_misc.py
View file

@ -12,7 +12,7 @@ nick_re = re.compile(":(.+?)!")
# Auto-join on Invite (Configurable, defaults to True)
@hook.event('INVITE')
def invite(paraml, conn=None):
invite_join = conn.conf.get('invite_join', True)
invite_join = conn.config.get('invite_join', True)
if invite_join:
conn.join(paraml[-1])
@ -21,7 +21,7 @@ def invite(paraml, conn=None):
@hook.event('004')
def onjoin(paraml, conn=None, bot=None):
bot.logger.info("ONJOIN hook triggered.")
nickserv = conn.conf.get('nickserv')
nickserv = conn.config.get('nickserv')
if nickserv:
nickserv_password = nickserv.get('nickserv_password', '')
nickserv_name = nickserv.get('nickserv_name', 'nickserv')
@ -38,7 +38,7 @@ def onjoin(paraml, conn=None, bot=None):
time.sleep(1)
# Set bot modes
mode = conn.conf.get('mode')
mode = conn.config.get('mode')
if mode:
bot.logger.info('Setting bot mode: "{}"'.format(mode))
conn.cmd('MODE', [conn.nick, mode])
@ -57,7 +57,7 @@ def onkick(paraml, conn=None, chan=None):
# if the bot has been kicked, remove from the channel list
if paraml[1] == conn.nick:
conn.channels.remove(chan)
auto_rejoin = conn.conf.get('auto_rejoin', False)
auto_rejoin = conn.config.get('auto_rejoin', False)
if auto_rejoin:
conn.join(paraml[0])
@ -74,7 +74,7 @@ def onnick(paraml, bot=None, conn=None, raw=None):
@hook.singlethread
@hook.event('004')
def keep_alive(paraml, conn=None):
keepalive = conn.conf.get('keep_alive', False)
keepalive = conn.config.get('keep_alive', False)
if keepalive:
while True:
conn.cmd('PING', [conn.nick])

10
plugins/core_sieve.py
View file

@ -12,16 +12,16 @@ def sieve_suite(bot, input, func, kind, args):
return None
if kind == "command":
disabled_commands = conn.conf.get('disabled_plugins', [])
disabled_commands = conn.config.get('disabled_plugins', [])
if input.trigger in disabled_commands:
return None
fn = re.match(r'^plugins.(.+).py$', func._filename)
disabled = conn.conf.get('disabled_plugins', [])
disabled = conn.config.get('disabled_plugins', [])
if fn and fn.group(1).lower() in disabled:
return None
acl = conn.conf.get('acls', {}).get(func.__name__)
acl = conn.config.get('acls', {}).get(func.__name__)
if acl:
if 'deny-except' in acl:
allowed_channels = map(unicode.lower, acl['deny-except'])
@ -37,7 +37,7 @@ def sieve_suite(bot, input, func, kind, args):
args["permissions"] = ["adminonly"]
if args.get('permissions', False):
groups = conn.conf.get("permissions", [])
groups = conn.config.get("permissions", [])
allowed_permissions = args.get('permissions', [])
allowed_groups = []
@ -58,7 +58,7 @@ def sieve_suite(bot, input, func, kind, args):
mask = input.mask.lower()
for group in allowed_groups:
group_users = conn.conf.get("permissions", {}).get(group, [])["users"]
group_users = conn.conig.get("permissions", {}).get(group, [])["users"]
group_users = [_mask.lower() for _mask in group_users]
for pattern in group_users:
if fnmatch(mask, pattern):