@meith/web 0.17.1 → 0.17.2

package/app/admin/api/marketplace/screenshot/route.ts

@@ -1,5 +1,7 @@
 import type { NextRequest } from 'next/server'
 
+import { readCappedBody } from '@meith/marketplace'
+
 import { requireAdmin } from '@/server/admin'
 import { marketplaceScreenshotUrl } from '@/server/marketplace-admin'
 
@@ -46,13 +48,14 @@ export async function GET(request: NextRequest): Promise<Response> {
     const upstream = await fetch(url, {
       signal: controller.signal,
       headers: { accept: 'image/png' },
+      redirect: 'manual',
     })
     if (!upstream.ok) return fail(502, 'The catalog host did not answer with the screenshot.')
 
-    const bytes = await upstream.arrayBuffer()
-    if (bytes.byteLength > MAX_BYTES) return fail(502, 'The screenshot was larger than expected.')
+    const bytes = await readCappedBody(upstream, MAX_BYTES)
+    if (bytes === null) return fail(502, 'The screenshot was larger than expected.')
 
-    return new Response(bytes, {
+    return new Response(bytes.buffer as ArrayBuffer, {
       headers: {
         'Content-Type': 'image/png',
         'X-Content-Type-Options': 'nosniff',

package/app/admin/forums/[id]/page.tsx

@@ -30,9 +30,12 @@ export default async function AdminForumPage({ params }: { params: Promise<{ id:
   const options = await repository?.readOptions(forum.id)
   if (options === null || options === undefined || repository === null) notFound()
 
-  const t = await getTranslator()
-  const moderators = await repository.listModerators(forum.id)
-  const groups = (await repository.listGroups()).map((group) => ({
+  const [t, moderators, groupRows] = await Promise.all([
+    getTranslator(),
+    repository.listModerators(forum.id),
+    repository.listGroups(),
+  ])
+  const groups = groupRows.map((group) => ({
     groupId: group.id,
     title: group.title,
   }))

package/app/admin/settings/page.tsx

@@ -31,9 +31,9 @@ export default async function AdminSettingsPage({
   if (query.group === undefined && query.q === undefined) {
     redirect(settingsHref({ group: DEFAULT_SETTING_GROUP, advanced: query.advanced === '1' }))
   }
-  const t = await getTranslator()
+  const [t, snapshot] = await Promise.all([getTranslator(), getSettings()])
   const model = buildAdminSettingsModel({
-    snapshot: await getSettings(),
+    snapshot,
     query: query.q,
     group: query.group,
     advanced: query.advanced === '1',

package/app/admin/system/page.tsx

@@ -36,9 +36,8 @@ export default async function AdminSystemPage() {
   if ((await adminPageContext()) === null) return null
 
   const now = new Date()
-  const translator = await getTranslator()
+  const [translator, view] = await Promise.all([getTranslator(), buildSystemHealthView(now)])
   const copy = systemFormsCopy(translator)
-  const view = await buildSystemHealthView(now)
 
   if (view === null) {
     return (

package/app/admin/themes/page.tsx

@@ -24,10 +24,13 @@ export async function generateMetadata(): Promise<Metadata> {
 export default async function AdminThemesPage() {
   if ((await adminPageContext()) === null) return null
 
-  const themes = await themeListing()
-  const [lightKey, darkKey] = await Promise.all([logoKey('light'), logoKey('dark')])
+  const [themes, lightKey, darkKey, translator] = await Promise.all([
+    themeListing(),
+    logoKey('light'),
+    logoKey('dark'),
+    getTranslator(),
+  ])
   const now = new Date()
-  const translator = await getTranslator()
   const brandingCopy = brandingFormsCopy(translator)
   const stateCopy = themeStateCopy(translator)
 

package/bin/forum-web.mjs

@@ -65,24 +65,20 @@ const packageRoot = join(here, '..')
 const workspaceRoot = process.cwd()
 const appDir = join(workspaceRoot, '.meith', 'app')
 
-// `next dev|build` runs with `.meith/app` as its own cwd (see `run()` below),
-// so a relative FORUM_WORKSPACE_ROOT / FORUM_ALIASES_FROM — the shape
-// boards/stock/package.json's scripts write, relative to *this* process's
-// own cwd (the board's own directory) — would resolve against the wrong
-// directory if left for next.config.mjs to resolve itself. Rewriting them to
-// absolute paths here, before spawning, means both env vars mean the same
-// thing regardless of which process reads them.
 for (const name of ['FORUM_WORKSPACE_ROOT', 'FORUM_ALIASES_FROM']) {
   if (process.env[name]) process.env[name] = resolve(workspaceRoot, process.env[name])
 }
 
-// Files this package ships (see its `files` allowlist) that belong inside
-// the materialized app. Board files (community.config.ts, board.plugins.json,
-// community.plugins.ts) are never copied — they are read in place, from the
-// workspace, through the generated tsconfig instead.
+/**
+ * Files this package ships (see its `files` allowlist) that belong inside the
+ * materialized app. Board files (community.config.ts, board.plugins.json,
+ * community.plugins.ts) are never copied — they are read in place, from the
+ * workspace, through the generated tsconfig instead.
+ */
 const APP_ENTRIES = [
   'app',
   'src',
+  'public',
   'next.config.mjs',
   'postcss.config.mjs',
   'components.json',
@@ -136,7 +132,10 @@ function rewriteGlobalsCssSourcePaths() {
  * materialized app's own generated tsconfig, rebased to be relative to
  * `.meith/app` — the same aliases apps/community's own tsconfig.json
  * hand-maintains for exactly this reason. Unset (the default, and the only
- * path a real external board ever takes), this is a no-op.
+ * path a real external board ever takes), this is a no-op. `@board/config`
+ * and `@board/plugins` are excluded from the copy — they are this
+ * workspace's own seam, wired below to *this* board's files, never to
+ * whatever apps/community's own tsconfig happens to alias them to.
  */
 function monorepoAliases() {
   const configFile = process.env.FORUM_ALIASES_FROM
@@ -148,15 +147,20 @@ function monorepoAliases() {
 
   const aliases = {}
   for (const [alias, targets] of Object.entries(paths)) {
-    // `@board/config`/`@board/plugins` are this workspace's own seam, wired
-    // below to *this* board's files — never to whatever apps/community's own
-    // tsconfig happens to alias them to.
     if (alias === '@board/config' || alias === '@board/plugins') continue
     aliases[alias] = targets.map((target) => toPosixRelative(appDir, join(sourceDir, target)))
   }
   return aliases
 }
 
+/**
+ * Replaces each shipped entry (`APP_ENTRIES`) but never `rm -rf`s the whole
+ * `.meith/app` directory: `.next` lives there too once a build has run, and
+ * `forum-web start` needs that build still on disk after this same function
+ * re-materializes the sources ahead of launching the standalone server. The
+ * `next-env.d.ts` it writes only needs to exist, not be complete — next
+ * regenerates it with the right content on first run.
+ */
 function materialize() {
   const boardConfig = join(workspaceRoot, 'community.config.ts')
   const boardPlugins = join(workspaceRoot, 'community.plugins.ts')
@@ -168,10 +172,6 @@ function materialize() {
     )
   }
 
-  // Replace each shipped entry, but never `rm -rf` the whole directory:
-  // `.next` lives here too once a build has run, and `forum-web start` needs
-  // that build still on disk after this same function re-materializes the
-  // sources ahead of launching the standalone server.
   mkdirSync(appDir, { recursive: true })
 
   for (const entry of APP_ENTRIES) {
@@ -213,20 +213,20 @@ function materialize() {
 
   writeFileSync(join(appDir, 'tsconfig.json'), `${JSON.stringify(tsconfig, null, 2)}\n`)
 
-  // next dev/build reads its own next-env.d.ts if present; an empty one is
-  // enough, and next regenerates it with the right content on first run.
   writeFileSync(
     join(appDir, 'next-env.d.ts'),
     '/// <reference types="next" />\n/// <reference types="next/image-types/global" />\n',
   )
 }
 
+/**
+ * Resolved from this package's own directory rather than the workspace root:
+ * `next` is `@meith/web`'s dependency, not necessarily the workspace
+ * manifest's, and resolving from here finds it either way — hoisted to the
+ * workspace root (npm, yarn classic) or nested under this package's own
+ * `node_modules` (pnpm's default, non-hoisted layout).
+ */
 function resolveNextBin() {
-  // Resolved from this package's own directory rather than the workspace
-  // root: `next` is @meith/web's dependency, not necessarily the workspace
-  // manifest's, and resolving from here finds it either way — hoisted to
-  // the workspace root (npm, yarn classic) or nested under this package's
-  // own node_modules (pnpm's default, non-hoisted layout).
   const require = createRequire(join(packageRoot, 'package.json'))
   try {
     return require.resolve('next/dist/bin/next')
@@ -235,9 +235,32 @@ function resolveNextBin() {
   }
 }
 
-function run(executable, args, cwd) {
+function standaloneAppDir() {
+  return join(appDir, '.next', 'standalone', relative(workspaceRoot, appDir))
+}
+
+function stageStandaloneAssets() {
+  const targetAppDir = standaloneAppDir()
+
+  const staticTarget = join(targetAppDir, '.next', 'static')
+  rmSync(staticTarget, { recursive: true, force: true })
+  cpSync(join(appDir, '.next', 'static'), staticTarget, { recursive: true })
+
+  const publicSource = join(appDir, 'public')
+  const publicTarget = join(targetAppDir, 'public')
+  rmSync(publicTarget, { recursive: true, force: true })
+  if (existsSync(publicSource)) {
+    cpSync(publicSource, publicTarget, { recursive: true })
+  }
+}
+
+function run(executable, args, cwd, onSuccess) {
   const child = spawn(executable, args, { cwd, stdio: 'inherit' })
-  child.on('exit', (code, signal) => process.exit(code ?? (signal ? 1 : 0)))
+  child.on('exit', (code, signal) => {
+    const exitCode = code ?? (signal ? 1 : 0)
+    if (exitCode === 0 && onSuccess) onSuccess()
+    process.exit(exitCode)
+  })
   child.on('error', (error) => fail(error.message))
 }
 
@@ -252,20 +275,20 @@ if (process.argv[1] && realpathSync(process.argv[1]) === fileURLToPath(import.me
   materialize()
 
   if (command === 'start') {
-    // `next.config.mjs` sets `output: 'standalone'`, and a standalone build is
-    // run from its own traced server.js, not `next start` (see docker/Dockerfile
-    // and docker/entrypoint.sh, which run the image's board the same way). The
-    // tracing root is the workspace root (see the module comment on why
-    // `.meith/app` sits exactly two levels below it), so the standalone bundle
-    // preserves that same relative path down to the app directory.
+    const targetAppDir = standaloneAppDir()
     const standaloneRoot = join(appDir, '.next', 'standalone')
-    const serverScript = join(standaloneRoot, relative(workspaceRoot, appDir), 'server.js')
+    const serverScript = join(targetAppDir, 'server.js')
     if (!existsSync(serverScript)) {
       fail(`no standalone build at ${serverScript} — run "forum-web build" first.`)
     }
     run(process.execPath, [serverScript, ...rest], standaloneRoot)
   } else {
     const nextBin = resolveNextBin()
-    run(process.execPath, [nextBin, command, ...rest], appDir)
+    run(
+      process.execPath,
+      [nextBin, command, ...rest],
+      appDir,
+      command === 'build' ? stageStandaloneAssets : undefined,
+    )
   }
 }

package/next.config.mjs

@@ -4,35 +4,22 @@ import { fileURLToPath } from 'node:url'
 
 const here = path.dirname(fileURLToPath(import.meta.url))
 
-// Two directories up from this file's own location — correct whenever this
-// file sits at that fixed depth below the real workspace root: in place at
-// `apps/community` inside this monorepo, or materialized to `.meith/app`
-// inside a *board whose own directory sits two levels below its own
-// `node_modules`* (a create-meith scaffold with hoisted node_modules, per
-// docs/development.md, "Consuming the board from a workspace").
-//
-// `boards/stock` (docker/Dockerfile) is neither: it is a workspace member of
-// *this* monorepo's own pnpm install, which does not hoist, so its real
-// dependencies (including `next` itself) resolve through this repository's
-// root `node_modules`, two directories further up again — a fixed offset
-// this file cannot compute from its own path alone, because pnpm resolves
-// its dependencies through symlinks into a central store rather than by
-// nesting a workspace member two directories below everything it needs.
-// FORUM_WORKSPACE_ROOT lets the Dockerfile say so explicitly, without
-// changing the default for every other consumer this computation already
-// serves correctly.
+/**
+ * Two directories up from this file's own location by default — correct at
+ * the depth every consumer places it at except `boards/stock`, which
+ * `FORUM_WORKSPACE_ROOT` overrides (see docs/architecture.md, "The stock
+ * board"; docs/development.md, "Consuming the board from a workspace").
+ */
 const workspaceRoot = process.env.FORUM_WORKSPACE_ROOT
   ? path.resolve(process.env.FORUM_WORKSPACE_ROOT)
   : path.join(here, '../../')
 
-// How many `../` this file's own directory is below workspaceRoot — 2 by
-// construction in the default case (see above), more when
-// FORUM_WORKSPACE_ROOT points further up. Used below instead of a literal
-// `'../../'` wherever a *relative* climb has to reach the same root, because
-// `outputFileTracingIncludes` (unlike `outputFileTracingRoot` and
-// `turbopack.root`) resolves its globs relative to this directory itself,
-// not against `workspaceRoot` — an absolute glob there silently matches
-// nothing useful once it is rejoined onto this directory downstream.
+/**
+ * The relative equivalent of `workspaceRoot`, for `outputFileTracingIncludes`
+ * below — see docs/development.md, "Consuming the board from a workspace",
+ * for why that option needs a path relative to this file rather than an
+ * absolute one.
+ */
 const upToWorkspaceRoot = path.relative(here, workspaceRoot).split(path.sep).join('/')
 
 const loadedEnvFiles = []
@@ -52,6 +39,10 @@ const nextConfig = {
   poweredByHeader: false,
   distDir: process.env.FORUM_DIST_DIR ?? '.next',
 
+  experimental: {
+    turbopackFileSystemCacheForDev: false,
+  },
+
   serverExternalPackages: [
     '@aws-sdk/client-s3',
     '@aws-sdk/s3-request-presigner',
@@ -62,23 +53,11 @@ const nextConfig = {
     'nodemailer',
   ],
   outputFileTracingRoot: workspaceRoot,
-  // Turbopack infers a project root by walking up for a lockfile, and
-  // otherwise stops at this app's own directory — which for a materialized
-  // app (apps/community/bin/forum-web.mjs) is two directories below the
-  // real one. Left unset, Turbopack's own Node.js transform pool (postcss,
-  // for instance) cannot see the invoking workspace's node_modules at all,
-  // and fails with "Cannot find module" for a dependency that plain Node
-  // resolution finds without trouble.
+  /** See docs/development.md, "Consuming the board from a workspace", for why this is set. */
   turbopack: {
     root: workspaceRoot,
   },
-  // The output-file tracer only follows the CJS half of @swc/helpers' dual
-  // package and misses the `esm/` variant next's own require-hook resolves at
-  // runtime, so the standalone build ships a `@swc/helpers` directory missing
-  // its esm/ half. next resolves the package from its own nested pnpm store
-  // entry (node_modules/.pnpm/next@…/node_modules/@swc/helpers), which is a
-  // symlink into node_modules/.pnpm/@swc+helpers@0.5.23/node_modules/@swc/helpers
-  // — so that is the path that has to be complete, not the app's own copy.
+  /** Works around a gap in Next's own tracing — see docs/development.md, "Consuming the board from a workspace". */
   outputFileTracingIncludes: {
     '/**': [
       `${upToWorkspaceRoot}/node_modules/.pnpm/@swc+helpers@0.5.23/node_modules/@swc/helpers/**/*`,
@@ -87,24 +66,12 @@ const nextConfig = {
   images: {
     unoptimized: true,
   },
-  // Every `@meith/*` package this app's dependency graph reaches — not just
-  // the ones apps/community imports directly. All of them ship TypeScript
-  // source with no build step (see docs/release.md, "They ship TypeScript
-  // source, deliberately"), and inside this monorepo every one of them is
-  // resolved through a tsconfig path alias straight to its source file,
-  // bypassing node_modules — which is why this list used to be a small,
-  // seemingly arbitrary subset: only the packages some other resolution path
-  // happened to touch via node_modules ever needed it here.
-  //
-  // A materialized workspace's own generated tsconfig carries no such alias
-  // map (see apps/community/bin/forum-web.mjs) — only `@board/config` and
-  // `@board/plugins`, the seam itself. Every other `@meith/*` specifier
-  // resolves the ordinary way once this package is npm-installed, which
-  // means every one of them needs this same source-compilation treatment,
-  // or the build fails with "Unknown module type" on its `src/index.ts`.
-  // Computed by walking this app's own imports plus every `@meith/*`
-  // package's own "dependencies" transitively — see docs/development.md,
-  // "Consuming the board from a workspace".
+  /**
+   * Every `@meith/*` package this app's dependency graph reaches, not just the
+   * ones apps/community imports directly — see docs/development.md,
+   * "Consuming the board from a workspace", and docs/release.md, "They ship
+   * TypeScript source, deliberately".
+   */
   transpilePackages: [
     '@meith/accounts',
     '@meith/admin',
@@ -152,12 +119,6 @@ const nextConfig = {
     '@meith/threads',
     '@meith/ui',
     '@meith/upgrade',
-    // Only reached through the `@meith/web/config` subpath, and only from a
-    // materialized workspace's own community.config.ts — inside this
-    // monorepo apps/community never imports itself by package name. Real
-    // once npm resolves this package into another workspace's node_modules,
-    // so it needs the same source-compilation treatment as everything else
-    // in this list.
     '@meith/web',
   ],
   async headers() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/web",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "The board itself: the Next.js app, and the forum-web bin that materializes it into an external board workspace.",
   "license": "LGPL-3.0-or-later",
   "repository": {
@@ -18,6 +18,7 @@
     "bin",
     "app",
     "src",
+    "public",
     "next.config.mjs",
     "postcss.config.mjs",
     "components.json",
@@ -42,52 +43,52 @@
     "typescript": "7.0.2",
     "@types/react": "^19",
     "@types/react-dom": "^19",
-    "@meith/accounts": "0.17.1",
-    "@meith/admin": "0.17.1",
-    "@meith/antispam": "0.17.1",
-    "@meith/api": "0.17.1",
-    "@meith/attachments": "0.17.1",
-    "@meith/authorization": "0.17.1",
-    "@meith/avatars": "0.17.1",
-    "@meith/core": "0.17.1",
-    "@meith/db": "0.17.1",
-    "@meith/demo": "0.17.1",
-    "@meith/drafts": "0.17.1",
-    "@meith/groups": "0.17.1",
-    "@meith/events": "0.17.1",
-    "@meith/drivers": "0.17.1",
-    "@meith/forums": "0.17.1",
-    "@meith/i18n": "0.17.1",
-    "@meith/install": "0.17.1",
-    "@meith/mail": "0.17.1",
-    "@meith/markdown": "0.17.1",
-    "@meith/import": "0.17.1",
-    "@meith/messages": "0.17.1",
-    "@meith/marketplace": "0.17.1",
-    "@meith/notifications": "0.17.1",
-    "@meith/moderation": "0.17.1",
-    "@meith/plugin-dues": "0.17.1",
-    "@meith/plugin-kit": "0.17.1",
-    "@meith/posts": "0.17.1",
-    "@meith/profile-fields": "0.17.1",
-    "@meith/polls": "0.17.1",
-    "@meith/relations": "0.17.1",
-    "@meith/search": "0.17.1",
-    "@meith/reputation": "0.17.1",
-    "@meith/runtime": "0.17.1",
-    "@meith/settings": "0.17.1",
-    "@meith/signatures": "0.17.1",
-    "@meith/subscriptions": "0.17.1",
-    "@meith/tasks": "0.17.1",
-    "@meith/theme-clubhouse": "0.17.1",
-    "@meith/theme-kit": "0.17.1",
-    "@meith/theme-default": "0.17.1",
-    "@meith/theme-midnight": "0.17.1",
-    "@meith/theme-phasebook": "0.17.1",
-    "@meith/theme-raidframe": "0.17.1",
-    "@meith/ui": "0.17.1",
-    "@meith/threads": "0.17.1",
-    "@meith/upgrade": "0.17.1"
+    "@meith/admin": "0.17.2",
+    "@meith/antispam": "0.17.2",
+    "@meith/attachments": "0.17.2",
+    "@meith/api": "0.17.2",
+    "@meith/authorization": "0.17.2",
+    "@meith/accounts": "0.17.2",
+    "@meith/avatars": "0.17.2",
+    "@meith/core": "0.17.2",
+    "@meith/db": "0.17.2",
+    "@meith/events": "0.17.2",
+    "@meith/demo": "0.17.2",
+    "@meith/drivers": "0.17.2",
+    "@meith/forums": "0.17.2",
+    "@meith/groups": "0.17.2",
+    "@meith/i18n": "0.17.2",
+    "@meith/drafts": "0.17.2",
+    "@meith/mail": "0.17.2",
+    "@meith/install": "0.17.2",
+    "@meith/markdown": "0.17.2",
+    "@meith/import": "0.17.2",
+    "@meith/marketplace": "0.17.2",
+    "@meith/moderation": "0.17.2",
+    "@meith/notifications": "0.17.2",
+    "@meith/messages": "0.17.2",
+    "@meith/polls": "0.17.2",
+    "@meith/plugin-dues": "0.17.2",
+    "@meith/posts": "0.17.2",
+    "@meith/plugin-kit": "0.17.2",
+    "@meith/profile-fields": "0.17.2",
+    "@meith/runtime": "0.17.2",
+    "@meith/search": "0.17.2",
+    "@meith/relations": "0.17.2",
+    "@meith/reputation": "0.17.2",
+    "@meith/signatures": "0.17.2",
+    "@meith/settings": "0.17.2",
+    "@meith/subscriptions": "0.17.2",
+    "@meith/tasks": "0.17.2",
+    "@meith/theme-clubhouse": "0.17.2",
+    "@meith/theme-default": "0.17.2",
+    "@meith/theme-kit": "0.17.2",
+    "@meith/theme-midnight": "0.17.2",
+    "@meith/theme-phasebook": "0.17.2",
+    "@meith/theme-raidframe": "0.17.2",
+    "@meith/threads": "0.17.2",
+    "@meith/ui": "0.17.2",
+    "@meith/upgrade": "0.17.2"
   },
   "scripts": {
     "dev": "next dev",

package/public/placeholder-logo.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="215" height="48" fill="none"><path fill="#000" d="M57.588 9.6h6L73.828 38h-5.2l-2.36-6.88h-11.36L52.548 38h-5.2l10.24-28.4Zm7.16 17.16-4.16-12.16-4.16 12.16h8.32Zm23.694-2.24c-.186-1.307-.706-2.32-1.56-3.04-.853-.72-1.866-1.08-3.04-1.08-1.68 0-2.986.613-3.92 1.84-.906 1.227-1.36 2.947-1.36 5.16s.454 3.933 1.36 5.16c.934 1.227 2.24 1.84 3.92 1.84 1.254 0 2.307-.373 3.16-1.12.854-.773 1.387-1.867 1.6-3.28l5.12.24c-.186 1.68-.733 3.147-1.64 4.4-.906 1.227-2.08 2.173-3.52 2.84-1.413.667-2.986 1-4.72 1-2.08 0-3.906-.453-5.48-1.36-1.546-.907-2.76-2.2-3.64-3.88-.853-1.68-1.28-3.627-1.28-5.84 0-2.24.427-4.187 1.28-5.84.88-1.68 2.094-2.973 3.64-3.88 1.574-.907 3.4-1.36 5.48-1.36 1.68 0 3.227.32 4.64.96 1.414.64 2.56 1.56 3.44 2.76.907 1.2 1.454 2.6 1.64 4.2l-5.12.28Zm11.486-7.72.12 3.4c.534-1.227 1.307-2.173 2.32-2.84 1.04-.693 2.267-1.04 3.68-1.04 1.494 0 2.76.387 3.8 1.16 1.067.747 1.827 1.813 2.28 3.2.507-1.44 1.294-2.52 2.36-3.24 1.094-.747 2.414-1.12 3.96-1.12 1.414 0 2.64.307 3.68.92s1.84 1.52 2.4 2.72c.56 1.2.84 2.667.84 4.4V38h-4.96V25.92c0-1.813-.293-3.187-.88-4.12-.56-.96-1.413-1.44-2.56-1.44-.906 0-1.68.213-2.32.64-.64.427-1.133 1.053-1.48 1.88-.32.827-.48 1.84-.48 3.04V38h-4.56V25.92c0-1.2-.133-2.213-.4-3.04-.24-.827-.626-1.453-1.16-1.88-.506-.427-1.133-.64-1.88-.64-.906 0-1.68.227-2.32.68-.64.427-1.133 1.053-1.48 1.88-.32.827-.48 1.827-.48 3V38h-4.96V16.8h4.48Zm26.723 10.6c0-2.24.427-4.187 1.28-5.84.854-1.68 2.067-2.973 3.64-3.88 1.574-.907 3.4-1.36 5.48-1.36 1.84 0 3.494.413 4.96 1.24 1.467.827 2.64 2.08 3.52 3.76.88 1.653 1.347 3.693 1.4 6.12v1.32h-15.08c.107 1.813.614 3.227 1.52 4.24.907.987 2.134 1.48 3.68 1.48.987 0 1.88-.253 2.68-.76a4.803 4.803 0 0 0 1.84-2.2l5.08.36c-.64 2.027-1.84 3.64-3.6 4.84-1.733 1.173-3.733 1.76-6 1.76-2.08 0-3.906-.453-5.48-1.36-1.573-.907-2.786-2.2-3.64-3.88-.853-1.68-1.28-3.627-1.28-5.84Zm15.16-2.04c-.213-1.733-.76-3.013-1.64-3.84-.853-.827-1.893-1.24-3.12-1.24-1.44 0-2.6.453-3.48 1.36-.88.88-1.44 2.12-1.68 3.72h9.92ZM163.139 9.6V38h-5.04V9.6h5.04Zm8.322 7.2.24 5.88-.64-.36c.32-2.053 1.094-3.56 2.32-4.52 1.254-.987 2.787-1.48 4.6-1.48 2.32 0 4.107.733 5.36 2.2 1.254 1.44 1.88 3.387 1.88 5.84V38h-4.96V25.92c0-1.253-.12-2.28-.36-3.08-.24-.8-.64-1.413-1.2-1.84-.533-.427-1.253-.64-2.16-.64-1.44 0-2.573.48-3.4 1.44-.8.933-1.2 2.307-1.2 4.12V38h-4.96V16.8h4.48Zm30.003 7.72c-.186-1.307-.706-2.32-1.56-3.04-.853-.72-1.866-1.08-3.04-1.08-1.68 0-2.986.613-3.92 1.84-.906 1.227-1.36 2.947-1.36 5.16s.454 3.933 1.36 5.16c.934 1.227 2.24 1.84 3.92 1.84 1.254 0 2.307-.373 3.16-1.12.854-.773 1.387-1.867 1.6-3.28l5.12.24c-.186 1.68-.733 3.147-1.64 4.4-.906 1.227-2.08 2.173-3.52 2.84-1.413.667-2.986 1-4.72 1-2.08 0-3.906-.453-5.48-1.36-1.546-.907-2.76-2.2-3.64-3.88-.853-1.68-1.28-3.627-1.28-5.84 0-2.24.427-4.187 1.28-5.84.88-1.68 2.094-2.973 3.64-3.88 1.574-.907 3.4-1.36 5.48-1.36 1.68 0 3.227.32 4.64.96 1.414.64 2.56 1.56 3.44 2.76.907 1.2 1.454 2.6 1.64 4.2l-5.12.28Zm11.443 8.16V38h-5.6v-5.32h5.6Z"/><path fill="#171717" fill-rule="evenodd" d="m7.839 40.783 16.03-28.054L20 6 0 40.783h7.839Zm8.214 0H40L27.99 19.894l-4.02 7.032 3.976 6.914H20.02l-3.967 6.943Z" clip-rule="evenodd"/></svg>

package/public/placeholder.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1200" height="1200" fill="none"><rect width="1200" height="1200" fill="#EAEAEA" rx="3"/><g opacity=".5"><g opacity=".5"><path fill="#FAFAFA" d="M600.709 736.5c-75.454 0-136.621-61.167-136.621-136.62 0-75.454 61.167-136.621 136.621-136.621 75.453 0 136.62 61.167 136.62 136.621 0 75.453-61.167 136.62-136.62 136.62Z"/><path stroke="#C9C9C9" stroke-width="2.418" d="M600.709 736.5c-75.454 0-136.621-61.167-136.621-136.62 0-75.454 61.167-136.621 136.621-136.621 75.453 0 136.62 61.167 136.62 136.621 0 75.453-61.167 136.62-136.62 136.62Z"/></g><path stroke="url(#a)" stroke-width="2.418" d="M0-1.209h553.581" transform="scale(1 -1) rotate(45 1163.11 91.165)"/><path stroke="url(#b)" stroke-width="2.418" d="M404.846 598.671h391.726"/><path stroke="url(#c)" stroke-width="2.418" d="M599.5 795.742V404.017"/><path stroke="url(#d)" stroke-width="2.418" d="m795.717 796.597-391.441-391.44"/><path fill="#fff" d="M600.709 656.704c-31.384 0-56.825-25.441-56.825-56.824 0-31.384 25.441-56.825 56.825-56.825 31.383 0 56.824 25.441 56.824 56.825 0 31.383-25.441 56.824-56.824 56.824Z"/><g clip-path="url(#e)"><path fill="#666" fill-rule="evenodd" d="M616.426 586.58h-31.434v16.176l3.553-3.554.531-.531h9.068l.074-.074 8.463-8.463h2.565l7.18 7.181V586.58Zm-15.715 14.654 3.698 3.699 1.283 1.282-2.565 2.565-1.282-1.283-5.2-5.199h-6.066l-5.514 5.514-.073.073v2.876a2.418 2.418 0 0 0 2.418 2.418h26.598a2.418 2.418 0 0 0 2.418-2.418v-8.317l-8.463-8.463-7.181 7.181-.071.072Zm-19.347 5.442v4.085a6.045 6.045 0 0 0 6.046 6.045h26.598a6.044 6.044 0 0 0 6.045-6.045v-7.108l1.356-1.355-1.282-1.283-.074-.073v-17.989h-38.689v23.43l-.146.146.146.147Z" clip-rule="evenodd"/></g><path stroke="#C9C9C9" stroke-width="2.418" d="M600.709 656.704c-31.384 0-56.825-25.441-56.825-56.824 0-31.384 25.441-56.825 56.825-56.825 31.383 0 56.824 25.441 56.824 56.825 0 31.383-25.441 56.824-56.824 56.824Z"/></g><defs><linearGradient id="a" x1="554.061" x2="-.48" y1=".083" y2=".087" gradientUnits="userSpaceOnUse"><stop stop-color="#C9C9C9" stop-opacity="0"/><stop offset=".208" stop-color="#C9C9C9"/><stop offset=".792" stop-color="#C9C9C9"/><stop offset="1" stop-color="#C9C9C9" stop-opacity="0"/></linearGradient><linearGradient id="b" x1="796.912" x2="404.507" y1="599.963" y2="599.965" gradientUnits="userSpaceOnUse"><stop stop-color="#C9C9C9" stop-opacity="0"/><stop offset=".208" stop-color="#C9C9C9"/><stop offset=".792" stop-color="#C9C9C9"/><stop offset="1" stop-color="#C9C9C9" stop-opacity="0"/></linearGradient><linearGradient id="c" x1="600.792" x2="600.794" y1="403.677" y2="796.082" gradientUnits="userSpaceOnUse"><stop stop-color="#C9C9C9" stop-opacity="0"/><stop offset=".208" stop-color="#C9C9C9"/><stop offset=".792" stop-color="#C9C9C9"/><stop offset="1" stop-color="#C9C9C9" stop-opacity="0"/></linearGradient><linearGradient id="d" x1="404.85" x2="796.972" y1="403.903" y2="796.02" gradientUnits="userSpaceOnUse"><stop stop-color="#C9C9C9" stop-opacity="0"/><stop offset=".208" stop-color="#C9C9C9"/><stop offset=".792" stop-color="#C9C9C9"/><stop offset="1" stop-color="#C9C9C9" stop-opacity="0"/></linearGradient><clipPath id="e"><path fill="#fff" d="M581.364 580.535h38.689v38.689h-38.689z"/></clipPath></defs></svg>

package/public/sw.js

@@ -0,0 +1,81 @@
+const FALLBACK_HREF = '/notifications'
+
+function readPayload(event) {
+  if (!event.data) return null
+
+  try {
+    const payload = event.data.json()
+    if (payload === null || typeof payload !== 'object') return null
+    if (typeof payload.title !== 'string' || payload.title === '') return null
+    return payload
+  } catch (_error) {
+    return null
+  }
+}
+
+function fallbackUrl() {
+  return new URL(FALLBACK_HREF, self.location.origin).href
+}
+
+function targetUrl(href) {
+  const wanted = typeof href === 'string' && href !== '' ? href : FALLBACK_HREF
+
+  try {
+    const url = new URL(wanted, self.location.origin)
+    return url.origin === self.location.origin ? url.href : fallbackUrl()
+  } catch (_error) {
+    return fallbackUrl()
+  }
+}
+
+self.addEventListener('install', () => {
+  self.skipWaiting()
+})
+
+self.addEventListener('activate', (event) => {
+  event.waitUntil(self.clients.claim())
+})
+
+self.addEventListener('push', (event) => {
+  const payload = readPayload(event)
+  if (payload === null) return
+
+  const options = {
+    body: typeof payload.body === 'string' ? payload.body : '',
+    tag: typeof payload.id === 'number' ? `meith-${payload.id}` : 'meith',
+    data: { href: targetUrl(payload.href) },
+    icon: '/apple-icon.png',
+    badge: '/icon-light-32x32.png',
+    timestamp: Date.now(),
+  }
+
+  if (typeof payload.badge === 'number' && 'setAppBadge' in navigator) {
+    navigator.setAppBadge(payload.badge).catch(() => {})
+  }
+
+  event.waitUntil(self.registration.showNotification(payload.title, options))
+})
+
+self.addEventListener('notificationclick', (event) => {
+  event.notification.close()
+
+  const href = targetUrl(event.notification.data && event.notification.data.href)
+
+  event.waitUntil(
+    self.clients
+      .matchAll({ type: 'window', includeUncontrolled: true })
+      .then((clients) => {
+        for (const client of clients) {
+          if (client.url === href && 'focus' in client) return client.focus()
+        }
+
+        const open = clients[0]
+        if (open !== undefined && 'navigate' in open) {
+          return open.focus().then(() => open.navigate(href))
+        }
+
+        return self.clients.openWindow(href)
+      })
+      .catch(() => self.clients.openWindow(href)),
+  )
+})

package/src/server/admin-settings-actions.ts

@@ -62,16 +62,16 @@ export async function saveAdminSettingsAction(
     if (result.changed.length > 0) {
       const tags = [CacheTags.settings(), ...result.invalidates]
       await drivers().cache.invalidateTags(tags)
-      for (const tag of tags) await emitEvent('cache.invalidated', { tag }, {})
-
       revalidatePath('/admin/settings')
 
-      await emitEvent('settings.saved', { keys: result.changed }, { adminId: admin.session.userId })
-
-      await recordAdminAction({
-        action: 'settings.changed',
-        detail: { keys: result.changed },
-      })
+      await Promise.all([
+        ...tags.map((tag) => emitEvent('cache.invalidated', { tag }, {})),
+        emitEvent('settings.saved', { keys: result.changed }, { adminId: admin.session.userId }),
+        recordAdminAction({
+          action: 'settings.changed',
+          detail: { keys: result.changed },
+        }),
+      ])
     }
 
     return { notice: result.changed.length === 0 ? 'unchanged' : 'saved' }

package/src/server/upgrade-notice.ts

@@ -6,7 +6,7 @@ import { planUpgrade, type UpgradeState, upgradeNotice } from '@meith/upgrade'
 
 import { activeDefinitions } from './plugin-host'
 
-export const CODE_VERSION = '0.17.1'
+export const CODE_VERSION = '0.17.2'
 
 export async function pendingUpgradeNotice(): Promise<string | null> {
   if (env.DATA_SOURCE !== 'postgres') return null

package/src/server/user-admin-actions.ts

@@ -179,26 +179,26 @@ export async function banMemberAction(_prev: FormState, form: FormData): Promise
       ...(expiresAt === undefined ? {} : { expiresAt }),
     })
 
-    await emitEvent(
-      'user.banned',
-      { userId: id, expiresAt: expiresAt?.toISOString() ?? null },
-      { moderatorId: context.session.userId, reason: trimmedText(form, 'reason') || null },
-    )
-
     refreshMemberScreens()
-    await recordAdminAction({
-      action: 'user.banned',
-      detail: { userId: id, days: days === '' ? null : Number(days) },
-    })
 
-    return {
-      notice: 'banned',
-      undo: await issueAdminUndo({
+    const [, undo] = await Promise.all([
+      emitEvent(
+        'user.banned',
+        { userId: id, expiresAt: expiresAt?.toISOString() ?? null },
+        { moderatorId: context.session.userId, reason: trimmedText(form, 'reason') || null },
+      ),
+      issueAdminUndo({
         actorUserId: context.session.userId,
         operation: 'user.ban',
         snapshot: { userId: id },
       }),
-    }
+      recordAdminAction({
+        action: 'user.banned',
+        detail: { userId: id, days: days === '' ? null : Number(days) },
+      }),
+    ])
+
+    return { notice: 'banned', undo }
   } catch (err) {
     return toFormState(err)
   }
@@ -556,14 +556,16 @@ export async function liftBanAction(_prev: FormState, form: FormData): Promise<F
 
     await banService().lift(id)
 
-    await emitEvent(
-      'user.unbanned',
-      { userId: id, expired: false },
-      { moderatorId: context.session.userId, reason: null },
-    )
-
     refreshMemberScreens()
-    await recordAdminAction({ action: 'user.ban_lifted', detail: { userId: id } })
+
+    await Promise.all([
+      emitEvent(
+        'user.unbanned',
+        { userId: id, expired: false },
+        { moderatorId: context.session.userId, reason: null },
+      ),
+      recordAdminAction({ action: 'user.ban_lifted', detail: { userId: id } }),
+    ])
 
     return { notice: 'lifted' }
   } catch (err) {

package/src/server/user-admin.ts

@@ -118,13 +118,14 @@ export async function buildMemberView(userId: number): Promise<MemberView | null
 
   const prefix = member.lastIpPrefix ?? member.registrationIpPrefix ?? ''
 
-  return {
-    member,
-    secondaryGroupIds: await repository.readSecondaryGroups(userId),
-    groups: await repository.listGroups(),
-    activeBan: await bans.findActive(userId),
-    sharedNetwork: await repository.sharingIpPrefix(prefix, userId),
-  }
+  const [secondaryGroupIds, groups, activeBan, sharedNetwork] = await Promise.all([
+    repository.readSecondaryGroups(userId),
+    repository.listGroups(),
+    bans.findActive(userId),
+    repository.sharingIpPrefix(prefix, userId),
+  ])
+
+  return { member, secondaryGroupIds, groups, activeBan, sharedNetwork }
 }
 
 export function requireUserBulk(): PostgresUserBulkRepository {