Merge branch 'master' into 'master'

Your mother was a hamster and your father smelt of elder berries.

See merge request !4

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,

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):
+		for prefix in self.prefixes:
-			message = ' '.join(trailing.split(" ")[1:])
+			if self.bot.messageHasCommand(COMMAND_PREFIX + prefix, trailing):
-			smtp = self.setupSMTP()
+				email = self.config["people"][prefix]["email-addr"]
-			try:
+				message = ' '.join(trailing.split(" ")[1:])
-				smtp.sendmail(self.config["account"]["auth"]["username"], self.config["email-addr"], "Subject:\n\n%s -%s" % (message, prefix.nick))
+				smtp = self.setupSMTP()
-				smtp.quit()
+				try:
-				self.bot.act_PRIVMSG(channel, "Message sent.")
+					smtp.sendmail(self.config["account"]["auth"]["username"], email, "Subject:\n\n%s -%s" % (message, p.nick))
-			except Exception as e:
+					smtp.quit()
-				self.bot.log.error(str(e))
+					self.bot.act_PRIVMSG(channel, "Message sent.")
-				self.bot.act_PRIVMSG(channel, "An SMTP Error has Occured")
+				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 = 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:
 			if imapObj == None:
 				imapObj = self.setupIMAP()
-			result = imapObj.search(None, "(FROM \"%s\")" % emailAddr)
+			for person in people:
-			if (result[0] == "OK"):
+				emailAddr = people[person]["email-addr"]
-				messageIds = result[1][0].decode("utf-8")
+				result = imapObj.search(None, "(FROM \"%s\")" % emailAddr)
-				if len(messageIds) > 0:
+				if (result[0] == "OK"):
-					messageIds = messageIds.split(" ")
+					messageIds = result[1][0].decode("utf-8")
-					for messageId in messageIds:
+					if len(messageIds) > 0:
-						message = imapObj.fetch(messageId, "BODY[TEXT]")
+						messageIds = messageIds.split(" ")
-						if (message[0] == "OK"):
+						for messageId in messageIds:
-							messageText = message[1][0][1].decode("utf-8").split("-----Original Message-----")[0].rstrip()
+							message = imapObj.fetch(messageId, "BODY[TEXT]")
-							for channel in channels: 
+							if (message[0] == "OK"):
-								bot.act_PRIVMSG(channel, "Message from CDC: %s" % messageText)
+								messageText = message[1][0][1].decode("utf-8").split("-----Original Message-----")[0].rstrip()
-							imapObj.store(messageId, "+FLAGS", "\\Deleted")
+								for channel in channels: 
-						else:
+									bot.act_PRIVMSG(channel, "Message from %s: %s" % (person, messageText))
-							raise Exception("SMTP Error. Status was %s, expected OK" % message[0])
+								imapObj.store(messageId, "+FLAGS", "\\Deleted")
-				imapObj.logout()
+							else:
-				self.setupTimer()
+								raise Exception("SMTP Error. Status was %s, expected OK" % message[0])
+			imapObj.logout()
+			self.setupTimer()
 		except Exception as e:
 			if imapObj != None:
 				imapObj.logout()