Adding date to PixelatedMail#from_dict

2 files changed, 24 insertions, 0 deletions

diff --git a/service/pixelated/adapter/pixelated_mail.py b/service/pixelated/adapter/pixelated_mail.py
index 2b9ccd35..e8aab1eb 100644
--- a/service/pixelated/adapter/pixelated_mail.py
+++ b/service/pixelated/adapter/pixelated_mail.py
@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
 from pixelated.adapter.status import Status
+import pixelated.support.date
 import dateutil.parser as dateparser
 from email.MIMEMultipart import MIMEMultipart
 from email.MIMEText import MIMEText
@@ -107,6 +108,7 @@ class PixelatedMail:
         mime_multipart['Cc'] = ", ".join(self.headers['cc'])
         mime_multipart['Bcc'] = ", ".join(self.headers['bcc'])
         mime_multipart['Subject'] = self.headers['subject']
+        mime_multipart['Date'] = self.headers['date']
         mime_multipart.attach(MIMEText(self.body, 'plain'))
         return mime_multipart
 
@@ -130,6 +132,7 @@ class PixelatedMail:
 def from_dict(mail_dict):
     mail = PixelatedMail()
     mail.headers = mail_dict.get('header', {})
+    mail.headers['date'] = pixelated.support.date.iso_now()
     mail.body = mail_dict.get('body', '')
     mail.ident = mail_dict.get('ident', None)
     mail.tags = mail_dict.get('tags', [])
diff --git a/service/pixelated/support/date.py b/service/pixelated/support/date.py
new file mode 100644
index 00000000..1593022c
--- /dev/null
+++ b/service/pixelated/support/date.py
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2014 ThoughtWorks, Inc.
+#
+# Pixelated is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pixelated is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+import datetime
+from dateutil.tz import tzlocal
+
+
+def iso_now():
+    return datetime.datetime.now(tzlocal()).isoformat()