From 740191e05036af89d8aa71a669c81b2121f5babe Mon Sep 17 00:00:00 2001
From: Carter McBride <18412686+carterworks@users.noreply.github.com>
Date: Thu, 4 Jul 2024 14:56:32 -0600
Subject: [PATCH] Add Yazzy integration (#12)

* Remove eslint completely

* Make the 'last updated' time relative

* Restore accidentally commited feeds

* Add yazzy link to each article
---
 biome.json           | 12 +++++++
 config/template.html |  7 +++-
 eslint.config.js     |  9 -----
 package.json         | 86 ++++++++++++++++++++++----------------------
 public/style.css     |  3 +-
 src/index.ts         | 75 +++++++++++++++++++-------------------
 src/renderer.ts      |  7 +++-
 tsconfig.json        | 51 ++++++++++++--------------
 8 files changed, 128 insertions(+), 122 deletions(-)
 create mode 100644 biome.json
 delete mode 100644 eslint.config.js

diff --git a/biome.json b/biome.json
new file mode 100644
index 0000000..90c25b6
--- /dev/null
+++ b/biome.json
@@ -0,0 +1,12 @@
+{
+	"$schema": "https://biomejs.dev/schemas/1.8.1/schema.json",
+	"organizeImports": {
+		"enabled": true
+	},
+	"linter": {
+		"enabled": true,
+		"rules": {
+			"recommended": true
+		}
+	}
+}
diff --git a/config/template.html b/config/template.html
index 67930a1..29d6f9e 100644
--- a/config/template.html
+++ b/config/template.html
@@ -122,6 +122,11 @@
             <div class="article-timestamp">
               <relative-time data-time="{{item.timestamp}}">{{ item.timestamp | relative}}</relative-time>
             </div>
+            {% if yazzyUrl %}
+            <div class="article-links">
+              <a href="{{ yazzyUrl }}/{{ item.link }}" target="_blank" rel="noreferrer noopener">yazzy</a>
+            </div>
+            {% endif %}
           </li>
           {% endfor %}
         </ul>
@@ -141,7 +146,7 @@
   {% endif %}
   <footer>
     <hr>
-    <p>Last updated {{ now }}.</p>
+    <p>Last updated <relative-time data-time="{{ now }}">{{ now | relative}}</relative-time>.</p>
     <p>
       <a href="https://github.com/carterworks/rss-reader">View on GitHub</a>
     </p>
diff --git a/eslint.config.js b/eslint.config.js
deleted file mode 100644
index 48120ba..0000000
--- a/eslint.config.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import pluginJs from "@eslint/js";
-import globals from "globals";
-import tseslint from "typescript-eslint";
-
-export default [
-	{ languageOptions: { globals: { ...globals.browser, ...globals.node } } },
-	pluginJs.configs.recommended,
-	...tseslint.configs.recommended,
-];
diff --git a/package.json b/package.json
index 824b921..0c22d1c 100644
--- a/package.json
+++ b/package.json
@@ -1,46 +1,44 @@
 {
-  "name": "bubo-reader",
-  "version": "2.0.2",
-  "description": "A simple but effective feed reader (RSS, JSON)",
-  "homepage": "https://github.com/georgemandis/bubo-rss",
-  "main": "src/index.ts",
-  "type": "module",
-  "scripts": {
-    "clean": "rm -rf dist",
-    "build": "bun src/index.ts",
-    "check": "biome check --write ./{src,config,public} ./eslint.config.js"
-  },
-  "author": {
-    "name": "George Mandis",
-    "email": "george@mand.is",
-    "url": "https://george.mand.is"
-  },
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/georgemandis"
-  },
-  "bugs": {
-    "url": "https://github.com/georgemandis/bubo-rss/issues",
-    "email": "george+bubo@mand.is"
-  },
-  "license": "MIT",
-  "dependencies": {
-    "@feelinglovelynow/get-relative-time": "^1.1.2",
-    "chalk": "^5.2.0",
-    "node-fetch": "^3.3.1",
-    "nunjucks": "^3.2.4",
-    "rss-parser": "^3.13.0"
-  },
-  "devDependencies": {
-    "@biomejs/biome": "^1.8.1",
-    "@types/bun": "latest",
-    "@types/nunjucks": "^3.2.2",
-    "@types/xml2js": "^0.4.11",
-    "tslib": "^2.5.3",
-    "typescript": "^5.1.3",
-    "typescript-eslint": "^7.13.1"
-  },
-  "trustedDependencies": [
-    "@biomejs/biome"
-  ]
+	"name": "bubo-reader",
+	"version": "2.0.2",
+	"description": "A simple but effective feed reader (RSS, JSON)",
+	"homepage": "https://github.com/georgemandis/bubo-rss",
+	"main": "src/index.ts",
+	"type": "module",
+	"scripts": {
+		"clean": "rm -rf dist",
+		"build": "bun src/index.ts",
+		"check": "biome check --write ./{src,config,public} ./*.json --no-errors-on-unmatched"
+	},
+	"author": {
+		"name": "George Mandis",
+		"email": "george@mand.is",
+		"url": "https://george.mand.is"
+	},
+	"funding": {
+		"type": "github",
+		"url": "https://github.com/sponsors/georgemandis"
+	},
+	"bugs": {
+		"url": "https://github.com/georgemandis/bubo-rss/issues",
+		"email": "george+bubo@mand.is"
+	},
+	"license": "MIT",
+	"dependencies": {
+		"@feelinglovelynow/get-relative-time": "^1.1.2",
+		"chalk": "^5.2.0",
+		"node-fetch": "^3.3.1",
+		"nunjucks": "^3.2.4",
+		"rss-parser": "^3.13.0"
+	},
+	"devDependencies": {
+		"@biomejs/biome": "^1.8.1",
+		"@types/bun": "latest",
+		"@types/nunjucks": "^3.2.2",
+		"@types/xml2js": "^0.4.11",
+		"tslib": "^2.5.3",
+		"typescript": "^5.1.3",
+		"typescript-eslint": "^7.13.1"
+	},
+	"trustedDependencies": ["@biomejs/biome"]
 }
diff --git a/public/style.css b/public/style.css
index 5092d7c..e4d8707 100644
--- a/public/style.css
+++ b/public/style.css
@@ -69,7 +69,8 @@ details:has(li.has-recent) {
 }
 
 .article-timestamp,
-.feed-url {
+.feed-url,
+.article-links {
   font-size: 0.75em;
 }
 
diff --git a/src/index.ts b/src/index.ts
index 7d8a414..7b454f9 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -88,6 +88,7 @@ const finishBuild: () => void = async () => {
 		data: sortedFeeds,
 		errors: errors,
 		info: buboInfo,
+		yazzyUrl: process.env.YAZZY_URL,
 	});
 
 	// write the output to public/index.html
@@ -116,48 +117,48 @@ const processFeed =
 		feed: string;
 		startTime: number;
 	}) =>
-		async (response: Response): Promise<void> => {
-			const body = await parseFeed(response);
-			//skip to the next one if this didn't work out
-			if (!body) return;
+	async (response: Response): Promise<void> => {
+		const body = await parseFeed(response);
+		//skip to the next one if this didn't work out
+		if (!body) return;
 
-			try {
-				const contents: FeedItem = (
-					typeof body === "string" ? await parser.parseString(body) : body
-				) as FeedItem;
+		try {
+			const contents: FeedItem = (
+				typeof body === "string" ? await parser.parseString(body) : body
+			) as FeedItem;
 
-				contents.feed = feed;
-				contents.title = getTitle(contents);
-				contents.link = getLink(contents);
+			contents.feed = feed;
+			contents.title = getTitle(contents);
+			contents.link = getLink(contents);
 
-				// try to normalize date attribute naming
-				for (const item of contents.items) {
-					item.timestamp = getTimestamp(item);
-					item.title = getTitle(item);
-					item.link = getLink(item);
-					const timestamp = new Date(Number.parseInt(item.timestamp));
-					const eightHoursAgo = new Date();
-					eightHoursAgo.setHours(eightHoursAgo.getHours() - 8);
-					item.isRecent = timestamp > eightHoursAgo;
-				}
-
-				contents.hasRecent = contents.items.some((item) => item.isRecent);
-
-				contentFromAllFeeds[group].push(contents as object);
-				process.stdout.write(
-					`${success("Successfully fetched:")} ${feed} - ${benchmark(startTime)}\n`,
-				);
-			} catch (err) {
-				process.stdout.write(
-					`${error("Error processing:")} ${feed} - ${benchmark(
-						startTime,
-					)}\n${err}\n`,
-				);
-				errors.push(`Error processing: ${feed}\n\t${err}`);
+			// try to normalize date attribute naming
+			for (const item of contents.items) {
+				item.timestamp = getTimestamp(item);
+				item.title = getTitle(item);
+				item.link = getLink(item);
+				const timestamp = new Date(Number.parseInt(item.timestamp));
+				const eightHoursAgo = new Date();
+				eightHoursAgo.setHours(eightHoursAgo.getHours() - 8);
+				item.isRecent = timestamp > eightHoursAgo;
 			}
 
-			finishBuild();
-		};
+			contents.hasRecent = contents.items.some((item) => item.isRecent);
+
+			contentFromAllFeeds[group].push(contents as object);
+			process.stdout.write(
+				`${success("Successfully fetched:")} ${feed} - ${benchmark(startTime)}\n`,
+			);
+		} catch (err) {
+			process.stdout.write(
+				`${error("Error processing:")} ${feed} - ${benchmark(
+					startTime,
+				)}\n${err}\n`,
+			);
+			errors.push(`Error processing: ${feed}\n\t${err}`);
+		}
+
+		finishBuild();
+	};
 
 // go through each group of feeds and process
 const processFeeds = () => {
diff --git a/src/renderer.ts b/src/renderer.ts
index 6ac0eeb..46dcf02 100644
--- a/src/renderer.ts
+++ b/src/renderer.ts
@@ -10,6 +10,8 @@ import { readFile } from "node:fs/promises";
 import { getRelativeTime } from "@feelinglovelynow/get-relative-time";
 import type { Feeds, JSONValue } from "./@types/bubo";
 
+const yazzyUrl = process.env.YAZZY_URL;
+
 /**
  * Global filters for my Nunjucks templates
  */
@@ -23,7 +25,7 @@ env.addFilter("formatTime", (dateString): string => {
 	return !Number.isNaN(date.getTime()) ? date.toLocaleTimeString() : dateString;
 });
 
-env.addGlobal("now", new Date().toUTCString());
+env.addGlobal("now", new Date().getTime());
 
 // load the template
 const template: string = (
@@ -35,15 +37,18 @@ const render = ({
 	data,
 	errors,
 	info,
+	yazzyUrl,
 }: {
 	data: Feeds;
 	errors: unknown[];
 	info?: JSONValue;
+	yazzyUrl?: string;
 }) => {
 	return env.renderString(template, {
 		data,
 		errors,
 		info,
+		yazzyUrl,
 	});
 };
 
diff --git a/tsconfig.json b/tsconfig.json
index f9f5190..565a04d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,30 +1,23 @@
 {
-  "compilerOptions": {
-    "module": "esnext",
-    "forceConsistentCasingInFileNames": true,
-    "removeComments": true,
-    "strict": true,
-    "importHelpers": true,
-    "esModuleInterop": true,
-    "allowSyntheticDefaultImports": true,
-    "target": "ES2021",
-    "noImplicitAny": true,
-    "moduleResolution": "node",
-    "sourceMap": false,
-    "resolveJsonModule": true,
-    "outDir": "dist",
-    "baseUrl": ".",
-    "typeRoots": [
-      "src/@types"
-    ],
-    "paths": {
-      "*": [
-        "node_modules/*",
-        "src/@types"
-      ]
-    }
-  },
-  "include": [
-    "src/**/*"
-  ]
-}
\ No newline at end of file
+	"compilerOptions": {
+		"module": "esnext",
+		"forceConsistentCasingInFileNames": true,
+		"removeComments": true,
+		"strict": true,
+		"importHelpers": true,
+		"esModuleInterop": true,
+		"allowSyntheticDefaultImports": true,
+		"target": "ES2021",
+		"noImplicitAny": true,
+		"moduleResolution": "node",
+		"sourceMap": false,
+		"resolveJsonModule": true,
+		"outDir": "dist",
+		"baseUrl": ".",
+		"typeRoots": ["src/@types"],
+		"paths": {
+			"*": ["node_modules/*", "src/@types"]
+		}
+	},
+	"include": ["src/**/*"]
+}