Add support for multiple people

This commit is contained in:
Nick Krichevsky 2015-09-18 21:52:52 -04:00
parent f790f2be89
commit 8db4615750
1 changed files with 37 additions and 30 deletions

View File

@ -11,11 +11,14 @@ import imaplib
from threading import Timer from threading import Timer
from pyircbot.modulebase import ModuleBase, ModuleHook from pyircbot.modulebase import ModuleBase, ModuleHook
COMMAND_PREFIX = ".text-"
class TextCDC(ModuleBase): class TextCDC(ModuleBase):
def __init__(self, bot, moduleName): def __init__(self, bot, moduleName):
ModuleBase.__init__(self, bot, moduleName) ModuleBase.__init__(self, bot, moduleName)
self.hooks.append(ModuleHook("PRIVMSG",self.handleMessage)) self.hooks.append(ModuleHook("PRIVMSG",self.handleMessage))
self.loadConfig() self.loadConfig()
self.prefixes = [person for person in self.config["people"]]
self.bot = bot self.bot = bot
self.timer = None self.timer = None
self.setupTimer() self.setupTimer()
@ -26,15 +29,17 @@ class TextCDC(ModuleBase):
def handleMessage(self, args, prefix, trailing): def handleMessage(self, args, prefix, trailing):
channel = args[0] channel = args[0]
prefix = self.bot.decodePrefix(prefix) p = self.bot.decodePrefix(prefix)
if self.bot.messageHasCommand(".textstatus", trailing): if self.bot.messageHasCommand(".textstatus", trailing):
#self.bot.act_PRIVMSG(channel, "POP: %s" % "Good" if setupPop() != None else "Failed.") #self.bot.act_PRIVMSG(channel, "POP: %s" % "Good" if setupPop() != None else "Failed.")
self.bot.act_PRIVMSG(channel, "SMTP: %s" % "Good" if setupSMTP() != None else "Failed.") self.bot.act_PRIVMSG(channel, "SMTP: %s" % "Good" if setupSMTP() != None else "Failed.")
if self.bot.messageHasCommand(".text-cdc", trailing): for prefix in self.prefixes:
if self.bot.messageHasCommand(COMMAND_PREFIX + prefix, trailing):
email = self.config["people"][prefix]["email-addr"]
message = ' '.join(trailing.split(" ")[1:]) message = ' '.join(trailing.split(" ")[1:])
smtp = self.setupSMTP() smtp = self.setupSMTP()
try: try:
smtp.sendmail(self.config["account"]["auth"]["username"], self.config["email-addr"], "Subject:\n\n%s -%s" % (message, prefix.nick)) smtp.sendmail(self.config["account"]["auth"]["username"], email, "Subject:\n\n%s -%s" % (message, p.nick))
smtp.quit() smtp.quit()
self.bot.act_PRIVMSG(channel, "Message sent.") self.bot.act_PRIVMSG(channel, "Message sent.")
except Exception as e: except Exception as e:
@ -74,13 +79,15 @@ class TextCDC(ModuleBase):
return None return None
def setupTimer(self): def setupTimer(self):
self.timer = Timer(self.config["interval"], self.checkMail, [self.bot, self.config["email-addr"], self.config["output-channels"]],{}) self.timer = Timer(self.config["interval"], self.checkMail, [self.bot, self.config["people"], self.config["output-channels"]],{})
self.timer.start() self.timer.start()
def checkMail(self, bot, emailAddr, channels, imapObj = None): def checkMail(self, bot, people, channels, imapObj = None):
try: try:
if imapObj == None: if imapObj == None:
imapObj = self.setupIMAP() imapObj = self.setupIMAP()
for person in people:
emailAddr = people[person]["email-addr"]
result = imapObj.search(None, "(FROM \"%s\")" % emailAddr) result = imapObj.search(None, "(FROM \"%s\")" % emailAddr)
if (result[0] == "OK"): if (result[0] == "OK"):
messageIds = result[1][0].decode("utf-8") messageIds = result[1][0].decode("utf-8")
@ -91,7 +98,7 @@ class TextCDC(ModuleBase):
if (message[0] == "OK"): if (message[0] == "OK"):
messageText = message[1][0][1].decode("utf-8").split("-----Original Message-----")[0].rstrip() messageText = message[1][0][1].decode("utf-8").split("-----Original Message-----")[0].rstrip()
for channel in channels: for channel in channels:
bot.act_PRIVMSG(channel, "Message from CDC: %s" % messageText) bot.act_PRIVMSG(channel, "Message from %s: %s" % (person, messageText))
imapObj.store(messageId, "+FLAGS", "\\Deleted") imapObj.store(messageId, "+FLAGS", "\\Deleted")
else: else:
raise Exception("SMTP Error. Status was %s, expected OK" % message[0]) raise Exception("SMTP Error. Status was %s, expected OK" % message[0])