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

Merge branch 'develop' into refresh

Browse source 
Conflicts:
	core/irc.py
	plugins/correction.py
	plugins/history.py
	requirements.txt
This commit is contained in:
Luke Rogers 2014-03-06 10:56:05 +13:00
commit 9f029c8ceb
17 changed files with 463 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

12
plugins/admin.py
View file

@ -193,11 +193,11 @@ def say(inp, conn=None, chan=None):
the command was used in."""
inp = inp.split(" ")
if inp[0][0] == "#":
message = " ".join(inp[1:])
out = "PRIVMSG {} :{}".format(inp[0], message)
message = u" ".join(inp[1:])
out = u"PRIVMSG {} :{}".format(inp[0], message)
else:
message = " ".join(inp[0:])
out = "PRIVMSG {} :{}".format(chan, message)
message = u" ".join(inp[0:])
out = u"PRIVMSG {} :{}".format(chan, message)
conn.send(out)
@ -213,11 +213,11 @@ def me(inp, conn=None, chan=None):
for x in inp[1:]:
message = message + x + " "
message = message[:-1]
out = "PRIVMSG {} :\x01ACTION {}\x01".format(inp[0], message)
out = u"PRIVMSG {} :\x01ACTION {}\x01".format(inp[0], message)
else:
message = ""
for x in inp[0:]:
message = message + x + " "
message = message[:-1]
out = "PRIVMSG {} :\x01ACTION {}\x01".format(chan, message)
out = u"PRIVMSG {} :\x01ACTION {}\x01".format(chan, message)
conn.send(out)