From c21a6ddf277514c62a89cbd9214ec4fc905b4988 Mon Sep 17 00:00:00 2001 From: Giovane Date: Thu, 19 Nov 2015 16:20:52 -0200 Subject: Move 'From' initialization to InputMail factory. w/ @bwagner #531 --- service/pixelated/adapter/services/mail_service.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'service/pixelated/adapter/services/mail_service.py') diff --git a/service/pixelated/adapter/services/mail_service.py b/service/pixelated/adapter/services/mail_service.py index 7e6f1c63..6ecf3245 100644 --- a/service/pixelated/adapter/services/mail_service.py +++ b/service/pixelated/adapter/services/mail_service.py @@ -88,10 +88,9 @@ class MailService(object): @defer.inlineCallbacks def send_mail(self, content_dict): mail = InputMail.from_dict(content_dict) - mail.headers['From'] = self.account_email draft_id = content_dict.get('ident') - yield self.mail_sender.sendmail(mail) + sent_mail = yield self.move_to_sent(draft_id, mail) defer.returnValue(sent_mail) @@ -102,7 +101,6 @@ class MailService(object): yield self.mail_store.delete_mail(last_draft_ident) except Exception as error: pass - sent_mail = yield self.mail_store.add_mail('SENT', mail.raw) sent_mail.flags.add(Status.SEEN) yield self.mail_store.update_mail(sent_mail) -- cgit v1.2.3