Merge 0bfb6d117b98eec0ea60d9a46d9a47e897928de6 into 83d807949aabfeadb3bb1dc59ac2cd1eb9f6b1ac

This commit is contained in:
HarHar 2013-01-24 12:26:54 -08:00
commit b1b0b70d41

View File

@ -17,10 +17,10 @@ class Bot(object):
# channel - channel to autojoin and interact with
# channelPassword - if channel is +k
# functions - list/tuple of functions that can be used from the bot:
# * pause(room, state=bool)
# * pause(setBy, room, state=bool)
# * getRooms() -> list
# * getPosition(room) -> int
# * setPosition(room, seconds)
# * setPosition(setBy, room, seconds)
# * getUsers(room) -> list of {'nick': str, 'file': str, 'length': int}
# * isPaused(room) -> bool
@ -123,7 +123,7 @@ class Bot(object):
else:
out += chr(3) + '2' + user['nick'] + chr(15) + ', '
i += 1
self.msg(to, out)
self.msg(nickFrom, to, out)
else:
self.msg(to, chr(2) + 'Usage:' + chr(15) + ' !roominfo [room]')
elif split[0].lower() == '!pause':
@ -141,7 +141,7 @@ class Bot(object):
self.msg(to, chr(3) + '5Error!' + chr(15) + ' Your nick is not in the specified room')
continue
self.functions[6](room, True)
self.functions[6](nickFrom, room, True)
else:
self.msg(to, chr(2) + 'Usage:' + chr(15) + ' !pause [room]')
elif split[0].lower() == '!play':