From 8db461575035601bb7d764bb61de08a9e87ba145 Mon Sep 17 00:00:00 2001 From: Nick Krichevsky Date: Fri, 18 Sep 2015 21:52:52 -0400 Subject: [PATCH 1/2] Add support for multiple people --- pyircbot/modules/TextCDC.py | 67 ++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 30 deletions(-) diff --git a/pyircbot/modules/TextCDC.py b/pyircbot/modules/TextCDC.py index 63eafcc..6735acd 100644 --- a/pyircbot/modules/TextCDC.py +++ b/pyircbot/modules/TextCDC.py @@ -11,11 +11,14 @@ import imaplib from threading import Timer from pyircbot.modulebase import ModuleBase, ModuleHook +COMMAND_PREFIX = ".text-" + class TextCDC(ModuleBase): def __init__(self, bot, moduleName): ModuleBase.__init__(self, bot, moduleName) self.hooks.append(ModuleHook("PRIVMSG",self.handleMessage)) self.loadConfig() + self.prefixes = [person for person in self.config["people"]] self.bot = bot self.timer = None self.setupTimer() @@ -26,20 +29,22 @@ class TextCDC(ModuleBase): def handleMessage(self, args, prefix, trailing): channel = args[0] - prefix = self.bot.decodePrefix(prefix) + p = self.bot.decodePrefix(prefix) if self.bot.messageHasCommand(".textstatus", trailing): #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.") - if self.bot.messageHasCommand(".text-cdc", trailing): - message = ' '.join(trailing.split(" ")[1:]) - smtp = self.setupSMTP() - try: - smtp.sendmail(self.config["account"]["auth"]["username"], self.config["email-addr"], "Subject:\n\n%s -%s" % (message, prefix.nick)) - smtp.quit() - self.bot.act_PRIVMSG(channel, "Message sent.") - except Exception as e: - self.bot.log.error(str(e)) - self.bot.act_PRIVMSG(channel, "An SMTP Error has Occured") + 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:]) + smtp = self.setupSMTP() + try: + smtp.sendmail(self.config["account"]["auth"]["username"], email, "Subject:\n\n%s -%s" % (message, p.nick)) + smtp.quit() + self.bot.act_PRIVMSG(channel, "Message sent.") + except Exception as e: + self.bot.log.error(str(e)) + self.bot.act_PRIVMSG(channel, "An SMTP Error has Occured") def setupIMAP(self): imapObj = None @@ -74,29 +79,31 @@ class TextCDC(ModuleBase): return None def setupTimer(self): - self.timer = Timer(self.config["interval"], self.checkMail, [self.bot, self.config["email-addr"], self.config["output-channels"]],{}) - self.timer.start() + self.timer = Timer(self.config["interval"], self.checkMail, [self.bot, self.config["people"], self.config["output-channels"]],{}) + self.timer.start() - def checkMail(self, bot, emailAddr, channels, imapObj = None): + def checkMail(self, bot, people, channels, imapObj = None): try: if imapObj == None: imapObj = self.setupIMAP() - result = imapObj.search(None, "(FROM \"%s\")" % emailAddr) - if (result[0] == "OK"): - messageIds = result[1][0].decode("utf-8") - if len(messageIds) > 0: - messageIds = messageIds.split(" ") - for messageId in messageIds: - message = imapObj.fetch(messageId, "BODY[TEXT]") - if (message[0] == "OK"): - messageText = message[1][0][1].decode("utf-8").split("-----Original Message-----")[0].rstrip() - for channel in channels: - bot.act_PRIVMSG(channel, "Message from CDC: %s" % messageText) - imapObj.store(messageId, "+FLAGS", "\\Deleted") - else: - raise Exception("SMTP Error. Status was %s, expected OK" % message[0]) - imapObj.logout() - self.setupTimer() + for person in people: + emailAddr = people[person]["email-addr"] + result = imapObj.search(None, "(FROM \"%s\")" % emailAddr) + if (result[0] == "OK"): + messageIds = result[1][0].decode("utf-8") + if len(messageIds) > 0: + messageIds = messageIds.split(" ") + for messageId in messageIds: + message = imapObj.fetch(messageId, "BODY[TEXT]") + if (message[0] == "OK"): + messageText = message[1][0][1].decode("utf-8").split("-----Original Message-----")[0].rstrip() + for channel in channels: + bot.act_PRIVMSG(channel, "Message from %s: %s" % (person, messageText)) + imapObj.store(messageId, "+FLAGS", "\\Deleted") + else: + raise Exception("SMTP Error. Status was %s, expected OK" % message[0]) + imapObj.logout() + self.setupTimer() except Exception as e: if imapObj != None: imapObj.logout() From 87b8749438687c272d778932043636e3022c9df3 Mon Sep 17 00:00:00 2001 From: Nick Krichevsky Date: Fri, 18 Sep 2015 21:56:15 -0400 Subject: [PATCH 2/2] Add new example config --- examples/data/config/TextCDC.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/examples/data/config/TextCDC.json b/examples/data/config/TextCDC.json index 1fcd682..a143bc5 100644 --- a/examples/data/config/TextCDC.json +++ b/examples/data/config/TextCDC.json @@ -1,5 +1,19 @@ { - "email-addr":"5555555555@carrier.com.com", + "people": { + + "one": { + "email-addr": "5555555555@vtext.com" + }, + "two": { + "email-addr": "5555555555@vtext.com" + }, + "three": { + "email-addr": "5555555555@vtext.com" + }, + "four": { + "email-addr": "5555555555@txt.att.net" + } + }, "output-channels":["#yourchannel"], "interval": 30, "account": { @@ -8,6 +22,12 @@ "password": "Password" }, + "pop": { + "host": "pop.gmail.com", + "ssl": true, + "port": 995 + }, + "imap": { "host": "imap.gmail.com", "ssl": true,