fix(exists-in-queue): handle same track with different uri

Iteam1337 · Sep 22, 2019 · 63c1aa3 · 63c1aa3
1 parent 92f3579
commit 63c1aa3
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 46 deletions.
diff --git a/src/Event.re b/src/Event.re
@@ -34,7 +34,7 @@ module Message = {
       | Clear => Queue.clear()
       | CurrentQueue => Queue.current()
       | FullQueue => Queue.full()
-      | Queue => Queue.last(args)
+      | Queue => Queue.AsLastTrack.make(args, ())
       | SpotifyCopy(tracks) => Queue.multiple(tracks)
 
       /* Player control */

diff --git a/src/Routes.re b/src/Routes.re
@@ -10,7 +10,7 @@ module IndexRoute = {
     );
 };
 
-module VerificationRoute = {
+module VerificationCallback = {
   open Decode;
 
   let make = body => {
@@ -75,7 +75,7 @@ module EventRoute = {
         res
         |> (
           switch (Decode.EventResponse.make(body)) {
-          | UrlVerification => VerificationRoute.make(body)
+          | UrlVerification => VerificationCallback.make(body)
           | EventCallback(event) => EventCallback.make(event)
           | UnknownEvent => badRequest
           }
@@ -95,7 +95,7 @@ module ActionRoute = {
           body |> Decode.Action.make;
         let track = actions[0].value;
 
-        Queue.last(track)
+        Queue.AsLastTrack.make(track, ())
         |> then_(message => {
              Elastic.log(
                ~command=Human(Commands.Queue),

diff --git a/src/commands/EasterEgg.re b/src/commands/EasterEgg.re
@@ -40,15 +40,15 @@ module Playlist = {
 let run =
   Queue.(
     fun
-    | IteamClassics => Playlist.iteamClassics->last
+    | IteamClassics => Playlist.iteamClassics->AsLastTrack.make()
     | FreeBird => Track.freeBird->next
     | Friday =>
       Utils.isFriday()
         ? Track.friday->next
         : Js.Promise.resolve(`Ok("Sorry, it's not Friday"))
     | Rednex => Track.rednex->next
     | Shoreline => Track.shoreline->next
-    | Slowdance => Playlist.slowdance->last
+    | Slowdance => Playlist.slowdance->AsLastTrack.make()
     | Tequila => Track.tequila->next
     | WWW => Track.worldwideweb->next
   );
@@ -62,4 +62,4 @@ let isEasterEgg = () => {
          ->resolve
        )
   );
-};
+};
diff --git a/src/commands/Queue.re b/src/commands/Queue.re
@@ -84,48 +84,69 @@ module Exists = {
     | NotInQueue;
 
   let inQueue = trackUri => {
-    queueWithFallback()
-    |> then_(({items}) => {
-         let existsInQueue =
-           items
-           ->Belt.Array.map(item => Utils.sonosUriToSpotifyUri(item.uri))
-           ->Belt.Array.some(uri => uri == trackUri);
-
-         resolve(existsInQueue ? InQueue : NotInQueue);
-       });
+    trackUri
+    ->SpotifyUtils.trackId
+    ->Belt.Option.getWithDefault("")
+    ->Spotify.getSpotifyTrack
+    |> then_((spotify: Spotify.WejayTrack.t) =>
+         queueWithFallback()
+         |> then_(({items}) => {
+              /* Only checking URI is not enough, so we do a
+               * naive artist/track name match as well. Sonos
+               * sometimes uses a different track URI
+               * than what was pasted in Wejay because
+               * of different regions or markets */
+              let existsInQueue =
+                items->Belt.Array.some(item =>
+                  Utils.sonosUriToSpotifyUri(item.uri) === trackUri
+                  || item.artist === spotify.artist
+                  && item.title === spotify.name
+                );
+
+              resolve(existsInQueue ? InQueue : NotInQueue);
+            })
+       );
   };
 };
 
-let last = track => {
-  let parsedTrack = Utils.parsedTrack(track);
-
-  Exists.inQueue(parsedTrack)
-  |> then_((existsInQueue: Exists.t) =>
-       switch (existsInQueue) {
-       | InQueue => resolve(`Ok(Message.trackExistsInQueue))
-       | NotInQueue =>
-         device->queueAsLast(parsedTrack)
-         |> then_(queuedTrack =>
-              Services.getCurrentTrack()
-              |> then_(({queuePosition}: currentTrackResponse) => {
-                   let {firstTrackNumberEnqueued}: queueResponse =
-                     queuedTrack->queueResponse;
-
-                   let message =
-                     "Sweet! Your track is number *"
-                     ++ trackPosition(
-                          ~first=firstTrackNumberEnqueued,
-                          ~queueAt=queuePosition,
-                          (),
-                        )
-                     ++ "* in the queue :musical_note:";
+module AsLastTrack = {
+  let queue = track => {
+    device->queueAsLast(track)
+    |> then_(queuedTrack =>
+         Services.getCurrentTrack()
+         |> then_(({queuePosition}: currentTrackResponse) => {
+              let {firstTrackNumberEnqueued}: queueResponse =
+                queuedTrack->queueResponse;
+
+              let message =
+                "Sweet! Your track is number *"
+                ++ trackPosition(
+                     ~first=firstTrackNumberEnqueued,
+                     ~queueAt=queuePosition,
+                     (),
+                   )
+                ++ "* in the queue :musical_note:";
+
+              `Ok(message) |> resolve;
+            })
+       );
+  };
 
-                   `Ok(message) |> resolve;
-                 })
-            )
-         |> catch(_ => `Failed("Failed to queue track") |> resolve)
-       }
-     );
+  let make = (track, ~skipExists=false, ()) => {
+    let parsedTrack = Utils.parsedTrack(track);
+
+    skipExists
+      ? queue(parsedTrack)
+      : Exists.inQueue(parsedTrack)
+        |> then_((existsInQueue: Exists.t) =>
+             switch (existsInQueue) {
+             | InQueue => resolve(`Ok(Message.trackExistsInQueue))
+             | NotInQueue =>
+               queue(parsedTrack)
+               |> catch(_ => `Failed("Failed to queue track") |> resolve)
+             }
+           );
+  };
 };
 
 let next = track => {
@@ -171,7 +192,7 @@ let multiple = tracks => {
            switch (curr) {
            | Exists.InQueue => (inQueue + 1, notInQueue)
            | NotInQueue =>
-             last(parsedTracks[i]) |> ignore;
+             AsLastTrack.make(parsedTracks[i], ~skipExists=true, ()) |> ignore;
 
              (inQueue, notInQueue + 1);
            }