From be3b7b6a0a092d4dd98c3ebbcab00da36a54eb42 Mon Sep 17 00:00:00 2001 From: Jim Driessen Date: Mon, 12 Jun 2017 17:12:44 +0200 Subject: [PATCH] Fix timezone issues. --- marietje/api/views.py | 2 +- marietje/playerapi/views.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/marietje/api/views.py b/marietje/api/views.py index 086f935..3318006 100644 --- a/marietje/api/views.py +++ b/marietje/api/views.py @@ -159,7 +159,7 @@ def queue(request): return JsonResponse({ 'current_song': playlist_song_to_dict(queue.current_song()), 'queue': [playlist_song_to_dict(playlist_song, user=request.user) for playlist_song in queue.queue()], - 'started_at': 0 if queue.started_at is None else int(time.mktime(queue.started_at.timetuple())), + 'started_at': 0 if queue.started_at is None else int(queue.started_at.timestamp()), 'current_time': int(time.time()) }) diff --git a/marietje/playerapi/views.py b/marietje/playerapi/views.py index a709567..1136574 100644 --- a/marietje/playerapi/views.py +++ b/marietje/playerapi/views.py @@ -1,4 +1,4 @@ -from datetime import datetime +from django.utils import timezone from django.http import JsonResponse from django.shortcuts import get_object_or_404 @@ -31,7 +31,7 @@ def queue(request): @token_required def play(request): queue = get_object_or_404(Queue, id=request.POST.get('queue')) - queue.started_at = datetime.now() + queue.started_at = timezone.now() queue.save() return JsonResponse({})