diff --git a/syncplay/ircBot.py b/syncplay/ircBot.py index e52fdde..dbc290c 100644 --- a/syncplay/ircBot.py +++ b/syncplay/ircBot.py @@ -78,7 +78,7 @@ class Bot(object): except socket.error, info: self.active = False print '\033[91mSocket error (bot disconnected)\033[0;0m ' + str(info) - break + def msg(self, who, message): self.sockSend('PRIVMSG ' + who + ' :' + message) def join(self, channel, passw=''): diff --git a/syncplay/server.py b/syncplay/server.py index 9086ba0..7be007a 100644 --- a/syncplay/server.py +++ b/syncplay/server.py @@ -58,7 +58,6 @@ class SyncFactory(Factory): ircConnectionData['channelPassword'] = line.split(": ")[1] elif("irc.channel: " in line): ircConnectionData['channel'] = line.split(": ")[1] - return ircConnectionData def setupIRCBot(self, ircConnectionData): @@ -70,16 +69,19 @@ class SyncFactory(Factory): self.getRoomUsernames, self.isRoomPaused, ] - self.ircBot = IRCBot( - ircConnectionData['server'], - ircConnectionData['serverPassword'], - ircConnectionData['port'], - ircConnectionData['nick'], - ircConnectionData['nickservPass'], - ircConnectionData['channel'], - ircConnectionData['channelPassword'], - botFunctions, - ) + try: + self.ircBot = IRCBot( + ircConnectionData['server'], + ircConnectionData['serverPassword'], + ircConnectionData['port'], + ircConnectionData['nick'], + ircConnectionData['nickservPass'], + ircConnectionData['channel'], + ircConnectionData['channelPassword'], + botFunctions, + ) + except: + print "IRC Bot could not be started, please check your configuration" def buildProtocol(self, addr): return SyncServerProtocol(self)