« get me outta code hell

hsmusic-wiki - HSMusic - static wiki software cataloguing collaborative creation
about summary refs log tree commit diff
path: root/src/content
diff options
context:
space:
mode:
Diffstat (limited to 'src/content')
-rw-r--r--src/content/dependencies/generateAlbumCommentaryPage.js5
-rw-r--r--src/content/dependencies/generateAlbumSidebarGroupBox.js4
-rw-r--r--src/content/dependencies/generateArtTagGalleryPage.js2
-rw-r--r--src/content/dependencies/generateArtTagInfoPage.js2
-rw-r--r--src/content/dependencies/generateArtistInfoPage.js2
-rw-r--r--src/content/dependencies/generateArtistInfoPageMusicVideosChunkItem.js2
-rw-r--r--src/content/dependencies/generateContributionTooltipExternalLinkSection.js10
-rw-r--r--src/content/dependencies/generateFlashInfoPage.js2
-rw-r--r--src/content/dependencies/generateGroupInfoPage.js2
-rw-r--r--src/content/dependencies/generateMusicVideo.js2
-rw-r--r--src/content/dependencies/generateReleaseInfoListenLine.js11
11 files changed, 24 insertions, 20 deletions
diff --git a/src/content/dependencies/generateAlbumCommentaryPage.js b/src/content/dependencies/generateAlbumCommentaryPage.js
index b6c8edf6..a380f468 100644
--- a/src/content/dependencies/generateAlbumCommentaryPage.js
+++ b/src/content/dependencies/generateAlbumCommentaryPage.js
@@ -51,7 +51,8 @@ export default {
         relation('linkAlbum', album);
 
       relations.albumCommentaryListeningLinks =
-        album.urls.map(url => relation('linkExternal', url));
+        album.urls
+          .map(entry => relation('linkExternal', entry.url));
 
       if (album.hasCoverArt) {
         relations.albumCommentaryCover =
@@ -74,7 +75,7 @@ export default {
     relations.trackCommentaryListeningLinks =
       query.tracksWithCommentary
         .map(track =>
-          track.urls.map(url => relation('linkExternal', url)));
+          track.urls.map(entry => relation('linkExternal', entry.url)));
 
     relations.trackCommentaryCovers =
       query.tracksWithCommentary
diff --git a/src/content/dependencies/generateAlbumSidebarGroupBox.js b/src/content/dependencies/generateAlbumSidebarGroupBox.js
index 0a9c0db9..15fedf75 100644
--- a/src/content/dependencies/generateAlbumSidebarGroupBox.js
+++ b/src/content/dependencies/generateAlbumSidebarGroupBox.js
@@ -38,8 +38,8 @@ export default {
       relation('linkGroup', group);
 
     relations.externalLinks =
-      group.urls.map(url =>
-        relation('linkExternal', url));
+      group.urls
+        .map(entry => relation('linkExternal', entry.url));
 
     if (group.descriptionShort) {
       relations.description =
diff --git a/src/content/dependencies/generateArtTagGalleryPage.js b/src/content/dependencies/generateArtTagGalleryPage.js
index 646975ef..ec0624d1 100644
--- a/src/content/dependencies/generateArtTagGalleryPage.js
+++ b/src/content/dependencies/generateArtTagGalleryPage.js
@@ -42,7 +42,7 @@ export default {
     if (!empty(artTag.extraReadingURLs)) {
       relations.extraReadingLinks =
         artTag.extraReadingURLs
-          .map(url => relation('linkExternal', url));
+          .map(entry => relation('linkExternal', entry.url));
     }
 
     if (!empty(artTag.directAncestorArtTags)) {
diff --git a/src/content/dependencies/generateArtTagInfoPage.js b/src/content/dependencies/generateArtTagInfoPage.js
index 683eeab6..db26260b 100644
--- a/src/content/dependencies/generateArtTagInfoPage.js
+++ b/src/content/dependencies/generateArtTagInfoPage.js
@@ -50,7 +50,7 @@ export default {
 
     extraReadingLinks:
       artTag.extraReadingURLs
-        .map(url => relation('linkExternal', url)),
+        .map(entry => relation('linkExternal', entry.url)),
 
     relatedArtTagLinks:
       artTag.relatedArtTags
diff --git a/src/content/dependencies/generateArtistInfoPage.js b/src/content/dependencies/generateArtistInfoPage.js
index 29bc34e6..3961dc49 100644
--- a/src/content/dependencies/generateArtistInfoPage.js
+++ b/src/content/dependencies/generateArtistInfoPage.js
@@ -62,7 +62,7 @@ export default {
 
     visitLinks:
       artist.urls
-        .map(url => relation('linkExternal', url)),
+        .map(entry => relation('linkExternal', entry.url)),
 
     tracksChunkedList:
       relation('generateArtistInfoPageTracksChunkedList', artist),
diff --git a/src/content/dependencies/generateArtistInfoPageMusicVideosChunkItem.js b/src/content/dependencies/generateArtistInfoPageMusicVideosChunkItem.js
index 8bae860d..570a984a 100644
--- a/src/content/dependencies/generateArtistInfoPageMusicVideosChunkItem.js
+++ b/src/content/dependencies/generateArtistInfoPageMusicVideosChunkItem.js
@@ -38,7 +38,7 @@ export default {
 
     externalLinks:
       query.musicVideo.urls
-        .map(url => relation('linkExternal', url)),
+        .map(entry => relation('linkExternal', entry.url)),
   }),
 
   data: (query, _artist, contribs) => ({
diff --git a/src/content/dependencies/generateContributionTooltipExternalLinkSection.js b/src/content/dependencies/generateContributionTooltipExternalLinkSection.js
index 210db1e9..cc61fab4 100644
--- a/src/content/dependencies/generateContributionTooltipExternalLinkSection.js
+++ b/src/content/dependencies/generateContributionTooltipExternalLinkSection.js
@@ -4,19 +4,21 @@ export default {
   relations: (relation, contribution) => ({
     icons:
       contribution.artist.urls
-        .map(url => relation('generateExternalIcon', url)),
+        .map(entry => relation('generateExternalIcon', entry.url)),
 
     handles:
       contribution.artist.urls
-        .map(url => relation('generateExternalHandle', url)),
+        .map(entry => relation('generateExternalHandle', entry.url)),
 
     platforms:
       contribution.artist.urls
-        .map(url => relation('generateExternalPlatform', url)),
+        .map(entry => relation('generateExternalPlatform', entry.url)),
   }),
 
   data: (contribution) => ({
-    urls: contribution.artist.urls,
+    urls:
+      contribution.artist.urls
+        .map(entry => entry.url),
   }),
 
   generate: (data, relations, {html, language}) =>
diff --git a/src/content/dependencies/generateFlashInfoPage.js b/src/content/dependencies/generateFlashInfoPage.js
index b4e8c757..b334412b 100644
--- a/src/content/dependencies/generateFlashInfoPage.js
+++ b/src/content/dependencies/generateFlashInfoPage.js
@@ -42,7 +42,7 @@ export default {
 
     externalLinks:
       query.urls
-        .map(url => relation('linkExternal', url)),
+        .map(entry => relation('linkExternal', entry.url)),
 
     artworkColumn:
       relation('generateFlashArtworkColumn', flash),
diff --git a/src/content/dependencies/generateGroupInfoPage.js b/src/content/dependencies/generateGroupInfoPage.js
index 0f3093b2..261d2212 100644
--- a/src/content/dependencies/generateGroupInfoPage.js
+++ b/src/content/dependencies/generateGroupInfoPage.js
@@ -51,7 +51,7 @@ export default {
 
     visitLinks:
       group.urls
-        .map(url => relation('linkExternal', url)),
+        .map(entry => relation('linkExternal', entry.url)),
 
     description:
       relation('transformContent', group.description),
diff --git a/src/content/dependencies/generateMusicVideo.js b/src/content/dependencies/generateMusicVideo.js
index e00b83b0..15eb233b 100644
--- a/src/content/dependencies/generateMusicVideo.js
+++ b/src/content/dependencies/generateMusicVideo.js
@@ -21,7 +21,7 @@ export default {
 
     watchLinks:
       musicVideo.urls
-        .map(url => relation('linkExternal', url)),
+        .map(entry => relation('linkExternal', entry.url)),
   }),
 
   data: (musicVideo, _thing) => ({
diff --git a/src/content/dependencies/generateReleaseInfoListenLine.js b/src/content/dependencies/generateReleaseInfoListenLine.js
index 97f248d6..cd3baaf2 100644
--- a/src/content/dependencies/generateReleaseInfoListenLine.js
+++ b/src/content/dependencies/generateReleaseInfoListenLine.js
@@ -64,7 +64,8 @@ export default {
 
   relations: (relation, query, _thing) => ({
     links:
-      query.urls.map(url => relation('linkExternal', url)),
+      query.urls
+        .map(entry => relation('linkExternal', entry.url)),
   }),
 
   data(query, thing) {
@@ -76,13 +77,13 @@ export default {
       unique([
         ...query.artists.flatMap(artist => artist.urls),
         ...query.artistGroups.flatMap(group => group.urls),
-      ]).map(url => new URL(url));
+      ]).map(entry => new URL(entry.url));
 
     const albumArtistURLs =
       unique([
         ...query.albumArtists.flatMap(artist => artist.urls),
         ...query.albumArtistGroups.flatMap(group => group.urls),
-      ]).map(url => new URL(url));
+      ]).map(entry => new URL(entry.url));
 
     const boundGetReleaseContext = urlString =>
       getReleaseContext(urlString, {
@@ -91,10 +92,10 @@ export default {
       });
 
     let releaseContexts =
-      query.urls.map(boundGetReleaseContext);
+      query.urls.map(({url}) => boundGetReleaseContext(url));
 
     const albumReleaseContexts =
-      query.album.urls.map(boundGetReleaseContext);
+      query.album.urls.map(({url}) => boundGetReleaseContext(url));
 
     const presentReleaseContexts =
       unique(releaseContexts.filter(Boolean));