diff --git a/.eleventy.js b/.eleventy.js index 537967d..0628373 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -42,6 +42,14 @@ module.exports = function(eleventyConfig) { return value; }); + eleventyConfig.addFilter("episodeNumber", function (s, episode) { + return episode ? Number(episode) : Number(s.replace(/[^0-9]/,'')) + }); + eleventyConfig.addFilter("episodesInSeason", function (season) { + return this.eleventy.collection.episode.filter(ep=>ep.season == season) + return episode ? Number(episode) : Number(s.replace(/[^0-9]/,'')) + }); + // Shortcodes eleventyConfig.addPairedShortcode( "prologue", @@ -109,6 +117,7 @@ module.exports = function(eleventyConfig) { }); return { + pathPrefix:"blog", dir: { data: "data", input: "content", diff --git a/content/campaigns/crew-of-the-kahuna.md b/content/campaigns/crew-of-the-kahuna.md index cccb6bd..a065b27 100644 --- a/content/campaigns/crew-of-the-kahuna.md +++ b/content/campaigns/crew-of-the-kahuna.md @@ -7,6 +7,7 @@ system: seasons: - 1 - 4 +date: 2021-04-26 --- It is a dark time for the galaxy. Striking from their hidden base, the Rebel Alliance has destroyed the evil GALACTIC EMPIRE's powerful Death Star. Now, Imperial forces strike back, throwing the galaxy into war. diff --git a/content/campaigns/junkfort-boys.md b/content/campaigns/junkfort-boys.md index a5ab21b..17adf90 100644 --- a/content/campaigns/junkfort-boys.md +++ b/content/campaigns/junkfort-boys.md @@ -7,6 +7,7 @@ system: seasons: - 3 - 5 +date: 2023-04-05 --- In the electrified, shadowy streets of Doskvol, the Junk Fort Boys—a distinctive crew of eccentrics—tackle a series of misadventures. diff --git a/content/campaigns/rick-and-morty.md b/content/campaigns/rick-and-morty.md index 4d46316..4115705 100644 --- a/content/campaigns/rick-and-morty.md +++ b/content/campaigns/rick-and-morty.md @@ -6,5 +6,6 @@ system: name: Dungeons and Dragons seasons: - 2 +date: 2022-08-05 --- When Morty sees a cute girl at school playing Dungeons & Dragons, he asks Rick to show him the ropes, only to discover that his grandfather is a veteran gamer. Next thing he knows, the entire family has been pulled into a campaign that escalates from virtual D&D simulations to alternate universes governed by the rules of the game. And as it turns out, Rick isn't the only one who knows his way around a d20. \ No newline at end of file diff --git a/content/episodes/episodes.11tydata.js b/content/episodes/episodes.11tydata.js new file mode 100644 index 0000000..b4ec84d --- /dev/null +++ b/content/episodes/episodes.11tydata.js @@ -0,0 +1,11 @@ +module.exports = { + "layout": "episode", + "tags":['episode'], + "eleventyComputed": { + "episode": "{{page.fileSlug | episodeNumber: episode}}", + "podcast": (data) => ({ + "url": data.podcast.url ||`${data.site.cdn}/s0${data.season}e${data.episode}.mp3`, + "title": data.podcast.title || `S0${data.season}E${data.episode}: ${data.title}` + }) + } +} \ No newline at end of file diff --git a/content/episodes/episodes.json b/content/episodes/episodes.json deleted file mode 100644 index 694805c..0000000 --- a/content/episodes/episodes.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "layout": "episode", - "tags":"episode", - "podcast": true -} \ No newline at end of file diff --git a/content/episodes/s01/e46.md b/content/episodes/s01/e46.md index 90cc73b..36ea20d 100644 --- a/content/episodes/s01/e46.md +++ b/content/episodes/s01/e46.md @@ -1,6 +1,5 @@ --- title: "46:" -episode: 46 date: 2022-07-08 --- diff --git a/content/episodes/s01/s01.11tydata.js b/content/episodes/s01/s01.11tydata.js new file mode 100644 index 0000000..e2244dd --- /dev/null +++ b/content/episodes/s01/s01.11tydata.js @@ -0,0 +1,13 @@ + +module.exports = { + "season": 1, + "tags": [ + "crew-of-the-kahuna", "season:1" + ], + "stylesheets": ["/css/s04.css"], + "eleventyComputed": { + "podcast": (data)=>({ + "title": `E${data.episode}: ${data.title}` + }) + } +} \ No newline at end of file diff --git a/content/episodes/s01/s01.json b/content/episodes/s01/s01.json deleted file mode 100644 index 8728acf..0000000 --- a/content/episodes/s01/s01.json +++ /dev/null @@ -1,8 +0,0 @@ - -{ - "season": 1, - "tags": [ - "crew-of-the-kahuna" - ], - "stylesheets": ["/css/s04.css"] -} \ No newline at end of file diff --git a/content/episodes/s01/s01.md b/content/episodes/s01/s01.md index 32a18e5..1f03766 100644 --- a/content/episodes/s01/s01.md +++ b/content/episodes/s01/s01.md @@ -1,7 +1,15 @@ --- layout: podcast-season season: 1 +date: 2021-04-26 override:tags: ["season"] +eleventyExcludeFromCollections: ["episode"] +pagination: + size: 10 + alias: "episodes" + data: "collections.season:1" + generatePageOnEmptyData: true + reverse: true --- Escape from Mos Shuuta, Long Arm of the Hutt \ No newline at end of file diff --git a/content/episodes/s02/s02.json b/content/episodes/s02/s02.json index 98dc5cd..1466a53 100644 --- a/content/episodes/s02/s02.json +++ b/content/episodes/s02/s02.json @@ -1,6 +1,6 @@ { "season": 2, "tags": [ - "rick-and-morty" + "rick-and-morty", "season:2" ] } \ No newline at end of file diff --git a/content/episodes/s02/s02.md b/content/episodes/s02/s02.md index 658f814..3d93793 100644 --- a/content/episodes/s02/s02.md +++ b/content/episodes/s02/s02.md @@ -1,5 +1,13 @@ --- layout: podcast-season season: 2 +date: 2022-08-05 override:tags: ["season"] +eleventyExcludeFromCollections: ["episode"] +pagination: + size: 10 + alias: "episodes" + data: "collections.season:2" + generatePageOnEmptyData: true + reverse: true --- \ No newline at end of file diff --git a/content/episodes/s03/s03.json b/content/episodes/s03/s03.json index 58c7f74..014e90b 100644 --- a/content/episodes/s03/s03.json +++ b/content/episodes/s03/s03.json @@ -1,6 +1,6 @@ { "season": 3, "tags": [ - "junkfort-boys" + "junkfort-boys", "season:3" ] } \ No newline at end of file diff --git a/content/episodes/s03/s03.md b/content/episodes/s03/s03.md index 2a748b7..a157257 100644 --- a/content/episodes/s03/s03.md +++ b/content/episodes/s03/s03.md @@ -1,5 +1,13 @@ --- layout: podcast-season season: 3 +date: 2023-04-05 override:tags: ["season"] +eleventyExcludeFromCollections: ["episode"] +pagination: + size: 10 + alias: "episodes" + data: "collections.season:3" + generatePageOnEmptyData: true + reverse: true --- \ No newline at end of file diff --git a/content/episodes/s04/s04.json b/content/episodes/s04/s04.json index 792c5b3..7f1f590 100644 --- a/content/episodes/s04/s04.json +++ b/content/episodes/s04/s04.json @@ -1,7 +1,7 @@ { "season": 4, "tags": [ - "crew-of-the-kahuna" + "crew-of-the-kahuna", "season:4" ], "stylesheets": ["/css/s04.css"] } \ No newline at end of file diff --git a/content/episodes/s04/s04.md b/content/episodes/s04/s04.md index b78d681..ac32ece 100644 --- a/content/episodes/s04/s04.md +++ b/content/episodes/s04/s04.md @@ -1,5 +1,12 @@ --- layout: podcast-season -season: 4 +date: 2024-01-03 override:tags: ["season"] +eleventyExcludeFromCollections: ["episode"] +pagination: + size: 10 + alias: "episodes" + data: "collections.season:4" + generatePageOnEmptyData: true + reverse: true --- \ No newline at end of file diff --git a/content/episodes/s05/e21.md b/content/episodes/s05/e21.md index 5e7d5fe..9a2426b 100644 --- a/content/episodes/s05/e21.md +++ b/content/episodes/s05/e21.md @@ -7,7 +7,7 @@ date: 2024-07-17
Olden Times - ========================== + ======================== World's Oldest Newspaper # Wanted! Gang Terrorizes City diff --git a/content/episodes/s05/e25.md b/content/episodes/s05/e25.md index 0b3b238..7572977 100644 --- a/content/episodes/s05/e25.md +++ b/content/episodes/s05/e25.md @@ -4,4 +4,16 @@ episode: 25 date: 2024-09-11 --- -

Bon Voyage Bulletin

No, I will not call you Gutenburg

2024-09-11

A Day At Sea Unravels More Mysteries

Who is "Maggie?"

The crew spent the next day arguing about what to do for their next move. Eventually, it was agreed that they would prepare to travel to Tycheros, despite their misgivings about (both) captains.

Squish caught a large angler fish, and Fitzclyde declared they would eat in his cabin tonight. "Plodable" expert Djuckels painted the cannon with some sick flames, which did not increase it's effectivness, but did increase it's coolness. Patches, per usual, spent time cooped up in the bathroom, talking to Neelix, whio suggested that Patches might get further if he connected with his crew mates, and tried to be a bit more honest with them.

But Patches isn't the only person hiding something. Djuckles met a mysterious girl named Maggie, who claims to work on the ship. She quicly disapeared somewhere on the ship, and Fitzelyde claims to know nothing about her. He tried telling the crew a story about a harp, but, as usual, they weren't listening, and instead insulted his poor ukelele playing. He regrests inviting them for dinner.

But all that will have to wait. Because a migrating school of leviathans stands between the crew and their next stop, and who knows what lies beyond?

\ No newline at end of file +

Bon Voyage Bulletin

+

No, I will not call you Gutenburg

+

2024-09-11

+ +

A Day At Sea Unravels More Mysteries

+ +
+

Who is "Maggie?"

+
+
+

The crew spent the next day arguing about what to do for their next move. Eventually, it was agreed that they would prepare to travel to Tycheros, despite their misgivings about (both) captains.

+

Squish caught a large angler fish, and Fitzclyde declared they would eat in his cabin tonight. "Plodable" expert Djuckels painted the cannon with some sick flames, which did not increase it's effectivness, but did increase it's coolness. Patches, per usual, spent time cooped up in the bathroom, talking to Neelix, whio suggested that Patches might get further if he connected with his crew mates, and tried to be a bit more honest with them.

But Patches isn't the only person hiding something. Djuckles met a mysterious girl named Maggie, who claims to work on the ship. She quicly disapeared somewhere on the ship, and Fitzelyde claims to know nothing about her. He tried telling the crew a story about a harp, but, as usual, they weren't listening, and instead insulted his poor ukelele playing. He regrests inviting them for dinner.

+

But all that will have to wait. Because a migrating school of leviathans stands between the crew and their next stop, and who knows what lies beyond?

\ No newline at end of file diff --git a/content/episodes/s05/e26.md b/content/episodes/s05/e26.md index 3f3a34a..535c7b6 100644 --- a/content/episodes/s05/e26.md +++ b/content/episodes/s05/e26.md @@ -6,7 +6,8 @@ date: 2024-09-11
-# Paradise Periodical +Paradise Periodical +===================== How do you know what's happening? We're trapped on the ship! # Strange Times on Stranger Shores diff --git a/content/episodes/s05/e27.md b/content/episodes/s05/e27.md index 2d877f0..efb58df 100644 --- a/content/episodes/s05/e27.md +++ b/content/episodes/s05/e27.md @@ -9,7 +9,8 @@ podcast: true
- # Deep Water Digest + Deep Water Digest + ==================================== How do you know what they wished for? # Day Saved – Baths Had By All diff --git a/content/episodes/s05/e30.md b/content/episodes/s05/e30.md index b275194..5222dbe 100644 --- a/content/episodes/s05/e30.md +++ b/content/episodes/s05/e30.md @@ -1,12 +1,12 @@ --- title: date: 2024-11-18 -episode: 30 ---
-# Dark Water Weekly +Dark Water Weekly +========================== No, no, don't come in here! # Fire In Your House And In Your Heart @@ -23,16 +23,16 @@ As they made a hasty retreat, Lady High Hill warned Djuckels about the true natu
- * _"I Thought It Was a Fish"_ \- Tiger (GM) - * _"I Got Hammocked This Morning"_ \- Tiger (GM) - * _"The Mutiny Habits"_ \- Bridget - * _"Im Just Moody"_ \- Andy - * _"Trying to Cheer up Djuckles"_ \- Tiger (GM) - * _"He's Never Liked Any of You"_ \- Tiger (GM) - * _"Baked Alaska"_ \- Tiger (GM) - * _"Squishlicious over There"_ \- Tiger (GM) - * _"What Even Is a Shallot"_ \- Tiger (GM) - * _"That Was a Very Touching Moment in My Head"_ \- Tiger (GM) - * _"Glittering From the Land"_ \- Tiger (GM) +* _"I Thought It Was a Fish"_ \- Tiger (GM) +* _"I Got Hammocked This Morning"_ \- Tiger (GM) +* _"The Mutiny Habits"_ \- Bridget +* _"Im Just Moody"_ \- Andy +* _"Trying to Cheer up Djuckles"_ \- Tiger (GM) +* _"He's Never Liked Any of You"_ \- Tiger (GM) +* _"Baked Alaska"_ \- Tiger (GM) +* _"Squishlicious over There"_ \- Tiger (GM) +* _"What Even Is a Shallot"_ \- Tiger (GM) +* _"That Was a Very Touching Moment in My Head"_ \- Tiger (GM) +* _"Glittering From the Land"_ \- Tiger (GM)
\ No newline at end of file diff --git a/content/episodes/s05/s05.json b/content/episodes/s05/s05.json index 34ae85f..c32d055 100644 --- a/content/episodes/s05/s05.json +++ b/content/episodes/s05/s05.json @@ -1,7 +1,7 @@ { "season": 5, "tags": [ - "junkfort-boyz" + "junkfort-boyz", "season:5" ], "stylesheets": ["/css/s05.css"] } \ No newline at end of file diff --git a/content/episodes/s05/s05.md b/content/episodes/s05/s05.md index 3020a25..f400a9e 100644 --- a/content/episodes/s05/s05.md +++ b/content/episodes/s05/s05.md @@ -1,5 +1,13 @@ --- layout: podcast-season season: 5 +date: 2024-07-17 override:tags: ["season"] +eleventyExcludeFromCollections: ["episode"] +pagination: + size: 10 + alias: "episodes" + data: "collections.season:5" + generatePageOnEmptyData: true + reverse: true --- \ No newline at end of file diff --git a/content/episodes/seasons.hbs b/content/episodes/seasons.hbs index 243f92b..28112b7 100644 --- a/content/episodes/seasons.hbs +++ b/content/episodes/seasons.hbs @@ -3,6 +3,7 @@ title: Seasons layout: "base-with-heading" permalink: "/seasons/" override:tags: [] +override:eleventyComputed: [] ---
    diff --git a/layouts/base.hbs b/layouts/base.hbs index 6be6a5f..8019c18 100644 --- a/layouts/base.hbs +++ b/layouts/base.hbs @@ -1,14 +1,12 @@ + {{#if title }}{{ title }}{{else}}{{ site.title }}{{/if}} - {{ site.name }} {{#each stylesheets}} {{/each}} -
{{#if links.podcastRss}} - RSS + RSS {{/if}}
@@ -25,9 +25,9 @@ {{#each (latest_episodes collections.episode)}}
- +
-
{{{data.title}}}
+
{{#if data.title}}{{{data.title}}}{{else}}Episode {{data.episode}}{{/if}}
Season {{{data.season}}}
{{{date this.date "ddd, MMM D, YYYY, LT"}}}
diff --git a/layouts/podcast-season.hbs b/layouts/podcast-season.hbs index 52b244d..2b9f204 100644 --- a/layouts/podcast-season.hbs +++ b/layouts/podcast-season.hbs @@ -4,15 +4,26 @@ layout: base

Season {{season}}

{{{content}}} \ No newline at end of file + +
+ +
\ No newline at end of file diff --git a/layouts/podcast.11ty.js b/layouts/podcast.11ty.js index 7fee170..4b3008c 100644 --- a/layouts/podcast.11ty.js +++ b/layouts/podcast.11ty.js @@ -48,7 +48,7 @@ class PodcastFeed { itunesImage: data.itunes?.image || data.site.imageUrl || `${data.site.url}${data.page.filePathStem}.jpg` }); - const episodes = data.collections.episode.filter(episode=>episode.data.podcast==true) + const episodes = data.collections.episode.filter(episode=>episode.data.podcast!=false) const items = data.tags ? episodes.filter(episode=>data.tags.every(tag=>episode.data.tags.includes(tag))) : episodes items.forEach(episode=>{ @@ -59,13 +59,13 @@ class PodcastFeed { // const duration = getMp3Duration(`../episodes/s${zero_pad_season}/s${zero_pad_season}e${episode_data.episode}.mp3`) /* loop over data and add to feed */ feed.addItem({ - title: `S${zero_pad_season}E${episode_data.episode}: ${episode_data.title}`, + title: `${episode_data.podcast.title}`, description: episode.content, url: episode.url, // link to the item guid: episode.url, // optional - defaults to url date: episode_data.date, // any format that js Date can parse. // enclosure : {url:`${data.site.url}/episodes/s${zero_pad_season}/s${zero_pad_season}e${episode_data.episode}.mp3`}, // optional enclosure - enclosure : {url:`${PODCAST_CDN_ROOT}/s${zero_pad_season}e${episode_data.episode}.mp3`}, // optional enclosure + enclosure : {url:`${episode_data.podcast.url}`}, // optional enclosure // itunesDuration: duration, }); })