chore: deduplicate permalinks; fix sitemap; organize

.eleventy.js

@@ -7,7 +7,7 @@ import markdownItFootnote from 'markdown-it-footnote'
 import htmlmin from 'html-minifier-terser'
 import filters from './config/filters/index.js'
 import { minifyJsComponents } from './config/events/index.js'
-import { allContent, popularPosts, searchIndex } from './config/collections/index.js'
+import { allContent, popularPosts, searchIndex, siteMap } from './config/collections/index.js'
 import { DateTime } from 'luxon'
 
 // load .env
@@ -56,6 +56,7 @@ export default async function (eleventyConfig) {
   eleventyConfig.addCollection('allContent', allContent)
   eleventyConfig.addCollection('popularPosts', popularPosts)
   eleventyConfig.addCollection('searchIndex', searchIndex)
+  eleventyConfig.addCollection('siteMap', siteMap)
 
   const md = markdownIt({ html: true, linkify: true })
   md.use(markdownItAnchor, {
@@ -111,8 +112,8 @@ export default async function (eleventyConfig) {
     passthroughFileCopy: true,
     dir: {
       input: 'src',
-      includes: '_includes',
+      includes: 'includes',
-      data: '_data',
+      data: 'data',
       output: '_site',
     },
   }

config/collections/index.js

@@ -128,3 +128,59 @@ export const popularPosts = (collection) => {
       return visitors(b) - visitors(a)
     })
 }
+
+export const siteMap = (collection) => {
+  const aggregateContent = []
+  const collectionData = collection.getAll()[0]
+  const { data } = collectionData
+  const { posts, pages, artists, genres, movies, tv, books } = data
+
+  const parseDate = (date) => {
+    if (!date) return null
+    let parsedDate = DateTime.fromISO(date)
+    if (!parsedDate.isValid) parsedDate = DateTime.fromFormat(date, 'yyyy-MM-dd')
+    if (!parsedDate.isValid) parsedDate = DateTime.fromFormat(date, 'MM/dd/yyyy')
+    if (!parsedDate.isValid) parsedDate = DateTime.fromFormat(date, 'dd-MM-yyyy')
+    return parsedDate.isValid ? parsedDate.toISO() : null
+  }
+
+  const addedUrls = new Set()
+
+  const addContent = (items, getTitle, getDate) => {
+    if (items) {
+      items.forEach(item => {
+        let url
+        if (item?.['url']) url = item['url']
+        if (item?.['permalink']) url = item['permalink']
+        if (item?.['slug']) url = item['slug']
+        if (!url || addedUrls.has(url)) return
+
+        const content = {
+          url,
+          title: getTitle(item),
+          date: getDate ? parseDate(getDate(item)) : null
+        }
+        aggregateContent.push(content)
+        addedUrls.add(url)
+      })
+    }
+  }
+
+  if (posts) addContent(posts, item => item.title, item => item.date)
+  if (pages) addContent(pages, item => item.title, item => item.date)
+  if (artists) addContent(artists, item => item.name, item => item.date)
+  if (genres) addContent(genres, item => item.name, item => item.date)
+  if (movies?.['movies']) addContent(movies['movies'], item => item.title, item => item.date)
+  if (books?.['all']) addContent(books['all'], item => item.title, item => item.date)
+  if (tv?.['shows']) addContent(tv['shows'], item => item.title, item => item.date)
+
+  collection.getAll().forEach(item => {
+    if (item.data.pages) addContent(item.data.pages, item => item.title, item => item.date)
+  })
+
+  return aggregateContent.sort((a, b) => {
+    const dateA = a.date ? DateTime.fromISO(a.date) : DateTime.fromMillis(0)
+    const dateB = b.date ? DateTime.fromISO(b.date) : DateTime.fromMillis(0)
+    return dateB - dateA
+  })
+}

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "coryd.dev",
-  "version": "20.8.5",
+  "version": "20.9.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "coryd.dev",
-      "version": "20.8.5",
+      "version": "20.9.0",
       "license": "MIT",
       "dependencies": {
         "@cdransf/api-text": "^1.4.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "20.8.5",
+  "version": "20.9.0",
   "description": "The source for my personal site. Built using 11ty (and other tools).",
   "type": "module",
   "scripts": {

src/data/artists.js

@@ -1,5 +1,5 @@
 import { createClient } from '@supabase/supabase-js'
-import { parseCountryField } from '../../config/utilities/index.js'
+import { sanitizeMediaString, parseCountryField } from '../../config/utilities/index.js'
 
 const SUPABASE_URL = process.env.SUPABASE_URL
 const SUPABASE_KEY = process.env.SUPABASE_KEY
@@ -72,6 +72,7 @@ export default async function () {
     artist['image'] = `/${artist['art']['filename_disk']}`
     artist['country'] = parseCountryField(artist['country'])
     artist['genres'] = genreMapping[artist['genres']] || ''
+    artist['url'] = `/music/artists/${sanitizeMediaString(artist['name_string'])}-${sanitizeMediaString(artist['country'])}`
   }
 
   return artists

src/data/genres.js

@@ -1,4 +1,5 @@
 import { createClient } from '@supabase/supabase-js'
+import slugify from 'slugify'
 import { parseCountryField } from '../../config/utilities/index.js'
 
 const SUPABASE_URL = process.env.SUPABASE_URL
@@ -34,6 +35,7 @@ const fetchGenresWithArtists = async () => {
       ...artist,
       country: parseCountryField(artist['country'])
     }))
+    genre['url'] = `/music/genres/${slugify(genre['name'].toLowerCase())}`
   })
 
   return data

src/data/tv.js

@@ -48,7 +48,8 @@ const prepareShowData = (show) => {
   return {
     ...show,
     image: show['art']?.['filename_disk'] ? `/${show['art']['filename_disk']}` : '',
-    backdrop: show['backdrop']?.['filename_disk'] ? `/${show['backdrop']['filename_disk']}` : ''
+    backdrop: show['backdrop']?.['filename_disk'] ? `/${show['backdrop']['filename_disk']}` : '',
+    url: `/watching/shows/${show['tmdb_id']}`,
   }
 }
 
@@ -121,24 +122,24 @@ export default async function () {
     sortedShows.forEach(show => {
       const startingEpisode = show['episodes'][show['episodes'].length - 1]['episode']
       const startingSeason = show['episodes'][show['episodes'].length - 1]['season']
-      const endingEpisode = show['episodes'][0].episode
+      const endingEpisode = show['episodes'][0]['episode']
-      const endingSeason = show['episodes'][0].season
+      const endingSeason = show['episodes'][0]['season']
 
       if (show['episodes'].length > 1) {
         episodeData.push({
-          name: show.title,
+          name: show['title'],
-          url: `/watching/shows/${show.tmdbId}`,
+          url: `/watching/shows/${show['tmdbId']}`,
           subtext: `S${startingSeason}E${startingEpisode} - S${endingSeason}E${endingEpisode}`,
           startingEpisode,
           startingSeason,
           episode: endingEpisode,
           season: endingSeason,
-          tmdbId: show.tmdbId,
+          tmdbId: show['tmdbId'],
-          collected: show.collected,
+          collected: show['collected'],
-          favorite: show.favorite,
+          favorite: show['favorite'],
           type: 'tv-range',
-          image: show.image,
+          image: show['image'],
-          backdrop: show.backdrop
+          backdrop: show['backdrop']
         })
       } else {
         const singleEpisode = show['episodes'][0]

src/meta/sitemap.liquid

@@ -4,14 +4,12 @@ eleventyExcludeFromCollections: true
 ---
 <?xml version="1.0" encoding="utf-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-  {% for page in collections.all %}
+  {% for page in collections.siteMap %}
-    {% if not page.data.draft %}
     <url>
       <loc>{{ globals.url }}{{ page.url }}</loc>
-        <lastmod>{{ page.date | isoDateOnly: '-' }}</lastmod>
+      <lastmod>{{ page.date | date: '%Y-%m-%d' }}</lastmod>
-        <changefreq>{%- if page.data.changeFreq -%}{{ page.data.changeFreq }}{%- else -%}monthly{%- endif -%}</changefreq>
+      <changefreq>{% if page.data.changeFreq %}{{ page.data.changeFreq }}{% else %}monthly{% endif %}</changefreq>
-        <priority>{%- if page.data.priority -%}{{ page.data.priority }}{%- else -%}0.5{%- endif %}</priority>
+      <priority>{% if page.data.priority %}{{ page.data.priority }}{% else %}0.5{% endif %}</priority>
     </url>
-    {% endif %}
   {% endfor %}
 </urlset>

src/pages/main/books/book.html

@@ -4,7 +4,7 @@ pagination:
   data: books.all
   size: 1
   alias: book
-permalink: "/books/{{ book.isbn }}/index.html"
+permalink: "{{ book.url }}/index.html"
 isbn: {{ book.isbn }}
 schema: book
 ---
@@ -50,6 +50,7 @@ schema: book
   </div>
   {% if book.review %}
     {% render "partials/blocks/banners/warning.liquid", text: "There are probably spoilers after this banner — this is a warning about them." %}
+    <h3>My thoughts</h3>
     {{ book.review | markdown }}
     <hr />
   {% endif %}

src/pages/main/music/artists/artist.html

@@ -4,7 +4,7 @@ pagination:
   data: artists
   size: 1
   alias: artist
-permalink: "/music/artists/{{ artist.name_string | sanitizeMediaString }}-{{ artist.country | sanitizeMediaString }}/index.html"
+permalink: "{{ artist.url }}/index.html"
 updated: "now"
 schema: artist
 ---

src/pages/main/music/genre.html

@@ -4,7 +4,7 @@ pagination:
   data: genres
   size: 1
   alias: genre
-permalink: "/music/genres/{{ genre.name | slugify | downcase }}/index.html"
+permalink: "{{ genre.url }}/index.html"
 updated: "now"
 schema: genre
 ---

src/pages/main/watching/movie.html

@@ -4,7 +4,7 @@ pagination:
   data: movies.movies
   size: 1
   alias: movie
-permalink: /watching/movies/{{ movie.id }}/index.html
+permalink: "{{ movie.url }}/index.html"
 schema: movie
 ---
 {%- capture alt -%}
@@ -39,6 +39,7 @@ schema: movie
   </div>
   {% if movie.review %}
     {% render "partials/blocks/banners/warning.liquid", text: "There are probably spoilers after this banner — this is a warning about them." %}
+    <h3>My thoughts</h3>
     {{ movie.review | markdown }}
     <hr />
   {% endif %}

src/pages/main/watching/show.html

@@ -4,7 +4,7 @@ pagination:
   data: tv.shows
   size: 1
   alias: show
-permalink: /watching/shows/{{ show.tmdb_id }}/index.html
+permalink: "{{ show.url }}/index.html"
 schema: show
 ---
 {%- capture alt -%}
@@ -38,6 +38,8 @@ schema: show
     <p class="sub-meta"><a href="https://themoviedb.org/tv/{{ show.tmdb_id }}" title="View {{ show.title | escape }} on TMDB">View on TMDB</a></p>
   </div>
   {% if show.review %}
+    {% render "partials/blocks/banners/warning.liquid", text: "There are probably spoilers after this banner — this is a warning about them." %}
+    <h3>My thoughts</h3>
     {{ show.review | markdown }}
     <hr />
   {% endif %}