Rezzect/syncplay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge 374391b86602a3a690331a6b17a8a06733451a03 into d7bd7af2b70ced4bb0c0de13c2b464abb5045114

Browse Source
This commit is contained in:
HarHar 2013-01-24 14:00:58 -08:00
commit ba2d2d278b
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
syncplay/ircBot.py
View File

@ -42,9 +42,11 @@ class Bot(object):
self.sockSend('PASS ' + serverPassword) self.sockSend('PASS ' + serverPassword)
self.sockSend('NICK ' + nick) self.sockSend('NICK ' + nick)
self.sockSend('USER ' + nick + ' ' + nick + ' ' + nick + ' :SyncPlay Bot') #Don't ask me self.sockSend('USER ' + nick + ' ' + nick + ' ' + nick + ' :SyncPlay Bot') #Don't ask me
self.sock.recv(4096) #Wait for authentication to finish
if nickservPass != '': if nickservPass != '':
self.msg('NickServ', 'IDENTIFY ' + nickservPass) self.msg('NickServ', 'IDENTIFY ' + nickservPass)
self.sock.recv(4096) #We don't want to join if nickserv hasn't done its job (shouldn't really matter, but good for vHost)
if channel != '': if channel != '':
self.join(channel) self.join(channel)
@ -54,7 +56,6 @@ class Bot(object):
self.thread.setDaemon(True) self.thread.setDaemon(True)
self.thread.start() self.thread.start()
##Events that have to be binded##
def sp_joined(self, who, room): def sp_joined(self, who, room):
self.msg(self.channel, chr(2) + '<' + who + '>'+ chr(15) +' has joined ' + room) self.msg(self.channel, chr(2) + '<' + who + '>'+ chr(15) +' has joined ' + room)
def sp_left(self, who, room): def sp_left(self, who, room):
@ -67,7 +68,6 @@ class Bot(object):
self.msg(self.channel, chr(2) + '<' + who + '>'+ chr(15) +' is playing "' + filename + '" (room ' + room + ')') self.msg(self.channel, chr(2) + '<' + who + '>'+ chr(15) +' is playing "' + filename + '" (room ' + room + ')')
def sp_seek(self, who, fromTime, toTime, room): def sp_seek(self, who, fromTime, toTime, room):
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 + '\r\n') self.sock.send(s + '\r\n')
@ -93,6 +93,10 @@ class Bot(object):
if split[0].lower() == '!rooms': if split[0].lower() == '!rooms':
rooms = self.functions[1]() rooms = self.functions[1]()
if len(rooms) == 0:
self.msg(to, chr(3) + '5Error!' + chr(15) + ' No rooms found on server')
return
out = 'Currently the Syncplay server hosts viewing sessions as follows: ' out = 'Currently the Syncplay server hosts viewing sessions as follows: '
i = 0 i = 0
for room in rooms: for room in rooms:
@ -138,10 +142,8 @@ class Bot(object):
for u in users: for u in users:
if u['nick'] == nickFrom: if u['nick'] == nickFrom:
self.functions[6](nickFrom, True) self.functions[6](nickFrom, True)
break return
else: self.msg(to, chr(3) + '5Error!' + chr(15) + ' Your nick was not found on the server')
self.msg(to, chr(3) + '5Error!' + chr(15) + ' Your nick was not found on the server')
return
elif split[0].lower() == '!play': elif split[0].lower() == '!play':
rooms = self.functions[1]() rooms = self.functions[1]()
@ -150,10 +152,8 @@ class Bot(object):
for u in users: for u in users:
if u['nick'] == nickFrom: if u['nick'] == nickFrom:
self.functions[6](nickFrom, False) self.functions[6](nickFrom, False)
break return
else: self.msg(to, chr(3) + '5Error!' + chr(15) + ' Your nick was not found on the server')
self.msg(to, chr(3) + '5Error!' + chr(15) + ' Your nick was not found on the server')
return
elif split[0].lower() == '!help': elif split[0].lower() == '!help':
self.msg(to, chr(2) + 'Available commands:' + chr(15) + ' !rooms / !roominfo [room] / !pause / !play') self.msg(to, chr(2) + 'Available commands:' + chr(15) + ' !rooms / !roominfo [room] / !pause / !play')