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

Fixing up some stuff

Browse source
This commit is contained in:
lukeroge 2011-12-30 22:07:32 +13:00
parent 185c1d5ae3
commit 46fd8b2309
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/tell.py
View file

@ -31,6 +31,7 @@ def tellinput(paraml, input=None, db=None, bot=None):
db_init(db) db_init(db)
tells = get_tells(db, input.nick) tells = get_tells(db, input.nick)
if tells: if tells:
@ -73,11 +74,11 @@ def showtells(inp, nick='', chan='', notice=None, db=None):
@hook.command @hook.command
def tell(inp, nick='', chan='', db=None, input=None, notice=None): def tell(inp, nick='', chan='', db=None, input=None, notice=None):
".tell <nick> <message> -- relay <message> to <nick> when <nick> is around" ".tell <nick> <message> -- relay <message> to <nick> when <nick> is around"
query = inp.split(' ', 1) query = inp.split(' ', 1)
if len(query) != 2: if len(query) != 2:
return tell.__doc__ notice(tell.__doc__)
return
user_to = query[0].lower() user_to = query[0].lower()
message = query[1].strip() message = query[1].strip()
@ -87,12 +88,7 @@ def tell(inp, nick='', chan='', db=None, input=None, notice=None):
chan = 'a pm' chan = 'a pm'
if user_to == user_from.lower(): if user_to == user_from.lower():
notice("No.") notice("No. I'm not doing that. -.-")
return
if user_to.lower() == "mau5bot":
# user is looking for us, being a smartass
notice("Thanks for the message, " + user_from + "!")
return return
if not re.match("^[A-Za-z0-9_|.-\]\[]*$", user_to.lower()): if not re.match("^[A-Za-z0-9_|.-\]\[]*$", user_to.lower()):
@ -115,4 +111,4 @@ def tell(inp, nick='', chan='', db=None, input=None, notice=None):
notice("Message has already been queued.") notice("Message has already been queued.")
return return
notice("I'll pass that along.") notice("I'll pass that along.")