@terrafirmagreg-team/discussions 1.2.1 → 1.2.3

package/src/lib/comments/server.ts

@@ -1,204 +1,204 @@
-import 'server-only';
-import { NextComment } from '@fuma-comment/server/next';
-type RouteRequest = Request & { nextUrl: { pathname: string } };
-import {
-  authConfig,
-  authCookie,
-  authEnabled,
-  authMode,
-  devAuthCookie,
-  devCookieAuth,
-} from '@terrafirmagreg-team/auth';
-import { env, githubAppToken } from '@terrafirmagreg-team/data';
-import {
-  createAuth,
-  createGitHubClient,
-  createStorage,
-  type GitHubDiscussionsConfig,
-} from 'fuma-comment-github-discussions';
-import { discussionsConfig } from '../config';
-import { createDiscussion } from './github';
-import { localComments } from './local';
-
-const APP_TOKEN = 'app';
-const CATEGORY = 'General';
-
-type DiscussionTarget = {
-  dataset: string;
-  repo: string;
-  repoId: string;
-  categoryId: string;
-};
-
-function datasets(): DiscussionTarget[] {
-  return Object.entries(discussionsConfig().datasets).flatMap(
-    ([dataset, cfg]) =>
-      cfg.repo && cfg.discussions
-        ? [
-            {
-              dataset,
-              repo: cfg.repo,
-              repoId: cfg.discussions.repoId,
-              categoryId: cfg.discussions.categoryId,
-            },
-          ]
-        : [],
-  );
-}
-
-function datasetSegs(): Set<string> {
-  return new Set(datasets().map(({ dataset }) => dataset));
-}
-
-function defaultDataset(): DiscussionTarget {
-  return datasets().find(({ dataset }) => dataset === 'dev')!;
-}
-
-function datasetOf(page: string) {
-  const segs = datasetSegs();
-  const seg = page.split('~').find((part) => segs.has(part));
-  return datasets().find(({ dataset }) => dataset === seg) ?? defaultDataset();
-}
-
-function pageToTitle(page: string): string {
-  const locales = new Set(discussionsConfig().knownLanguages);
-  const segs = datasetSegs();
-  const pretty = page
-    .split('~')
-    .slice(0, -1)
-    .filter((seg) => seg && !locales.has(seg) && !segs.has(seg))
-    .map((seg) =>
-      seg.replace(/[-_]+/g, ' ').replace(/\b\w/g, (ch) => ch.toUpperCase()),
-    );
-  return pretty.join(' › ') || 'Page';
-}
-
-type Client = ReturnType<typeof createGitHubClient>;
-type Storage = ReturnType<typeof createStorage>;
-
-let siteUrl: string | undefined;
-
-function currentSiteUrl(): string {
-  return siteUrl ?? discussionsConfig().siteUrl;
-}
-const storages = new Map<string, Storage>();
-
-function cfgFor(d: DiscussionTarget): GitHubDiscussionsConfig {
-  return {
-    repo: d.repo,
-    repoId: d.repoId,
-    categoryId: d.categoryId,
-    category: CATEGORY,
-    readToken: APP_TOKEN,
-    tokenSecret: authConfig().tokenSecret,
-    cookieName: authCookie,
-    pageToTitle,
-    pageToUrl: (page) => {
-      const segs = page.split('~');
-      segs.pop();
-      return `${currentSiteUrl()}/${segs.filter(Boolean).join('/')}`;
-    },
-  };
-}
-
-function wrapClient(d: DiscussionTarget, cfg: GitHubDiscussionsConfig): Client {
-  const base = createGitHubClient(cfg);
-  const wrapped = { ...base };
-  for (const key of Object.keys(base) as (keyof Client)[]) {
-    const fn = base[key] as (...args: unknown[]) => unknown;
-    (wrapped as Record<string, unknown>)[key] = async (...args: unknown[]) => {
-      if (args.includes(APP_TOKEN)) {
-        const token = await githubAppToken(d.repo);
-        args = args.map((arg) => (arg === APP_TOKEN ? token : arg));
-      }
-      return fn(...args);
-    };
-  }
-  wrapped.createDiscussion = async (title, url, token) => {
-    const resolved = token === APP_TOKEN ? await githubAppToken(d.repo) : token;
-    return createDiscussion(cfg, title, url, resolved);
-  };
-  return wrapped;
-}
-
-function storageFor(d: DiscussionTarget): Storage {
-  let storage = storages.get(d.dataset);
-  if (!storage) {
-    const cfg = cfgFor(d);
-    storage = createStorage(cfg, wrapClient(d, cfg));
-    storages.set(d.dataset, storage);
-  }
-  return storage;
-}
-
-type RouteHandler = (
-  req: RouteRequest,
-  context: { params: Promise<{ comment: string[] }> },
-) => Promise<Response>;
-
-export function commentsEnabled(): boolean {
-  return authEnabled() && datasets().length > 0;
-}
-
-export function feedbackEnabled(): boolean {
-  return commentsEnabled() && Boolean(env('APP_ID') && env('APP_PRIVATE_KEY'));
-}
-
-export function createCommentsRouter(
-  options: { siteUrl?: string } = {},
-):
-  | { GET: RouteHandler; POST: RouteHandler; PATCH: RouteHandler; DELETE: RouteHandler }
-  | undefined {
-  if (!commentsEnabled()) return undefined;
-  siteUrl = options.siteUrl ?? discussionsConfig().siteUrl;
-
-  if (authMode() === 'dev' || !(env('APP_ID') && env('APP_PRIVATE_KEY')))
-    return NextComment({
-      role: 'database',
-      mention: { enabled: true },
-      storage: localComments(),
-      auth: devCookieAuth({ cookieName: devAuthCookie }),
-    }) as unknown as { GET: RouteHandler; POST: RouteHandler; PATCH: RouteHandler; DELETE: RouteHandler };
-
-  const dispatch = (page: string | undefined) =>
-    storageFor(datasetOf(page ?? ''));
-
-  const storage = {
-    getComments: (args: Parameters<Storage['getComments']>[0]) =>
-      dispatch(args.page as string | undefined).getComments(args),
-    postComment: (args: Parameters<Storage['postComment']>[0]) =>
-      dispatch(args.page as string | undefined).postComment(args),
-    updateComment: (args: Parameters<Storage['updateComment']>[0]) =>
-      dispatch(args.page).updateComment(args),
-    deleteComment: (args: Parameters<Storage['deleteComment']>[0]) =>
-      dispatch(args.page).deleteComment(args),
-    setRate: (args: Parameters<Storage['setRate']>[0]) =>
-      dispatch(args.page).setRate(args),
-    deleteRate: (args: Parameters<Storage['deleteRate']>[0]) =>
-      dispatch(args.page).deleteRate(args),
-    getCommentAuthor: async (
-      args: Parameters<Storage['getCommentAuthor']>[0],
-    ) => {
-      for (const d of datasets()) {
-        const author = await Promise.resolve(
-          storageFor(d).getCommentAuthor(args),
-        ).catch(() => null);
-        if (author) return author;
-      }
-      return null;
-    },
-    getRole: (args: Parameters<Storage['getRole']>[0]) =>
-      storageFor(datasetOf(args.page)).getRole(args),
-    queryUsers: (args: Parameters<NonNullable<Storage['queryUsers']>>[0]) =>
-      dispatch(args.page).queryUsers?.(args) ?? [],
-  } as Storage;
-
-  const cfg = cfgFor(defaultDataset());
-  return NextComment({
-    role: 'database',
-    mention: { enabled: true },
-    storage,
-    auth: createAuth(cfg, wrapClient(defaultDataset(), cfg)),
-  }) as unknown as { GET: RouteHandler; POST: RouteHandler; PATCH: RouteHandler; DELETE: RouteHandler };
-}
-
+import 'server-only';
+import { NextComment } from '@fuma-comment/server/next';
+type RouteRequest = Request & { nextUrl: { pathname: string } };
+import {
+  authConfig,
+  authCookie,
+  authEnabled,
+  authMode,
+  devAuthCookie,
+  devCookieAuth,
+} from '@terrafirmagreg-team/auth';
+import { env, githubAppToken } from '@terrafirmagreg-team/data';
+import {
+  createAuth,
+  createGitHubClient,
+  createStorage,
+  type GitHubDiscussionsConfig,
+} from 'fuma-comment-github-discussions';
+import { discussionsConfig } from '../config';
+import { createDiscussion } from './github';
+import { localComments } from './local';
+
+const APP_TOKEN = 'app';
+const CATEGORY = 'General';
+
+type DiscussionTarget = {
+  dataset: string;
+  repo: string;
+  repoId: string;
+  categoryId: string;
+};
+
+function datasets(): DiscussionTarget[] {
+  return Object.entries(discussionsConfig().datasets).flatMap(
+    ([dataset, cfg]) =>
+      cfg.repo && cfg.discussions
+        ? [
+            {
+              dataset,
+              repo: cfg.repo,
+              repoId: cfg.discussions.repoId,
+              categoryId: cfg.discussions.categoryId,
+            },
+          ]
+        : [],
+  );
+}
+
+function datasetSegs(): Set<string> {
+  return new Set(datasets().map(({ dataset }) => dataset));
+}
+
+function defaultDataset(): DiscussionTarget {
+  return datasets().find(({ dataset }) => dataset === 'dev')!;
+}
+
+function datasetOf(page: string) {
+  const segs = datasetSegs();
+  const seg = page.split('~').find((part) => segs.has(part));
+  return datasets().find(({ dataset }) => dataset === seg) ?? defaultDataset();
+}
+
+function pageToTitle(page: string): string {
+  const locales = new Set(discussionsConfig().knownLanguages);
+  const segs = datasetSegs();
+  const pretty = page
+    .split('~')
+    .slice(0, -1)
+    .filter((seg) => seg && !locales.has(seg) && !segs.has(seg))
+    .map((seg) =>
+      seg.replace(/[-_]+/g, ' ').replace(/\b\w/g, (ch) => ch.toUpperCase()),
+    );
+  return pretty.join(' › ') || 'Page';
+}
+
+type Client = ReturnType<typeof createGitHubClient>;
+type Storage = ReturnType<typeof createStorage>;
+
+let siteUrl: string | undefined;
+
+function currentSiteUrl(): string {
+  return siteUrl ?? discussionsConfig().siteUrl;
+}
+const storages = new Map<string, Storage>();
+
+function cfgFor(d: DiscussionTarget): GitHubDiscussionsConfig {
+  return {
+    repo: d.repo,
+    repoId: d.repoId,
+    categoryId: d.categoryId,
+    category: CATEGORY,
+    readToken: APP_TOKEN,
+    tokenSecret: authConfig().tokenSecret,
+    cookieName: authCookie,
+    pageToTitle,
+    pageToUrl: (page) => {
+      const segs = page.split('~');
+      segs.pop();
+      return `${currentSiteUrl()}/${segs.filter(Boolean).join('/')}`;
+    },
+  };
+}
+
+function wrapClient(d: DiscussionTarget, cfg: GitHubDiscussionsConfig): Client {
+  const base = createGitHubClient(cfg);
+  const wrapped = { ...base };
+  for (const key of Object.keys(base) as (keyof Client)[]) {
+    const fn = base[key] as (...args: unknown[]) => unknown;
+    (wrapped as Record<string, unknown>)[key] = async (...args: unknown[]) => {
+      if (args.includes(APP_TOKEN)) {
+        const token = await githubAppToken(d.repo);
+        args = args.map((arg) => (arg === APP_TOKEN ? token : arg));
+      }
+      return fn(...args);
+    };
+  }
+  wrapped.createDiscussion = async (title, url, token) => {
+    const resolved = token === APP_TOKEN ? await githubAppToken(d.repo) : token;
+    return createDiscussion(cfg, title, url, resolved);
+  };
+  return wrapped;
+}
+
+function storageFor(d: DiscussionTarget): Storage {
+  let storage = storages.get(d.dataset);
+  if (!storage) {
+    const cfg = cfgFor(d);
+    storage = createStorage(cfg, wrapClient(d, cfg));
+    storages.set(d.dataset, storage);
+  }
+  return storage;
+}
+
+type RouteHandler = (
+  req: RouteRequest,
+  context: { params: Promise<{ comment: string[] }> },
+) => Promise<Response>;
+
+export function commentsEnabled(): boolean {
+  return authEnabled() && datasets().length > 0;
+}
+
+export function feedbackEnabled(): boolean {
+  return commentsEnabled() && Boolean(env('APP_ID') && env('APP_PRIVATE_KEY'));
+}
+
+export function createCommentsRouter(
+  options: { siteUrl?: string } = {},
+):
+  | { GET: RouteHandler; POST: RouteHandler; PATCH: RouteHandler; DELETE: RouteHandler }
+  | undefined {
+  if (!commentsEnabled()) return undefined;
+  siteUrl = options.siteUrl ?? discussionsConfig().siteUrl;
+
+  if (authMode() === 'dev' || !(env('APP_ID') && env('APP_PRIVATE_KEY')))
+    return NextComment({
+      role: 'database',
+      mention: { enabled: true },
+      storage: localComments(),
+      auth: devCookieAuth({ cookieName: devAuthCookie }),
+    }) as unknown as { GET: RouteHandler; POST: RouteHandler; PATCH: RouteHandler; DELETE: RouteHandler };
+
+  const dispatch = (page: string | undefined) =>
+    storageFor(datasetOf(page ?? ''));
+
+  const storage = {
+    getComments: (args: Parameters<Storage['getComments']>[0]) =>
+      dispatch(args.page as string | undefined).getComments(args),
+    postComment: (args: Parameters<Storage['postComment']>[0]) =>
+      dispatch(args.page as string | undefined).postComment(args),
+    updateComment: (args: Parameters<Storage['updateComment']>[0]) =>
+      dispatch(args.page).updateComment(args),
+    deleteComment: (args: Parameters<Storage['deleteComment']>[0]) =>
+      dispatch(args.page).deleteComment(args),
+    setRate: (args: Parameters<Storage['setRate']>[0]) =>
+      dispatch(args.page).setRate(args),
+    deleteRate: (args: Parameters<Storage['deleteRate']>[0]) =>
+      dispatch(args.page).deleteRate(args),
+    getCommentAuthor: async (
+      args: Parameters<Storage['getCommentAuthor']>[0],
+    ) => {
+      for (const d of datasets()) {
+        const author = await Promise.resolve(
+          storageFor(d).getCommentAuthor(args),
+        ).catch(() => null);
+        if (author) return author;
+      }
+      return null;
+    },
+    getRole: (args: Parameters<Storage['getRole']>[0]) =>
+      storageFor(datasetOf(args.page)).getRole(args),
+    queryUsers: (args: Parameters<NonNullable<Storage['queryUsers']>>[0]) =>
+      dispatch(args.page).queryUsers?.(args) ?? [],
+  } as Storage;
+
+  const cfg = cfgFor(defaultDataset());
+  return NextComment({
+    role: 'database',
+    mention: { enabled: true },
+    storage,
+    auth: createAuth(cfg, wrapClient(defaultDataset(), cfg)),
+  }) as unknown as { GET: RouteHandler; POST: RouteHandler; PATCH: RouteHandler; DELETE: RouteHandler };
+}
+

package/src/lib/feedback.ts

@@ -1,74 +1,74 @@
-'use server';
-import { githubAppToken } from '@terrafirmagreg-team/data';
-import { createGitHubClient } from 'fuma-comment-github-discussions';
-import { discussionsConfig } from './config';
-import { createDiscussion } from './comments/github';
-import {
-  blockFeedback,
-  pageFeedback,
-  type ActionResponse,
-  type BlockFeedback,
-  type PageFeedback,
-} from './feedback-schema';
-
-function targetOf(pathname: string) {
-  const datasets = discussionsConfig().datasets;
-  const seg = pathname.split('/').find((part) => part in datasets);
-  const cfg = (seg && datasets[seg]) || datasets.dev;
-  if (!cfg?.repo || !cfg.discussions) return undefined;
-  return {
-    repo: cfg.repo,
-    repoId: cfg.discussions.repoId,
-    categoryId: cfg.discussions.categoryId,
-    category: 'General',
-  };
-}
-
-export async function onPageFeedbackAction(
-  feedback: PageFeedback,
-): Promise<ActionResponse> {
-  feedback = pageFeedback.parse(feedback);
-  const { pathname } = new URL(feedback.url);
-
-  return createDiscussionThread(
-    pathname,
-    `[${feedback.opinion}] ${feedback.message}\n\n> Forwarded from user feedback.`,
-  );
-}
-
-export async function onBlockFeedbackAction(
-  feedback: BlockFeedback,
-): Promise<ActionResponse> {
-  feedback = blockFeedback.parse(feedback);
-  const url = new URL(feedback.url);
-  url.hash = feedback.blockId;
-
-  return createDiscussionThread(
-    url.pathname,
-    `> ${feedback.blockBody}\n\n${feedback.message}\n\n> [Forwarded from user feedback](${url.href}).`,
-  );
-}
-
-async function createDiscussionThread(
-  pageId: string,
-  body: string,
-): Promise<ActionResponse> {
-  const target = targetOf(pageId);
-  if (!target) return { githubUrl: '' };
-  const github = createGitHubClient(target);
-  const auth = await githubAppToken(target.repo);
-  const title = `Feedback for ${pageId}`;
-
-  const discussion =
-    (await github.findDiscussion(title, auth)) ??
-    (await createDiscussion(
-      target,
-      title,
-      `${discussionsConfig().siteUrl}${pageId}`,
-      auth,
-    ));
-  await github.addComment(discussion.id, body, auth);
-
-  return { githubUrl: discussion.url };
-}
-
+'use server';
+import { githubAppToken } from '@terrafirmagreg-team/data';
+import { createGitHubClient } from 'fuma-comment-github-discussions';
+import { discussionsConfig } from './config';
+import { createDiscussion } from './comments/github';
+import {
+  blockFeedback,
+  pageFeedback,
+  type ActionResponse,
+  type BlockFeedback,
+  type PageFeedback,
+} from './feedback-schema';
+
+function targetOf(pathname: string) {
+  const datasets = discussionsConfig().datasets;
+  const seg = pathname.split('/').find((part) => part in datasets);
+  const cfg = (seg && datasets[seg]) || datasets.dev;
+  if (!cfg?.repo || !cfg.discussions) return undefined;
+  return {
+    repo: cfg.repo,
+    repoId: cfg.discussions.repoId,
+    categoryId: cfg.discussions.categoryId,
+    category: 'General',
+  };
+}
+
+export async function onPageFeedbackAction(
+  feedback: PageFeedback,
+): Promise<ActionResponse> {
+  feedback = pageFeedback.parse(feedback);
+  const { pathname } = new URL(feedback.url);
+
+  return createDiscussionThread(
+    pathname,
+    `[${feedback.opinion}] ${feedback.message}\n\n> Forwarded from user feedback.`,
+  );
+}
+
+export async function onBlockFeedbackAction(
+  feedback: BlockFeedback,
+): Promise<ActionResponse> {
+  feedback = blockFeedback.parse(feedback);
+  const url = new URL(feedback.url);
+  url.hash = feedback.blockId;
+
+  return createDiscussionThread(
+    url.pathname,
+    `> ${feedback.blockBody}\n\n${feedback.message}\n\n> [Forwarded from user feedback](${url.href}).`,
+  );
+}
+
+async function createDiscussionThread(
+  pageId: string,
+  body: string,
+): Promise<ActionResponse> {
+  const target = targetOf(pageId);
+  if (!target) return { githubUrl: '' };
+  const github = createGitHubClient(target);
+  const auth = await githubAppToken(target.repo);
+  const title = `Feedback for ${pageId}`;
+
+  const discussion =
+    (await github.findDiscussion(title, auth)) ??
+    (await createDiscussion(
+      target,
+      title,
+      `${discussionsConfig().siteUrl}${pageId}`,
+      auth,
+    ));
+  await github.addComment(discussion.id, body, auth);
+
+  return { githubUrl: discussion.url };
+}
+

package/src/locales/en_us.json

@@ -1,13 +0,0 @@
-{
-  "Bad(ui.feedback.bad)": "Bad",
-  "Close(ui.feedback.close)": "Close",
-  "Context(ui.feedback.context)": "Context",
-  "Feedback(ui.feedback.tooltip)": "Feedback",
-  "Good(ui.feedback.good)": "Good",
-  "How is this page?(ui.feedback.question)": "How is this page?",
-  "Leave your feedback…(ui.feedback.placeholder)": "Leave your feedback…",
-  "Submit Again(ui.feedback.submit_again)": "Submit Again",
-  "Submit(ui.feedback.submit)": "Submit",
-  "Thank you for your feedback!(ui.feedback.thanks)": "Thank you for your feedback!",
-  "View on GitHub(ui.feedback.view_on_github)": "View on GitHub"
-}

package/src/locales/ru_ru.json

@@ -1,13 +0,0 @@
-{
-  "Bad(ui.feedback.bad)": "Плохо",
-  "Close(ui.feedback.close)": "Закрыть",
-  "Context(ui.feedback.context)": "Контекст",
-  "Feedback(ui.feedback.tooltip)": "Отзыв",
-  "Good(ui.feedback.good)": "Хорошо",
-  "How is this page?(ui.feedback.question)": "Как вам эта страница?",
-  "Leave your feedback…(ui.feedback.placeholder)": "Оставьте отзыв…",
-  "Submit Again(ui.feedback.submit_again)": "Отправить снова",
-  "Submit(ui.feedback.submit)": "Отправить",
-  "Thank you for your feedback!(ui.feedback.thanks)": "Спасибо за отзыв!",
-  "View on GitHub(ui.feedback.view_on_github)": "Смотреть на GitHub"
-}

package/src/locales.ts

@@ -1,6 +0,0 @@
-import { createLocaleCatalog } from '@terrafirmagreg-team/translate/lib/locales';
-
-export const locales = createLocaleCatalog(
-  import.meta.glob('./locales/*.json', { eager: true, import: 'default' }),
-);
-