content, css: generateMusicVideoDateLine

1 files changed, 24 insertions, 51 deletions

diff --git a/src/content/dependencies/generateMusicVideo.js b/src/content/dependencies/generateMusicVideo.js
index 628c1a17..035cd353 100644
--- a/src/content/dependencies/generateMusicVideo.js
+++ b/src/content/dependencies/generateMusicVideo.js
@@ -7,41 +7,22 @@ export default {
         dimensions: musicVideo.coverArtDimensions,
       }),
 
-    releaseLine:
-      relation('generateMusicVideoReleaseLine', musicVideo, thing),
+    artistsLine:
+      relation('generateMusicVideoArtistsLine', musicVideo),
+
+    dateLine:
+      relation('generateMusicVideoDateLine', musicVideo, thing),
 
     contributorCredit:
       relation('generateArtistCredit', musicVideo.contributorContribs, []),
   }),
 
-  data: (musicVideo, track) => ({
+  data: (musicVideo, _thing) => ({
     label:
       musicVideo.label,
 
     url:
       musicVideo.url,
-
-    sameDay:
-      (() => {
-        if (!musicVideo.dateIsSpecified) return null;
-
-        const compare = (a, b) =>
-          a.toDateString() === b.toDateString();
-
-        if (compare(musicVideo.date, track.album.date)) {
-          if (track.album.style === 'single') {
-            return 'single';
-          } else {
-            return 'album';
-          }
-        }
-
-        if (compare(musicVideo.date, track.date)) {
-          return 'track';
-        }
-
-        return null;
-      })(),
   }),
 
   generate: (data, relations, {language, html}) =>
@@ -63,41 +44,33 @@ export default {
           link: data.url,
         }),
 
-        html.tag('p', {class: 'music-video-info'},
+        html.tag('p',
           {[html.joinChildren]: html.tag('br')},
 
           [
-            html.tag('span', {class: 'release-line'},
+            html.tag('span', {class: 'artists-line'},
               {[html.onlyIfContent]: true},
 
-              relations.releaseLine),
-
-            language.encapsulate(capsule, 'date', capsule => [
-              data.sameDay == 'album' &&
-                language.$(capsule, 'sameDayAsAlbum'),
-
-              data.sameDay == 'single' &&
-                language.$(capsule, 'sameDayAsTrack'),
+              relations.artistsLine),
 
-              data.sameDay === 'track' &&
-                language.$(capsule, 'sameDayAsTrack'),
-            ]),
+            relations.dateLine,
+          ]),
 
-            language.encapsulate(capsule, 'contributorsLine', capsule =>
-              language.$(capsule, {
-                [language.onlyIfOptions]: ['credit'],
+        html.tag('p',
+          language.encapsulate(capsule, 'contributorsLine', capsule =>
+            language.$(capsule, {
+              [language.onlyIfOptions]: ['credit'],
 
-                credit:
-                  relations.contributorCredit.slots({
-                    normalStringKey: language.encapsulate(capsule, 'credit'),
+              credit:
+                relations.contributorCredit.slots({
+                  normalStringKey: language.encapsulate(capsule, 'credit'),
 
-                    showAnnotation: true,
-                    showChronology: true,
-                    chunkwrap: false,
+                  showAnnotation: true,
+                  showChronology: true,
+                  chunkwrap: false,
 
-                    chronologyKind: 'musicVideoContribution',
-                  }),
-              })),
-          ]),
+                  chronologyKind: 'musicVideoContribution',
+                }),
+            }))),
       ])),
 };