From dcadcf72aea026356cbc9a126cc40ad2d1ab3907 Mon Sep 17 00:00:00 2001
From: "(quasar) nebula" <qznebula@protonmail.com>
Date: Mon, 8 Sep 2025 19:30:03 -0300
Subject: content: generateTrackListItem: use artistText

---
 src/content/dependencies/generateArtistCredit.js  | 22 +++++++++++-----------
 src/content/dependencies/generateTrackListItem.js |  3 ++-
 2 files changed, 13 insertions(+), 12 deletions(-)

(limited to 'src/content')

diff --git a/src/content/dependencies/generateArtistCredit.js b/src/content/dependencies/generateArtistCredit.js
index ebc57187..6bf66e92 100644
--- a/src/content/dependencies/generateArtistCredit.js
+++ b/src/content/dependencies/generateArtistCredit.js
@@ -120,6 +120,10 @@ export default {
   generate(data, relations, slots, {html, language}) {
     if (!slots.normalStringKey) return html.blank();
 
+    const effectivelyDiffers =
+      (slots.showAnnotation && data.normalContributionAnnotationsDifferFromContext) ||
+      (data.normalContributionArtistsDifferFromContext);
+
     for (const link of [
       ...relations.normalContributionLinks,
       ...relations.featuringContributionLinks,
@@ -183,11 +187,13 @@ export default {
     let content;
 
     if (formattedArtistList) {
-      content =
-        language.$(slots.normalStringKey, {
-          ...slots.additionalStringOptions,
-          artists: formattedArtistList,
-        });
+      if (effectivelyDiffers) {
+        content =
+          language.$(slots.normalStringKey, {
+            ...slots.additionalStringOptions,
+            artists: formattedArtistList,
+          });
+      }
     } else {
       if (empty(relations.normalContributionLinks)) {
         return html.blank();
@@ -216,12 +222,6 @@ export default {
           ...relations.featuringContributionLinks,
         ]);
 
-      const effectivelyDiffers =
-        (formattedArtistList
-          ? null
-          : (slots.showAnnotation && data.normalContributionAnnotationsDifferFromContext) ||
-            (data.normalContributionArtistsDifferFromContext));
-
       if (empty(relations.featuringContributionLinks)) {
         if (effectivelyDiffers) {
           content =
diff --git a/src/content/dependencies/generateTrackListItem.js b/src/content/dependencies/generateTrackListItem.js
index 5678e240..4ec4a09a 100644
--- a/src/content/dependencies/generateTrackListItem.js
+++ b/src/content/dependencies/generateTrackListItem.js
@@ -15,7 +15,8 @@ export default {
     credit:
       relation('generateArtistCredit',
         track.artistContribs,
-        contextContributions),
+        contextContributions,
+        track.artistText),
 
     colorStyle:
       relation('generateColorStyleAttribute', track.color),
-- 
cgit 1.3.0-6-gf8a5