From 8f71b408ef21ebea67a227ff6f615eb18485ce94 Mon Sep 17 00:00:00 2001
From: Alex Ramirez <alexir13@gmail.com>
Date: Sun, 12 Nov 2023 22:37:48 -0800
Subject: [PATCH 1/2] Null handling of soft deleted tracks for favourites page

---
 app/Models/Favourite.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/Models/Favourite.php b/app/Models/Favourite.php
index 0c2500e1..019e05df 100644
--- a/app/Models/Favourite.php
+++ b/app/Models/Favourite.php
@@ -91,8 +91,11 @@ class Favourite extends Model
             } else {
                 if ($this->playlist_id) {
                     return $this->playlist;
-                } // no resource - this should never happen under real circumstances
+                }
                 else {
+                    // No resource
+                    // In this case, either the resource was
+                    // soft-deleted or something else occurred.
                     return null;
                 }
             }
@@ -101,6 +104,11 @@ class Favourite extends Model
 
     public function getTypeAttribute()
     {
-        return get_class($this->resource);
+        // As of PHP 7.2, get_class is picky about null args
+        if ($resource = $this->resource) {
+            return get_class($resource);
+        } else {
+            return null;
+        }
     }
 }

From 9c8402644b6d2a512968c9de8205aa2e72e86640 Mon Sep 17 00:00:00 2001
From: Alex Ramirez <alexir13@gmail.com>
Date: Sun, 12 Nov 2023 23:04:13 -0800
Subject: [PATCH 2/2] More consice PHP

---
 app/Models/Favourite.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/Models/Favourite.php b/app/Models/Favourite.php
index 019e05df..2f135c87 100644
--- a/app/Models/Favourite.php
+++ b/app/Models/Favourite.php
@@ -105,10 +105,7 @@ class Favourite extends Model
     public function getTypeAttribute()
     {
         // As of PHP 7.2, get_class is picky about null args
-        if ($resource = $this->resource) {
-            return get_class($resource);
-        } else {
-            return null;
-        }
+        $resource = $this->resource;
+        return $resource ? get_class($resource) : null;
     }
 }