Merge branch 'develop' of https://github.com/mintopia/musicparty into…

… develop
mintopia · Dec 30, 2024 · c710732 · c710732
2 parents de14d54 + 8620ae7
commit c710732
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/app/Http/Controllers/Webhooks/PartyController.php b/app/Http/Controllers/Webhooks/PartyController.php
@@ -25,4 +25,11 @@ public function librespot(PartyLibrespotRequest $request, Party $party)
         }
         return response()->noContent();
     }
+
+    public function simple(Party $party)
+    {
+        Log::debug("{$party}: Received simple webhook event");
+        PartyUpdate::dispatch($party)->onQueue('partyupdates')->afterResponse();
+        return response()->noContent();
+    }
 }
diff --git a/app/Models/Party.php b/app/Models/Party.php
@@ -604,6 +604,9 @@ protected function backfillUpcomingSongs()
             ->toArray();
 
         $tracks = array_filter($tracks, function ($track) use ($existingIds) {
+            if ($track->track === null) {
+                return false;
+            }
             return !in_array($track->track->id, $existingIds);
         });
 

diff --git a/routes/webhooks.php b/routes/webhooks.php
@@ -5,4 +5,5 @@
 
 Route::name('webhooks.')->middleware('auth:sanctum')->group(function () {
     Route::post('parties/{party}/librespot', [PartyController::class, 'librespot'])->middleware('can:update,party')->name('parties.update');
+    Route::post('parties/{party}/simple', [PartyController::class, 'simple'])->middleware('can:update,party')->name('parties.simple');
 });