diff --git a/marietje/api/views.py b/marietje/api/views.py index 42a7a0d..c8c3ce6 100644 --- a/marietje/api/views.py +++ b/marietje/api/views.py @@ -103,7 +103,7 @@ def queue(request): queue = request.user.queue return JsonResponse({ 'current_song': playlist_song_to_dict(queue.current_song()), - 'queue': [playlist_song_to_dict(playlist_song) for playlist_song in queue.queue()], + '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())), 'current_time': int(time.time()) }) diff --git a/marietje/marietje/utils.py b/marietje/marietje/utils.py index 376b4d6..a0dc2a7 100644 --- a/marietje/marietje/utils.py +++ b/marietje/marietje/utils.py @@ -19,11 +19,12 @@ def song_to_dict(song, hash=False, user=False): return data -def playlist_song_to_dict(playlist_song, hash=False): +def playlist_song_to_dict(playlist_song, hash=False, user=None): return { 'id': playlist_song.id, 'requested_by': 'Marietje' if playlist_song.user is None else playlist_song.user.name, - 'song': song_to_dict(playlist_song.song, hash=hash) + 'song': song_to_dict(playlist_song.song, hash=hash), + 'can_move_down': playlist_song.user is not None and playlist_song.user == user }