chore: more consistent slugging

config/collections/index.js

@@ -1,5 +1,7 @@
 import { DateTime } from 'luxon'
 
+const BASE_URL = 'https://coryd.dev'
+
 export const searchIndex = (collection) => {
   const searchIndex = []
   let id = 0
@@ -22,7 +24,7 @@ export const searchIndex = (collection) => {
     }
   }
 
-  addItemToIndex(posts, '📝', item => item['url'], item => item['title'], item => item['tags'])
+  addItemToIndex(posts, '📝', item => new URL(item['slug'], BASE_URL).toString(), item => item['title'], item => item['tags'])
   addItemToIndex(links, '🔗', item => item['link'], item => item['title'], item => item['tags'])
   if (movieData) addItemToIndex(movieData, '🎥', item => item['url'], item => `${item['title']} (${item['rating']})`, item => item['tags'])
   if (bookData) addItemToIndex(bookData, '📖', item => item['url'], item => `${item['title']} (${item['rating']})`, item => item['tags'])
@@ -52,10 +54,11 @@ export const allContent = (collection) => {
     if (items) {
       items.forEach(item => {
         const content = {
-          url: `https://coryd.dev${item['url']}`,
+          url: `${BASE_URL}${item['url']}`,
           title: `${icon}: ${getTitle(item)}${item?.['authors']?.['name'] ? ' via ' + item['authors']['name'] : ''}`
         }
         if (item?.['link']) content['url'] = item?.['link']
+        if (item?.['slug']) content['url'] = new URL(item['slug'], BASE_URL).toString()
         if (item?.['description']) content['description'] = `${item['description']}<br/><br/>`
         const date = getDate ? parseDate(getDate(item)) : null
         if (date) content['date'] = date

config/filters/index.js

@@ -121,6 +121,7 @@ export default {
       // set the entry url
       if (entry.url?.includes('http')) url = entry.url
       if (!entry.url?.includes('http')) url = new URL(entry.url, BASE_URL).toString()
+      if (entry?.slug)  url = new URL(entry.slug, BASE_URL).toString()
       if (entry?.link) {
         title = `${entry.title} via ${entry.authors.name}`
         url = entry.link
@@ -131,7 +132,7 @@ export default {
       if (entry.type === 'book' || entry.type === 'movie' || entry.type === 'link') excerpt = `${entry.description}<br/><br/>` // books
 
       // send full post content to rss
-      if (entry?.url?.includes('/posts/') && entry.content) excerpt = sanitizeHtml(`${md.render(entry.content)}${feedNote}`, {
+      if (entry?.slug && entry.content) excerpt = sanitizeHtml(`${md.render(entry.content)}${feedNote}`, {
           disallowedTagsMode: 'completelyDiscard'
         })
 

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "coryd.dev",
-  "version": "18.6.9",
+  "version": "18.7.9",
   "description": "The source for my personal site. Built using 11ty.",
   "type": "module",
   "scripts": {

src/_data/posts.js

@@ -1,6 +1,4 @@
 import { createClient } from '@supabase/supabase-js'
-import { DateTime } from 'luxon'
-import slugify from 'slugify'
 
 const SUPABASE_URL = process.env.SUPABASE_URL
 const SUPABASE_KEY = process.env.SUPABASE_KEY
@@ -81,11 +79,6 @@ const fetchAllPosts = async () => {
     for (const post of data) {
       post.tags = await fetchTagsForPost(post.id)
       post.blocks = await fetchBlocksForPost(post.id)
-      post.url = `/posts/${DateTime.fromISO(post.date).year}/${slugify(post.title, {
-        replacement: '-',
-        remove: /[#,&,+()$~%.'":*?<>{}\[\]\/\\|`!@\^\—]/g,
-        lower: true,
-      })}/`
     }
 
     posts = posts.concat(data)

src/_includes/partials/home/posts.liquid

@@ -14,7 +14,7 @@
         {{ post.date | date: "%B %e, %Y" }}
       </time>
     </div>
-    <a href="{{ post.url }}">
+    <a href="{{ post.slug }}">
       <h2 class="flex-centered">{{ post.title }}</h2>
     </a>
     <span class="p-author h-card hidden">{{ meta.siteName }}</span>

src/_includes/partials/widgets/popular-posts.liquid

@@ -7,7 +7,7 @@
 <ul class="link-list">
   {% for post in postData limit: 5 %}
     <li>
-      <a class="no-underline" href="{{ post.url }}" title="{{ post.title | escape}}">
+      <a class="no-underline" href="{{ post.slug }}" title="{{ post.title | escape}}">
         {{ post.title }}
       </a>
     </li>

src/pages/main/posts/index.html

@@ -16,7 +16,7 @@ permalink: "/posts/{% if pagination.pageNumber > 0 %}{{ pagination.pageNumber }}
         {{ post.date | date: "%B %e, %Y" }}
       </time>
     </div>
-    <a href="{{ post.url }}">
+    <a href="{{ post.slug }}">
       <h2 class="flex-centered">{{ post.title }}</h2>
     </a>
     <span class="p-author h-card hidden">{{ meta.siteName }}</span>

src/pages/main/posts/post.html

@@ -4,10 +4,10 @@ pagination:
   data: posts
   size: 1
   alias: post
-permalink: "/posts/{{ post.date | date: '%Y' }}/{{ post.title | slugifyPost }}/index.html"
+permalink: "{{ post.slug }}/index.html"
 schema: blog
 ---
-{%- capture postUrl %}{{ meta.url }}{{ post.url }}{% endcapture -%}
+{%- capture postUrl %}{{ meta.url }}{{ post.slug }}{% endcapture -%}
 <article class="h-entry">
   <div class="flex-centered gap-xs icon-small icon-light">
     {% tablericon "calendar-month" "Date" %}