fix(fcm): Convert event_time to UTC #403
Conversation
firebase_admin/_messaging_encoder.py
Outdated
| @@ -324,7 +325,12 @@ def encode_android_notification(cls, notification): | |||
|
|
|||
| event_time = result.get('event_time') | |||
| if event_time: | |||
| result['event_time'] = str(event_time.isoformat()) + 'Z' | |||
| if event_time.tzinfo is None: | |||
There was a problem hiding this comment.
I don't think you have to do any of this. At least on my machine, following works as expected.
>>> import datetime
>>> d = datetime.datetime.now()
>>> d
datetime.datetime(2020, 2, 3, 13, 39, 32, 133863)
>>> d.astimezone(datetime.timezone.utc)
datetime.datetime(2020, 2, 3, 21, 39, 32, 133863, tzinfo=datetime.timezone.utc)
The first is in my local timezone (13:39 PST). The second is in UTC (21:39 UTC). Isn't that all we want?
There was a problem hiding this comment.
Thanks! You're right. I missed that astimezone uses the local time zone if the provided datetime object is naive. Will update the code.
|
It turns out that in Python 3.5 |
firebase_admin/_messaging_utils.py
Outdated
| @@ -98,7 +98,8 @@ class AndroidNotification: | |||
| the user clicks it (optional). | |||
| event_timestamp: For notifications that inform users about events with an absolute time | |||
| reference, sets the time that the event in the notification occurred as a | |||
| ``datetime.datetime`` instance. Notifications in the panel are sorted by this time | |||
| ``datetime.datetime`` instance. If the ``datetime.datetime`` instance is naive it will | |||
| be assumed to be in the UTC timezone. Notifications in the panel are sorted by this time | |||
There was a problem hiding this comment.
FYI @egilmorez this is the API docs change. Thanks!
There was a problem hiding this comment.
Not critical, butI wonder if there is a more terse way to say "it will be assumed to be in the" . . . would "naive, it defaults to" be correct? Maybe "naive, it is set to" ?
If those aren't accurate, this is fine as/is.
- Check if the datetime object is naive or timezone aware - If a naive datetime object is provided then set the timezone to local timezone - Convert the event_time to UTC Zulu format
lahirumaramba
force-pushed
the
fix_eventtime_fcm
branch
from
4c391f9 to
99bbc05
Compare
datetimeobject is naive or timezone awaredatetimeobject is provided then set its timezone to the local timezoneevent_timeto UTC Zulu formatRELEASE NOTE:
AndroidNotificationclass now correctly formats theevent_timefield sent to the Cloud Messaging service.