game on

backend/voting/consumers.py

@@ -83,15 +83,24 @@ class SessionConsumer(WebsocketConsumer):
 				for track in tracks:
 					if next:
 						session.current_track = track
+						next = False
 						break
 					if session.current_track == track:
 						next = True
+				if next:
+					# We didnt get a next track, so it must have been the last one
+					session.current_track = None
 			else:
 				session.current_track = tracks.first()
 			session.save()
-			async_to_sync(self.channel_layer.group_send)(
-				self.session_name, {"type": "announce.track"}
-			)
+			if session.current_track is None:
+				async_to_sync(self.channel_layer.group_send)(
+					self.session_name, {"type": "announce.done"}
+				)
+			else:
+				async_to_sync(self.channel_layer.group_send)(
+					self.session_name, {"type": "announce.track"}
+				)
 
 
 	def announce(self, event):
@@ -100,6 +109,8 @@ class SessionConsumer(WebsocketConsumer):
 
 	def announce_track(self, event):
 		self.send(text_data=json.dumps({"track": {}}))
+	def announce_done(self, event):
+		self.send(text_data=json.dumps({"done": {}}))
 
 	def voted(self, event):
 		user = event["user"]