Fixed some mistakes in ircBot

This commit is contained in:
Uriziel 2013-01-24 21:20:32 +01:00
parent b1db8c02a0
commit 83d807949a

View File

@ -2,8 +2,6 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# @author HarHar # @author HarHar
import sys
import os
import socket import socket
import threading import threading
from syncplay import utils from syncplay import utils
@ -38,15 +36,12 @@ class Bot(object):
#Connection/authentication routine #Connection/authentication routine
self.sock = socket.socket() self.sock = socket.socket()
self.sock.connect((server, port)) self.sock.connect((server, port))
print self.sock.recv(4096)
if serverPassword != '': if serverPassword != '':
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
print self.sock.recv(4096)
if nickservPass != '': if nickservPass != '':
self.msg('NickServ', 'IDENTIFY ' + nickservPass) self.msg('NickServ', 'IDENTIFY ' + nickservPass)
@ -84,7 +79,7 @@ class Bot(object):
self.active = False self.active = False
self.sockSend('QUIT :' + reason) self.sockSend('QUIT :' + reason)
self.sock.close() self.sock.close()
def nick(newnick): def nick(self, newnick):
self.sockSend('NICK ' + newnick) self.sockSend('NICK ' + newnick)
self.nick = newnick self.nick = newnick
def irc_onMsg(self, nickFrom, host, to, msg): def irc_onMsg(self, nickFrom, host, to, msg):
@ -174,7 +169,6 @@ def handlingThread(sock, bot):
while bot.active: while bot.active:
rcvd = sock.recv(4096).split('\n') rcvd = sock.recv(4096).split('\n')
for line in rcvd: for line in rcvd:
print line
line = line.replace('\r', '') line = line.replace('\r', '')
if line.split(' ')[0] == 'PING': if line.split(' ')[0] == 'PING':