Git is evil
This commit is contained in:
commit
25ffcd44be
|
@ -78,7 +78,11 @@ 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()
|
||||||
|
@ -89,11 +93,14 @@ 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() == "mau5bot":
|
||||||
# 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()):
|
||||||
|
|
Reference in a new issue