better seo and title

Author: theowenyoung

Makefile

@@ -63,7 +63,7 @@ serve:
 
 .Phony: run
 run:
-	FORCE=1 deno run -A --watch=tal.ts,templates/ main.ts --no-fetch
+	LIMIT=3 FORCE=1 deno run -A --watch=tal.ts,templates/ tal.ts --no-fetch --html "ripienaar/free-for-dev"
 
 
 .Phony: initdb

build-by-source.ts

@@ -1,17 +1,10 @@
-import {
-  CSS,
-  DB,
-  groupBy,
-  jsonfeedToAtom,
-  mustache,
-  path,
-  titleCase,
-} from "./deps.ts";
+import { CSS, DB, groupBy, jsonfeedToAtom, mustache, path } from "./deps.ts";
 import {
   BuildOptions,
   BuiltMarkdownInfo,
   DayInfo,
   Feed,
+  FeedInfo,
   FeedItem,
   FileInfo,
   Item,
@@ -23,6 +16,7 @@ import {
   CONTENT_DIR,
   INDEX_HTML_PATH,
   INDEX_MARKDOWN_PATH,
+  SUBSCRIPTION_URL,
 } from "./constant.ts";
 import {
   formatHumanTime,
@@ -42,6 +36,7 @@ import {
   readTextFile,
   slugy,
   startDateOfWeek,
+  titleCase,
   writeJSONFile,
   writeTextFile,
 } from "./util.ts";
@@ -98,9 +93,9 @@ export default async function main(
     );
     relativeFolder = path.join(relativeFolder, originalFilepathWithoutExt);
   }
+  const baseFeed = getBaseFeed();
   for (let i = 0; i < 2; i++) {
     const buildMarkdownStartTime = Date.now();
-    const baseFeed = getBaseFeed();
     const isDay = i === 0;
     let currentNavHeader = `[ Daily / [Weekly](${
       pathnameToWeekFilePath(fileConfig.pathname)
@@ -112,20 +107,16 @@ export default async function main(
         pathnameToOverviewFilePath(fileConfig.pathname)
       }) ]`;
     }
-    const nav = `[Home](/${INDEX_MARKDOWN_PATH}) · [Feed](${
+    const nav = `[🏠 Home](/${INDEX_MARKDOWN_PATH}) · [🔥 Feed](${
       pathnameToFeedUrl(fileConfig.pathname, isDay)
-    }) · [Repo](${
+    }) · [📮 Subscribe](${SUBSCRIPTION_URL}) · [🔗 ${sourceIdentifier}](${
       getRepoHTMLURL(repoMeta.url, repoMeta.default_branch, originalFilepath)
-    }) · ${sourceCategory} · ⭐ ${
-      formatNumber(repoMeta.stargazers_count)
-    } ·  📝 ${formatHumanTime(new Date(dbFileMeta.updated_at))} · ✅ ${
-      formatHumanTime(new Date(dbFileMeta.checked_at))
-    } 
+    }) · ⭐ ${formatNumber(repoMeta.stargazers_count)} · 🏷️ ${sourceCategory}
 
 ${currentNavHeader}
 
 `;
-    const feedTitle = `Track ${titleCase(repoMeta.name)}  ${
+    const feedTitle = `Track ${fileConfig.name} Updates ${
       isDay ? "Daily" : "Weekly"
     }`;
     const feedDescription = repoMeta.description;
@@ -190,7 +181,8 @@ ${currentNavHeader}
       const url = `${domain}/${slug}`;
       const feedItem: FeedItem = {
         id: itemUrl,
-        title: dayInfo.name,
+        title: `${fileConfig.name} Updates on ${dayInfo.name}`,
+        _short_title: dayInfo.name,
         _slug: slug,
         _filepath: pathnameToFilePath("/" + slug),
         url: itemUrl,
@@ -211,24 +203,30 @@ ${currentNavHeader}
       return bDate.getTime() - aDate.getTime();
     });
 
-    const title = `Track ${repoMeta.name}  ${isDay ? "Daily" : "Weekly"}`;
-    const feed: Feed = {
+    const feedSeoTitle =
+      `Track ${fileConfig.name} (${sourceIdentifier}) Updates ${
+        isDay ? "Daily" : "Weekly"
+      }`;
+    const feedInfo: FeedInfo = {
       ...baseFeed,
-      title,
-      _seo_title: `${title} - ${siteConfig.title}`,
+      title: feedTitle,
+      _seo_title: `${feedSeoTitle} - ${siteConfig.title}`,
       description: repoMeta.description,
       home_page_url: `${domain}/${dailyRelativeFolder}/`,
       feed_url: `${domain}/${dailyRelativeFolder}/feed.json`,
-      items: feedItems,
       _nav_text: nav,
     };
+    const feed: Feed = {
+      ...feedInfo,
+      items: feedItems,
+    };
     const markdownDoc = `# ${feed.title}
 
 ${feed.description}
 
 ${feed._nav_text}${
       feedItems.map((item) => {
-        return `\n\n## [${item.title}](/${CONTENT_DIR}/${item._external_slug}${INDEX_MARKDOWN_PATH})${item.content_text}`;
+        return `\n\n## [${item._short_title}](/${CONTENT_DIR}/${item._external_slug}${INDEX_MARKDOWN_PATH})${item.content_text}`;
       }).join("")
     }`;
     if (isBuildMarkdown) {
@@ -250,7 +248,7 @@ ${feed._nav_text}${
       // add body, css to feed
       const body = renderMarkdown(markdownDoc);
       const htmlDoc = mustache.render(htmlIndexTemplateContent, {
-        ...feed,
+        ...feedInfo,
         body,
         CSS,
       });
@@ -320,14 +318,15 @@ ${feed._nav_text}${
     pathnameToFilePath(fileConfig.pathname)
   }) / [Weekly](${pathnameToWeekFilePath(fileConfig.pathname)}) / Overview ]`;
 
-  const nav = `
-[Home](/${INDEX_MARKDOWN_PATH}) · [Feed](${
+  const nav = `[🏠 Home](/${INDEX_MARKDOWN_PATH}) · [🔥 Feed](${
     pathnameToFeedUrl(fileConfig.pathname, true)
-  }) · [Repo](${
-    getRepoHTMLURL(repoMeta.url, repoMeta.default_branch, filepath)
-  }) · ⭐ ${formatNumber(repoMeta.stargazers_count)} ·  📝 ${
+  }) · [📮 Subscribe](${SUBSCRIPTION_URL}) · [🔗 Repo](${
+    getRepoHTMLURL(repoMeta.url, repoMeta.default_branch, originalFilepath)
+  }) · ⭐ ${
+    formatNumber(repoMeta.stargazers_count)
+  } · 🏷️ ${sourceCategory} · 📝 ${
     formatHumanTime(new Date(dbFileMeta.updated_at))
-  } · ✅ ${formatHumanTime(new Date(dbFileMeta.checked_at))} 
+  }
 
 ${currentNavHeader}
 
@@ -339,13 +338,9 @@ ${currentNavHeader}
     "readme",
     INDEX_MARKDOWN_PATH,
   );
-  const overviewHtmlPath = path.join(
-    getPublicPath(),
-    relativeFolder,
-    "readme",
-    INDEX_HTML_PATH,
-  );
-  const readmeRendered = `# ${repoMeta.name}
+  const overviewTitle = `${fileConfig.name} Overview`;
+
+  const readmeRendered = `# ${overviewTitle}
 
 ${repoMeta.description}
 
@@ -363,8 +358,19 @@ ${readmeContent}
   if (isBuildHtml) {
     // add body, css to feed
     const body = renderMarkdown(readmeRendered);
+    const overviewSeoTitle =
+      `${fileConfig.name} (${sourceIdentifier}) Overview`;
+    const overviewFeedInfo: FeedInfo = {
+      ...baseFeed,
+      title: overviewTitle,
+      _seo_title: `${overviewSeoTitle} - ${siteConfig.title}`,
+      description: repoMeta.description,
+      home_page_url: `${domain}/${relativeFolder}/readme/`,
+      feed_url: `${domain}/${relativeFolder}/feed.json`,
+      _nav_text: "",
+    };
     const htmlDoc = mustache.render(htmlIndexTemplateContent, {
-      _seo_title: `${titleCase(repoMeta.name)}`,
+      ...overviewFeedInfo,
       body: body,
       CSS,
     });

build-by-time.ts

@@ -17,6 +17,7 @@ import {
   INDEX_HTML_PATH,
   INDEX_MARKDOWN_PATH,
   RECENTLY_UPDATED_COUNT,
+  SUBSCRIPTION_URL,
 } from "./constant.ts";
 import {
   exists,
@@ -70,7 +71,7 @@ export default async function main(
   }
 
   const config = options.config;
-  const sourcesConfig = config.sources;
+  const siteConfig = config.site;
   let title = "";
   let commitMessage = "";
   let items: Record<string, Item> = {};
@@ -84,30 +85,32 @@ export default async function main(
   if (isDay) {
     const dayInfo = parseDayInfo(number);
     commitMessage = `Update day ${dayInfo.path}`;
-    title = dayInfo.name;
+    title = `Awesome List Updates on ${dayInfo.name}`;
     distMarkdownRelativePath = dayInfo.path;
     // get items
     items = getDayItems(db, number);
   } else {
     const weekInfo = parseWeekInfo(number);
     commitMessage = `Update week ${weekInfo.path}`;
-    title = weekInfo.name;
+    title = `Awesome List Updates on ${weekInfo.name}`;
     distMarkdownRelativePath = weekInfo.path;
     // get items
     items = getWeekItems(db, number);
   }
   feedTitle = `${title}`;
-  feedDescription = `Awesome list updated on ${title}`;
-
   const feedItems = itemsToFeedItems(items, config);
-  const nav = `[Home](/${INDEX_MARKDOWN_PATH}) · [Feed](${
-    pathnameToFeedUrl("/", true)
-  }) `;
+  feedDescription = `${feedItems.length} awesome lists updated ${
+    isDay ? "today" : "this week"
+  }.`;
+
+  const nav = `[🏠 Home](/${INDEX_MARKDOWN_PATH}) · [🔥 Feed](${
+    pathnameToFeedUrl("/" + (isDay ? "" : "week/"), true)
+  }) · [📮 Subscribe](${SUBSCRIPTION_URL}) `;
   const feed: Feed = {
     ...baseFeed,
     title: feedTitle,
     description: feedDescription,
-    _seo_title: feedTitle,
+    _seo_title: `${feedTitle} - ${siteConfig.title}`,
     feed_url: `${domain}/feed.json`,
     home_page_url: domain,
     _nav_text: nav,
@@ -342,7 +345,8 @@ export function itemsToFeedItemsByDate(
     const itemUrl = `${domain}/${slug}`;
     const feedItem: FeedItem = {
       id: itemUrl,
-      title: dayInfo.name,
+      title: `Awesome List Updated on ${dayInfo.name}`,
+      _short_title: dayInfo.name,
       _slug: slug,
       _filepath: pathnameToFilePath("/" + slug),
       url: itemUrl,

build.ts

@@ -3,6 +3,7 @@ import { fs, path, pLimit } from "./deps.ts";
 import {
   DayInfo,
   Feed,
+  FeedInfo,
   File,
   FileInfo,
   FileMetaWithSource,
@@ -15,6 +16,7 @@ import {
 import {
   INDEX_MARKDOWN_PATH,
   RECENTLY_UPDATED_COUNT,
+  SUBSCRIPTION_URL,
   TOP_REPOS_COUNT,
 } from "./constant.ts";
 import {
@@ -356,52 +358,65 @@ export default async function buildMarkdown(options: RunOptions) {
     for (let i = 0; i < 2; i++) {
       const isDay = i === 0;
       let lastItems: Record<string, Item> = {};
+      let jsonFeedItems: Record<string, Item> = {};
       if (isDay) {
         lastItems = getItemsByDays(
           db,
-          allDays.slice(0, 2).map((item) => item.number),
+          allDays.slice(0, 3).map((item) => item.number),
+        );
+        jsonFeedItems = getItemsByDays(
+          db,
+          allDays.slice(1, 15).map((item) => item.number),
         );
       } else {
         lastItems = getItemsByWeeks(
           db,
-          allWeeks.slice(0, 2).map((item) => item.number),
+          allWeeks.slice(0, 1).map((item) => item.number),
+        );
+        jsonFeedItems = getItemsByDays(
+          db,
+          allWeeks.slice(1, 4).map((item) => item.number),
         );
       }
 
       // console.log("lastItems", lastItems);
       const feedItems = itemsToFeedItemsByDate(lastItems, config, isDay);
 
+      const jsonFeedItemsByDate = itemsToFeedItemsByDate(
+        jsonFeedItems,
+        config,
+        isDay,
+      );
       const indexMarkdownDistPath = path.join(
         getDistRepoContentPath(),
         isDay ? INDEX_MARKDOWN_PATH : `week/${INDEX_MARKDOWN_PATH}`,
       );
       const baseFeed = getBaseFeed();
       let indexNav = "";
       if (isDay) {
-        indexNav = `[View by Weekly](/week/README.md)· [Feed](${
+        indexNav = `[📅 Weekly](/week/README.md) · [🔥 Feed](${
           pathnameToFeedUrl("/", true)
-        }) · 📝 ${formatHumanTime(dbItemsLatestUpdatedAt)} · ✅ ${
-          formatHumanTime(new Date(dbMeta.checked_at))
-        }`;
+        }) · [📮 Subscribe](${SUBSCRIPTION_URL}) · 📝 ${
+          formatHumanTime(dbItemsLatestUpdatedAt)
+        } · ✅ ${formatHumanTime(new Date(dbMeta.checked_at))}`;
       } else {
-        indexNav = `[Home](/README.md)· [Feed](${
+        indexNav = `[🏠 Home](/README.md)· [🔥 Feed](${
           pathnameToFeedUrl("/week/", true)
-        }) · 📝 ${formatHumanTime(dbItemsLatestUpdatedAt)} · ✅ ${
-          formatHumanTime(new Date(dbMeta.checked_at))
-        }`;
+        }) · [📮 Subscribe](${SUBSCRIPTION_URL}) · 📝 ${
+          formatHumanTime(dbItemsLatestUpdatedAt)
+        } · ✅ ${formatHumanTime(new Date(dbMeta.checked_at))}`;
       }
-      const indexFeed: Feed = {
+      const indexFeed: FeedInfo = {
         ...baseFeed,
-        title: "Track Awesome List Updates Daily",
+        title: "Track Awesome List Updates " + (isDay ? "Daily" : "Weekly"),
         description: config.site.description,
         _nav_text: indexNav,
         _seo_title:
-          `${config.site.title} - Track your Favorite Github Awesome Repo Weekly`,
-        home_page_url: config.site.url,
-        feed_url: config.site.url + "/feed.json",
-        items: [
-          ...feedItems.slice(1),
-        ],
+          `${config.site.title} - Track your Favorite Github Awesome List ${
+            isDay ? "Daily" : "Weekly"
+          }`,
+        home_page_url: config.site.url + (isDay ? "/" : "/week/"),
+        feed_url: config.site.url + (isDay ? "/" : "/week/") + "feed.json",
       };
       const groupByCategory = (sourceIdentifier: string) => {
         const sourceConfig = sourcesConfig[sourceIdentifier];
@@ -432,10 +447,7 @@ export default async function buildMarkdown(options: RunOptions) {
         sortedRepos,
         items: feedItems,
         list,
-        feed: {
-          ...indexFeed,
-          items: [],
-        },
+        feed: indexFeed,
       };
       // build summary.md
       let summary = "# Track Awesome List\n\n [README](README.md)\n\n";
@@ -533,10 +545,15 @@ export default async function buildMarkdown(options: RunOptions) {
           getPublicPath(),
           isDay ? "feed.json" : `week/feed.json`,
         );
-        await writeJSONFile(feedJsonDistPath, indexFeed);
+        const finalFeed = {
+          ...indexFeed,
+          items: jsonFeedItemsByDate,
+        };
+
+        await writeJSONFile(feedJsonDistPath, finalFeed);
         // build rss
         // @ts-ignore: node modules
-        const feedOutput = jsonfeedToAtom(indexFeed, {
+        const feedOutput = jsonfeedToAtom(finalFeed, {
           language: "en",
         });
         const rssDistPath = path.join(