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

Fixed tell.py

Browse source
This commit is contained in:
Luke Rogers 2012-02-03 02:19:12 +13:00
parent 4ebaba1746
commit 2ee00dde5a
1 changed files with 1 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/tell.py
View file

@ -78,11 +78,7 @@ def tell(inp, nick='', chan='', db=None, input=None, notice=None):
if len(query) != 2: if len(query) != 2:
notice(tell.__doc__) notice(tell.__doc__)
<<<<<<< HEAD
return return
=======
return
>>>>>>> 8104d82179de3eeca365370685372177649f54a6
user_to = query[0].lower() user_to = query[0].lower()
message = query[1].strip() message = query[1].strip()
@ -93,14 +89,11 @@ def tell(inp, nick='', chan='', db=None, input=None, notice=None):
if user_to == user_from.lower(): if user_to == user_from.lower():
notice("No. I'm not doing that. -.-") notice("No. I'm not doing that. -.-")
<<<<<<< HEAD
return return
if user_to.lower() == "mau5bot": if user_to.lower() == input.conn.nick.lower()":
# user is looking for us, being a smartass # user is looking for us, being a smartass
notice("Thanks for the message, " + user_from + "!") notice("Thanks for the message, " + user_from + "!")
=======
>>>>>>> 8104d82179de3eeca365370685372177649f54a6
return return
if not re.match("^[A-Za-z0-9_|.-\]\[]*$", user_to.lower()): if not re.match("^[A-Za-z0-9_|.-\]\[]*$", user_to.lower()):