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

Git is evil

Browse source
This commit is contained in:
Luke Rogers 2012-02-03 02:10:46 +13:00
parent 9bc8901972 8104d82179
commit 25ffcd44be
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/tell.py
View file

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