fix ajax top10 for non-music groups

mantramantra12 · Jan 1, 2024 · e54d7f9 · e54d7f9
1 parent 73f3c3d
commit e54d7f9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/app/API/Torrent.php b/app/API/Torrent.php
@@ -31,7 +31,7 @@ protected function torrent(int $id): array {
             'Year'           => $tgroup->year(),
             'ReleaseTypeID'  => $tgroup->releaseType(),
             'ReleaseType'    => $tgroup->releaseTypeName(),
-            'Artists'        => $tgroup->artistRole()->idList(),
+            'Artists'        => $tgroup->artistRole()?->idList(),
             'DisplayArtists' => $tgroup->artistName(),
             'Media'          => $torrent->media(),
             'Format'         => $torrent->format(),
@@ -55,7 +55,7 @@ protected function tgroup(int $id): array {
             'Year'           => $tgroup->year(),
             'ReleaseTypeID'  => $tgroup->releaseType(),
             'ReleaseType'    => $tgroup->releaseTypeName(),
-            'Artists'        => $tgroup->artistRole()->idList(),
+            'Artists'        => $tgroup->artistRole()?->idList(),
             'DisplayArtists' => $tgroup->artistName(),
         ];
     }

diff --git a/app/TGroup.php b/app/TGroup.php
@@ -294,8 +294,8 @@ protected function fetchIsSnatched(): bool {
         );
     }
 
-    public function artistName(): string {
-        return $this->artistRole()->text();
+    public function artistName(): ?string {
+        return $this->artistRole()?->text();
     }
 
     public function artistRole(): ?ArtistRole\TGroup {
@@ -308,6 +308,10 @@ public function artistRole(): ?ArtistRole\TGroup {
         return $this->artistRole;
     }
 
+    public function hasArtistRole(): bool {
+        return $this->artistRole() instanceof ArtistRole\TGroup;
+    }
+
     public function catalogueNumber(): ?string {
         return $this->info()['CatalogueNumber'];
     }

diff --git a/app/TorrentAbstract.php b/app/TorrentAbstract.php
@@ -49,7 +49,7 @@ public function fullLink(): string {
 
     public function name(): string {
         $tgroup = $this->group();
-        return $tgroup->categoryName() === 'Music'
+        return $tgroup->hasArtistRole()
             ? $tgroup->artistName() . " – " . $tgroup->name()
             : $tgroup->name();
     }

diff --git a/tests/phpunit/CategoryTest.php b/tests/phpunit/CategoryTest.php
@@ -29,6 +29,7 @@ public function testChangeCategory(): void {
             name: 'phpunit category change ' . randomString(6),
             user: $user,
         );
+        $this->assertFalse($tgroup->hasArtistRole(), 'tgroup-cat-non-music');
         $torrentList = array_map(fn($info) =>
             Helper::makeTorrentEBook(
                 tgroup:      $tgroup,
@@ -56,6 +57,7 @@ public function testChangeCategory(): void {
             user:        $user,
         );
         $this->assertInstanceOf(Gazelle\TGroup::class, $new, 'cat-change-to-music');
+        $this->assertTrue($new->hasArtistRole(), 'tgroup-cat-is-music');
         $artist = (new Gazelle\Manager\Artist)->findByName($artistName);
         $this->assertEquals($artistName, $artist->name(), 'cat-new-artist');
         $this->assertEquals(