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

added input.mask. returns 'user@host'

Browse source
This commit is contained in:
Luke Rogers 2012-03-22 17:04:48 +13:00
parent 0c3e78bdce
commit 3e5c2c94d9
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/irc.py
View file

@ -163,6 +163,7 @@ class IRC(object):
else: else:
prefix, command, params = irc_noprefix_rem(msg).groups() prefix, command, params = irc_noprefix_rem(msg).groups()
nick, user, host = irc_netmask_rem(prefix).groups() nick, user, host = irc_netmask_rem(prefix).groups()
mask = user + "@" + host
paramlist = irc_param_ref(params) paramlist = irc_param_ref(params)
lastparam = "" lastparam = ""
if paramlist: if paramlist:
@ -170,7 +171,7 @@ class IRC(object):
paramlist[-1] = paramlist[-1][1:] paramlist[-1] = paramlist[-1][1:]
lastparam = paramlist[-1] lastparam = paramlist[-1]
self.out.put([msg, prefix, command, params, nick, user, host, self.out.put([msg, prefix, command, params, nick, user, host,
paramlist, lastparam]) mask, paramlist, lastparam])
if command == "PING": if command == "PING":
self.cmd("PONG", paramlist) self.cmd("PONG", paramlist)
@ -225,6 +226,7 @@ class FakeIRC(IRC):
else: else:
prefix, command, params = irc_noprefix_rem(msg).groups() prefix, command, params = irc_noprefix_rem(msg).groups()
nick, user, host = irc_netmask_rem(prefix).groups() nick, user, host = irc_netmask_rem(prefix).groups()
mask = user + "@" + host
paramlist = irc_param_ref(params) paramlist = irc_param_ref(params)
lastparam = "" lastparam = ""
if paramlist: if paramlist:
@ -232,7 +234,7 @@ class FakeIRC(IRC):
paramlist[-1] = paramlist[-1][1:] paramlist[-1] = paramlist[-1][1:]
lastparam = paramlist[-1] lastparam = paramlist[-1]
self.out.put([msg, prefix, command, params, nick, user, host, self.out.put([msg, prefix, command, params, nick, user, host,
paramlist, lastparam]) mask, paramlist, lastparam])
if command == "PING": if command == "PING":
self.cmd("PONG", [params]) self.cmd("PONG", [params])

4
core/main.py
View file

@ -7,7 +7,7 @@ thread.stack_size(1024 * 512) # reduce vm size
class Input(dict): class Input(dict):
def __init__(self, conn, raw, prefix, command, params, def __init__(self, conn, raw, prefix, command, params,
nick, user, host, paraml, msg): nick, user, host, mask, paraml, msg):
chan = paraml[0].lower() chan = paraml[0].lower()
if chan == conn.nick.lower(): # is a PM if chan == conn.nick.lower(): # is a PM
@ -35,7 +35,7 @@ class Input(dict):
conn.cmd('NOTICE', [nick, msg]) conn.cmd('NOTICE', [nick, msg])
dict.__init__(self, conn=conn, raw=raw, prefix=prefix, command=command, dict.__init__(self, conn=conn, raw=raw, prefix=prefix, command=command,
params=params, nick=nick, user=user, host=host, params=params, nick=nick, user=user, host=host, mask=mask,
paraml=paraml, msg=msg, server=conn.server, chan=chan, paraml=paraml, msg=msg, server=conn.server, chan=chan,
notice=notice, say=say, reply=reply, pm=pm, bot=bot, notice=notice, say=say, reply=reply, pm=pm, bot=bot,
me=me, set_nick=set_nick, lastparam=paraml[-1]) me=me, set_nick=set_nick, lastparam=paraml[-1])

2
plugins/help.py
View file

@ -12,7 +12,7 @@ def help(inp, input=None, bot=None, say=None, notice=None):
for command, (func, args) in bot.commands.iteritems(): for command, (func, args) in bot.commands.iteritems():
fn = re.match(r'^plugins.(.+).py$', func._filename) fn = re.match(r'^plugins.(.+).py$', func._filename)
if fn.group(1).lower() not in disabled: if fn.group(1).lower() not in disabled:
if not args.get('adminonly', False) or input.nick in input.bot.config["admins"]: if not args.get('adminonly', False) or input.mask in input.bot.config["admins"]:
if command not in disabled_comm: if command not in disabled_comm:
if func.__doc__ is not None: if func.__doc__ is not None:
if func in funcs: if func in funcs: