fixed indentation

This commit is contained in:
Shauna 2013-12-22 11:47:38 -05:00
parent 12de7a4db5
commit a62790497d
1 changed files with 42 additions and 44 deletions

86
bot.py
View File

@ -17,17 +17,17 @@ ircsock.send("USER "+ botnick +" "+ botnick +" "+ botnick +" :This bot is a resu
ircsock.send("NICK "+ botnick +"\n") # here we actually assign the nick to the bot ircsock.send("NICK "+ botnick +"\n") # here we actually assign the nick to the bot
def joinchan(chan): # This function is used to join channels. def joinchan(chan): # This function is used to join channels.
ircsock.send("JOIN "+ chan +"\n") ircsock.send("JOIN "+ chan +"\n")
joinchan(channel) joinchan(channel)
# Creates separate thread for reading messages from the server # Creates separate thread for reading messages from the server
def getIRC(): def getIRC():
while True: while True:
ircmsg = ircsock.recv(2048) # receive data from the server ircmsg = ircsock.recv(2048) # receive data from the server
ircmsg = ircmsg.strip('\n\r') # removing any unnecessary linebreaks. ircmsg = ircmsg.strip('\n\r') # removing any unnecessary linebreaks.
q.put(ircmsg) # Put in queue for main loop to read q.put(ircmsg) # Put in queue for main loop to read
print(ircmsg) print(ircmsg)
q = Queue.LifoQueue() q = Queue.LifoQueue()
t = Thread(target=getIRC) t = Thread(target=getIRC)
@ -37,65 +37,63 @@ t.start()
# Classes # Classes
class newcomer(object): # Newcomer class created when someone joins the room class newcomer(object): # Newcomer class created when someone joins the room
def __init__(self, nick): def __init__(self, nick):
self.nick = nick self.nick = nick
self.born = time.time() self.born = time.time()
self.status = 0 self.status = 0
def changeStatus(self,status): def changeStatus(self,status):
self.status = status # Right now there's just status 0 (not replied to) and 1 (replied to) self.status = status # Right now there's just status 0 (not replied to) and 1 (replied to)
def aroundFor(self):
return time.time() - self.born
def aroundFor(self):
return time.time() - self.born
# Functions # Functions
def ping(): # Responds to server Pings. def ping(): # Responds to server Pings.
ircsock.send("PONG :pingis\n") ircsock.send("PONG :pingis\n")
def hello(speaker,greeting): # This function responds to a user that inputs "Hello Mybot" def hello(speaker,greeting): # This function responds to a user that inputs "Hello Mybot"
ircsock.send("PRIVMSG " + channel +" :" + greeting + " " + speaker + "\n") ircsock.send("PRIVMSG " + channel +" :" + greeting + " " + speaker + "\n")
def help(speaker): # This function explains what the bot is when queried. def help(speaker): # This function explains what the bot is when queried.
ircsock.send("PRIVMSG " + channel +" :I'm a bot! I'm from here: https://github.com/shaunagm/oh-irc-bot. You can change my behavior by submitting a pull request or by talking to shauna. \n") ircsock.send("PRIVMSG " + channel +" :I'm a bot! I'm from here: https://github.com/shaunagm/oh-irc-bot. You can change my behavior by submitting a pull request or by talking to shauna. \n")
def welcome(newcomer): # This welcomes a specific person. def welcome(newcomer): # This welcomes a specific person.
ircsock.send("PRIVMSG "+ channel +" :Welcome "+ newcomer + "!\n") ircsock.send("PRIVMSG "+ channel +" :Welcome "+ newcomer + "!\n")
ircsock.send("PRIVMSG "+ channel +" :(pssst shauna there's someone here)\n") ircsock.send("PRIVMSG "+ channel +" :(pssst shauna there's someone here)\n")
#### Main function #### Main function
newList = [] newList = []
helloArray = ['Hello','hello','Hi','hi','Hey','hey','Yo','yo ','Sup','sup']
helpArray = ['Help','help','Info','info','faq','FAQ','explain yourself','EXPLAIN YOURSELF']
while 1: while 1:
for i in newList: for i in newList:
if i.aroundFor() > 5 and i.status == 0: if i.aroundFor() > 5 and i.status == 0:
print welcome(i.nick) print welcome(i.nick)
i.changeStatus(2) i.changeStatus(2)
if q.empty() == 0: if q.empty() == 0:
ircmsg = q.get() ircmsg = q.get()
speaker = ircmsg.split(":")[1].split("!")[0] speaker = ircmsg.split(":")[1].split("!")[0]
if ircmsg.find("PRIVMSG "+ channel) != -1: # If someone has spoken into the channel if ircmsg.find("PRIVMSG "+ channel) != -1: # If someone has spoken into the channel
for i in newList: for i in newList:
if speaker != i.nick: # Don't turn off response if the person speaking is the person who joined. if speaker != i.nick: # Don't turn off response if the person speaking is the person who joined.
i.changeStatus(1) # set status to "someone has spoken in channel" for all waiting newcomers i.changeStatus(1) # set status to "someone has spoken in channel" for all waiting newcomers
if ircmsg.find(botnick) != -1 and ircmsg.find("PRIVMSG #") != -1: # If someone talks to (or refers to) the bot if ircmsg.find(botnick) != -1 and ircmsg.find("PRIVMSG #") != -1: # If someone talks to (or refers to) the bot
helloArray = ['Hello','hello','Hi','hi','Hey','hey','Yo','yo ','Sup','sup'] if any(x in ircmsg for x in helloArray):
helpArray = ['Help','help','Info','info','faq','FAQ','explain yourself','EXPLAIN YOURSELF'] hello(speaker,random.choice(helloArray))
if any(x in ircmsg for x in helloArray): if any(y in ircmsg for y in helpArray):
hello(speaker,random.choice(helloArray)) help(speaker)
if any(y in ircmsg for y in helpArray):
help(speaker)
if ircmsg.find("PING :") != -1: # if the server pings us then we've got to respond! if ircmsg.find("PING :") != -1: # if the server pings us then we've got to respond!
ping() ping()
if ircmsg.find("JOIN "+ channel) != -1: # If someone joins #channel if ircmsg.find("JOIN "+ channel) != -1: # If someone joins #channel
if speaker != botnick: # Probably a cleaner way to do this if speaker != botnick: # Probably a cleaner way to do this
newList.append(newcomer(speaker)) # Create a newcomer object and append to list. newList.append(newcomer(speaker)) # Create a newcomer object and append to list.