Merge branch 'develop' of https://github.com/ClouDev/CloudBot into develop

This commit is contained in:
Luke Rogers 2013-09-05 00:47:16 +12:00
commit 270785a31a
2 changed files with 13 additions and 5 deletions

View file

@ -3,14 +3,21 @@ Thanks to everyone who has contributed to CloudBot! Come in IRC and ping me if I
Luke Rogers (lukeroge) Luke Rogers (lukeroge)
Neersighted Neersighted
blha303 blha303
KsaRedFx
urbels
cybojenix cybojenix
KsaRedFx
nathanblaney
thenoodle68
nasonfish
urbels
puffrfish
Sepero
TheFiZi
mikeleigh
Spudstabber Spudstabber
frozenMC frozenMC
frdmn frdmn
puffrfish
nasonfish
We are using code from the following projects: We are using code from the following projects:
./plugins/mlia.py - https://github.com/infinitylabs/UguuBot ./plugins/mlia.py - https://github.com/infinitylabs/UguuBot

View file

@ -187,10 +187,11 @@ def say(inp, conn=None, chan=None):
If [channel] is blank the bot will say the <message> in the channel If [channel] is blank the bot will say the <message> in the channel
the command was used in.""" the command was used in."""
inp = inp.split(" ") inp = inp.split(" ")
message = " ".join(inp[1:])
if inp[0][0] == "#": if inp[0][0] == "#":
message = " ".join(inp[1:])
out = "PRIVMSG %s :%s" % (inp[0], message) out = "PRIVMSG %s :%s" % (inp[0], message)
else: else:
message = " ".join(inp[0:])
out = "PRIVMSG %s :%s" % (chan, message) out = "PRIVMSG %s :%s" % (chan, message)
conn.send(out) conn.send(out)