RepoMirrors/syncplay
1
0
Fork 0
mirror of https://github.com/Syncplay/syncplay synced 2025-03-31 23:59:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15 from HarHar/master

Browse Source 
Blame the bot if it doesn't work :c
This commit is contained in:
Uriziel 2013-01-25 12:31:09 -08:00
commit 0e3db9f769
1 changed files with 46 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
syncplay/ircBot.py
View File

@ -73,7 +73,12 @@ class Bot(object):
self.msg(self.channel, chr(2) + '<' + who + '>'+ chr(15) +' has jumped from ' + utils.formatTime(fromTime) + ' to ' + utils.formatTime(toTime) +' (room ' + room + ')') self.msg(self.channel, chr(2) + '<' + who + '>'+ chr(15) +' has jumped from ' + utils.formatTime(fromTime) + ' to ' + utils.formatTime(toTime) +' (room ' + room + ')')
def sockSend(self, s): def sockSend(self, s):
self.sock.send(s + u'\r\n') try:
self.sock.send(s.encode('utf8') + '\r\n')
except socket.error, info:
bot.active = False
print '\033[91mSocket error (bot disconnected)\033[0;0m ' + str(info)
break
def msg(self, who, message): def msg(self, who, message):
self.sockSend('PRIVMSG ' + who + ' :' + message) self.sockSend('PRIVMSG ' + who + ' :' + message)
def join(self, channel, passw=''): def join(self, channel, passw=''):
@ -117,7 +122,10 @@ class Bot(object):
elif split[0].lower() == '!roominfo': elif split[0].lower() == '!roominfo':
if len(split) >= 2: if len(split) >= 2:
rooms = self.functions[1]() rooms = self.functions[1]()
for room in split[1:]: room = ''
for r in split[1:]:
room += r + ' '
room = room[:-1]
if (room in rooms) == False: if (room in rooms) == False:
self.msg(to, chr(3) + '5Error!' + chr(15) + ' Room does not exists (' + room + ')') self.msg(to, chr(3) + '5Error!' + chr(15) + ' Room does not exists (' + room + ')')
else: else:
@ -178,7 +186,12 @@ class Bot(object):
def handlingThread(sock, bot): def handlingThread(sock, bot):
while bot.active: while bot.active:
try:
rcvd = sock.recv(4096).split('\n') rcvd = sock.recv(4096).split('\n')
except socket.error, info:
bot.active = False
print '\033[91mSocket error (bot disconnected)\033[0;0m ' + str(info)
break
for line in rcvd: for line in rcvd:
try: try:
line = line.replace('\r', '') line = line.replace('\r', '')