yetangitu/deltachat-core
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-core.git synced 2025-10-04 10:19:16 +02:00
Code Issues Releases Wiki Activity

- refine msg.time_sent to return a correct utc-based "naive" datetime object

Browse source 
- accept message objects instead of just ints for get_mime_headers(msg)
This commit is contained in:
holger krekel 2018-10-16 23:24:38 +02:00
parent 466c660fc6
commit 21f3a6b006
3 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/src/deltachat/account.py
View file

@ -223,7 +223,7 @@ class Account(object):
""" return Message instance. """ """ return Message instance. """
return Message.from_db(self._dc_context, msg_id) return Message.from_db(self._dc_context, msg_id)
def get_mime_headers(self, msg_id): def get_mime_headers(self, msg):
""" return mime-header object for an incoming message. """ return mime-header object for an incoming message.
This only returns a non-None object if ``save_mime_headers`` This only returns a non-None object if ``save_mime_headers``
@ -234,6 +234,7 @@ class Account(object):
:returns: email-mime message object. :returns: email-mime message object.
""" """
import email.parser import email.parser
msg_id = getattr(msg, "id", msg)
mime_headers = lib.dc_get_mime_headers(self._dc_context, msg_id) mime_headers = lib.dc_get_mime_headers(self._dc_context, msg_id)
if mime_headers: if mime_headers:
s = ffi.string(mime_headers) s = ffi.string(mime_headers)

6
python/src/deltachat/message.py
View file

@ -92,12 +92,12 @@ class Message(object):
@property_with_doc @property_with_doc
def time_sent(self): def time_sent(self):
"""time when the message was sent. """time (utc) when the message was sent.
:returns: datetime.datetime() object. :returns: naive datetime.datetime() object.
""" """
ts = lib.dc_msg_get_timestamp(self._dc_msg) ts = lib.dc_msg_get_timestamp(self._dc_msg)
return datetime.fromtimestamp(ts) return datetime.utcfromtimestamp(ts)
@property @property
def chat(self): def chat(self):

3
python/tests/test_account.py
View file

@ -178,7 +178,7 @@ class TestOfflineAccount:
ac1 = acfactory.get_configured_offline_account() ac1 = acfactory.get_configured_offline_account()
contact1 = ac1.create_contact("some1@hello.com", name="some1") contact1 = ac1.create_contact("some1@hello.com", name="some1")
chat = ac1.create_chat_by_contact(contact1) chat = ac1.create_chat_by_contact(contact1)
past1s = datetime.now() - timedelta(seconds=1) past1s = datetime.utcnow() - timedelta(seconds=1)
msg = chat.send_text("msg1") msg = chat.send_text("msg1")
ts = msg.time_sent ts = msg.time_sent
assert ts.strftime("Y") assert ts.strftime("Y")
@ -297,6 +297,7 @@ class TestOnlineAccount:
mime = ac2.get_mime_headers(in_id) mime = ac2.get_mime_headers(in_id)
assert mime.get_all("From") assert mime.get_all("From")
assert mime.get_all("Received") assert mime.get_all("Received")
assert ac2.get_mime_headers(ac2.get_message_by_id(in_id)).get_all("From")
def test_send_and_receive_image(self, acfactory, lp, data): def test_send_and_receive_image(self, acfactory, lp, data):
lp.sec("starting accounts, waiting for configuration") lp.sec("starting accounts, waiting for configuration")