re-enable comments on non-post pages

lib/config/constants.ts

@@ -1,2 +0,0 @@
-/** Path to directory with .mdx files, relative to project root. */
-export const POSTS_DIR = "notes" as const;

lib/posts.ts

@@ -14,7 +14,6 @@ import {
   remarkStripMdxImportsExports,
 } from "@/lib/remark";
 import { rehypeSanitize, rehypeStringify } from "@/lib/rehype";
-import { POSTS_DIR } from "@/lib/config/constants";
 
 export type FrontMatter = {
   slug: string;
@@ -28,6 +27,9 @@ export type FrontMatter = {
   noComments?: boolean;
 };
 
+/** Path to directory with .mdx files, relative to project root. */
+export const POSTS_DIR = "notes" as const;
+
 /** Use filesystem to get a simple list of all post slugs */
 export const getSlugs = cache(async (): Promise<string[]> => {
   // list all .mdx files in POSTS_DIR

lib/server/github.ts

@@ -1,143 +0,0 @@
-import "server-only";
-
-import { env } from "@/lib/env";
-import * as cheerio from "cheerio";
-import { graphql } from "@octokit/graphql";
-import type { Repository, User } from "@octokit/graphql-schema";
-
-export const getContributions = async (): Promise<
-  Array<{
-    date: string;
-    count: number;
-    level: number;
-  }>
-> => {
-  // thanks @grubersjoe! :) https://github.com/grubersjoe/github-contributions-api/blob/main/src/scrape.ts
-  try {
-    const response = await fetch(`https://github.com/users/${env.NEXT_PUBLIC_GITHUB_USERNAME}/contributions`, {
-      headers: {
-        referer: `https://github.com/${env.NEXT_PUBLIC_GITHUB_USERNAME}`,
-        "x-requested-with": "XMLHttpRequest",
-      },
-      cache: "force-cache",
-      next: {
-        revalidate: 3600, // 1 hour
-        tags: ["github-contributions"],
-      },
-    });
-
-    const $ = cheerio.load(await response.text());
-
-    const days = $(".js-calendar-graph-table .ContributionCalendar-day")
-      .get()
-      .sort((a, b) => {
-        const dateA = a.attribs["data-date"] ?? "";
-        const dateB = b.attribs["data-date"] ?? "";
-
-        return dateA.localeCompare(dateB, "en");
-      });
-
-    const dayTooltips = $(".js-calendar-graph tool-tip")
-      .toArray()
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      .reduce<Record<string, any>>((map, elem) => {
-        map[elem.attribs["for"]] = elem;
-        return map;
-      }, {});
-
-    return days.map((day) => {
-      const attr = {
-        id: day.attribs["id"],
-        date: day.attribs["data-date"],
-        level: day.attribs["data-level"],
-      };
-
-      let count = 0;
-      if (dayTooltips[attr.id]) {
-        const text = dayTooltips[attr.id].firstChild;
-        if (text) {
-          const countMatch = text.data.trim().match(/^\d+/);
-          if (countMatch) {
-            count = parseInt(countMatch[0]);
-          }
-        }
-      }
-
-      const level = parseInt(attr.level);
-
-      return {
-        date: attr.date,
-        count,
-        level,
-      };
-    });
-  } catch (error) {
-    console.error("[server/github] Failed to fetch contributions:", error);
-    return [];
-  }
-};
-
-export const getRepos = async (): Promise<Repository[] | undefined> => {
-  try {
-    // https://docs.github.com/en/graphql/reference/objects#repository
-    const { user } = await graphql<{ user: User }>(
-      `
-        query ($username: String!, $sort: RepositoryOrderField!, $limit: Int) {
-          user(login: $username) {
-            repositories(
-              first: $limit
-              isLocked: false
-              isFork: false
-              ownerAffiliations: OWNER
-              privacy: PUBLIC
-              orderBy: { field: $sort, direction: DESC }
-            ) {
-              edges {
-                node {
-                  name
-                  url
-                  description
-                  pushedAt
-                  stargazerCount
-                  forkCount
-                  primaryLanguage {
-                    name
-                    color
-                  }
-                }
-              }
-            }
-          }
-        }
-      `,
-      {
-        username: env.NEXT_PUBLIC_GITHUB_USERNAME,
-        sort: "STARGAZERS",
-        limit: 12,
-        headers: {
-          accept: "application/vnd.github.v3+json",
-          authorization: `token ${env.GITHUB_TOKEN}`,
-        },
-        request: {
-          // override fetch() to use next's extension to cache the response
-          // https://nextjs.org/docs/app/api-reference/functions/fetch#fetchurl-options
-          fetch: (url: string | URL | Request, options?: RequestInit) => {
-            return fetch(url, {
-              ...options,
-              cache: "force-cache",
-              next: {
-                revalidate: 3600, // 1 hour
-                tags: ["github-repos"],
-              },
-            });
-          },
-        },
-      }
-    );
-
-    return user.repositories.edges?.map((edge) => edge!.node as Repository);
-  } catch (error) {
-    console.error("[server/github] Failed to fetch repositories:", error);
-    return [];
-  }
-};

lib/views.ts

@@ -1,6 +1,5 @@
 import "server-only";
 
-import { cache } from "react";
 import { eq, inArray } from "drizzle-orm";
 import { db } from "@/lib/db";
 import { page } from "@/lib/db/schema";
@@ -43,43 +42,41 @@ export const getViews: {
    * Retrieves the numbers of views for ALL slugs
    */
   (): Promise<Record<string, number>>;
-} = cache(
-  async (
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    slug?: any
-  ): // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  Promise<any> => {
-    try {
-      // return one page
-      if (typeof slug === "string") {
-        const pages = await db.select().from(page).where(eq(page.slug, slug)).limit(1);
-        return pages[0].views;
-      }
+} = async (
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  slug?: any
+): // eslint-disable-next-line @typescript-eslint/no-explicit-any
+Promise<any> => {
+  try {
+    // return one page
+    if (typeof slug === "string") {
+      const pages = await db.select().from(page).where(eq(page.slug, slug)).limit(1);
+      return pages[0].views;
+    }
 
-      // return multiple pages
-      if (Array.isArray(slug)) {
-        const pages = await db.select().from(page).where(inArray(page.slug, slug));
-        return pages.reduce(
-          (acc, page, index) => {
-            acc[slug[index]] = page.views;
-            return acc;
-          },
-          {} as Record<string, number | null>
-        );
-      }
-
-      // return ALL pages
-      const pages = await db.select().from(page);
+    // return multiple pages
+    if (Array.isArray(slug)) {
+      const pages = await db.select().from(page).where(inArray(page.slug, slug));
       return pages.reduce(
-        (acc, page) => {
-          acc[page.slug] = page.views;
+        (acc, page, index) => {
+          acc[slug[index]] = page.views;
           return acc;
         },
-        {} as Record<string, number>
+        {} as Record<string, number | null>
       );
-    } catch (error) {
-      console.error("[server/views] fatal error:", error);
-      throw new Error("Failed to get views");
     }
+
+    // return ALL pages
+    const pages = await db.select().from(page);
+    return pages.reduce(
+      (acc, page) => {
+        acc[page.slug] = page.views;
+        return acc;
+      },
+      {} as Record<string, number>
+    );
+  } catch (error) {
+    console.error("[server/views] fatal error:", error);
+    throw new Error("Failed to get views");
   }
-);
+};