From ee61ba19e6c7a6131b06c5c05d605754a5fad095 Mon Sep 17 00:00:00 2001 From: b3yond Date: Thu, 18 Jan 2018 14:23:11 +0100 Subject: [PATCH] mailbot doesn't crawl mails which it wrote itself anymore --- mailbot.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/mailbot.py b/mailbot.py index 20216d1..a513359 100644 --- a/mailbot.py +++ b/mailbot.py @@ -84,14 +84,16 @@ class Mailbot(object): return msgs msg = email.message_from_bytes(data[0][1]) - # get a comparable date out of the email - date_tuple = email.utils.parsedate_tz(msg['Date']) - date_tuple = datetime.datetime.fromtimestamp(email.utils.mktime_tz(date_tuple)) - date = (date_tuple - datetime.datetime(1970, 1, 1)).total_seconds() - if date > self.get_history(self.history_path): - self.last_mail = date - self.save_last() - msgs.append(self.make_report(msg)) + if not self.config['mail']['user'] + "@" + \ + self.config["mail"]["mailserver"].partition(".")[2] in msg['From']: + # get a comparable date out of the email + date_tuple = email.utils.parsedate_tz(msg['Date']) + date_tuple = datetime.datetime.fromtimestamp(email.utils.mktime_tz(date_tuple)) + date = (date_tuple - datetime.datetime(1970, 1, 1)).total_seconds() + if date > self.get_history(self.history_path): + self.last_mail = date + self.save_last() + msgs.append(self.make_report(msg)) return msgs def get_history(self, path): @@ -154,7 +156,8 @@ class Mailbot(object): :param statuses: (list of report.Report objects) :return: statuses: (list of report.Report objects) """ - self.post(statuses) + for status in statuses: + self.post(status) msgs = self.crawl()