@meith/web 0.21.2 → 0.23.0

package/src/server/thread-core.ts

@@ -126,7 +126,12 @@ export async function submitThread(
       message: draft.body,
       prefixId: draft.prefixId,
       subscribe: input.subscribe ?? false,
-      heldAsNewMember: await holdsNewMember({ actor, postCount: profile.postCount, settings }),
+      heldAsNewMember: await holdsNewMember({
+        actor,
+        postCount: profile.postCount,
+        target: scope,
+        settings,
+      }),
       requiresApproval: scope.forum.requiresThreadApproval === true,
       ...(input.poll === undefined
         ? {}

package/src/server/two-factor-actions.ts

@@ -146,11 +146,6 @@ export async function disableTwoFactorAction(_prev: FormState, form: FormData):
   redirect('/usercp/security?factor=off')
 }
 
-/**
- * Weakening an account asks for the thing being weakened. An account with a
- * password gives it; one without — signed in by a provider or a passkey —
- * gives a current code instead, which proves the same possession.
- */
 async function assertStillThem(input: {
   readonly userId: number
   readonly hasPassword: boolean

package/src/server/two-factor.ts

@@ -32,11 +32,6 @@ export function twoFactorService(): TwoFactorService | null {
   })
 }
 
-/**
- * Offered when the board says so and the board has a key to seal a secret
- * with. Without AUTH_SECRET there is nowhere safe to put the secret, so the
- * surface is hidden rather than half-built.
- */
 export async function twoFactorOffered(): Promise<boolean> {
   if (getContainer().dataSource !== 'postgres') return false
   if (twoFactorService() === null) return false
@@ -49,7 +44,6 @@ export async function twoFactorRequiredForStaff(): Promise<boolean> {
   return (await getSettingsUncached()).get('security.two_factor_required_for_staff')
 }
 
-/** Whether this member must hold a second factor, and may not drop it. */
 export async function secondFactorPosture(userId: number | null): Promise<SecondFactorPosture> {
   const offered = await twoFactorOffered()
   if (!offered || userId === null) return { offered, required: false }

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.21.2'
+export const CODE_VERSION = '0.23.0'
 
 export async function pendingUpgradeNotice(): Promise<string | null> {
   if (env.DATA_SOURCE !== 'postgres') return null

package/src/view/account-copy.ts

@@ -297,6 +297,11 @@ export function notificationFormsCopy(
       'accountForm.notifications.push',
       'accountForm.notifications.blurb',
       'accountForm.notifications.submit',
+      'accountForm.announcements.legend',
+      'accountForm.announcements.title',
+      'accountForm.announcements.description',
+      'accountForm.announcements.blurb',
+      'accountForm.announcements.submit',
       'accountForm.push.heading',
       'accountForm.push.subscribe',
       'accountForm.push.unsubscribe',

package/src/view/admin-ban-filter-copy.ts

@@ -0,0 +1,34 @@
+import type { Translator } from '@meith/i18n'
+
+import { adminSharedCopy } from './admin-copy'
+import { copyFor, patternCopy } from './copy'
+import { untranslated } from './time'
+
+export const BAN_FILTER_TYPE_KEY = {
+  username: 'adminBanFilters.type.username',
+  email: 'adminBanFilters.type.email',
+  ip: 'adminBanFilters.type.ip',
+} as const
+
+export function banFilterAdminCopy(
+  t: Translator = untranslated(),
+): Readonly<Record<string, string>> {
+  return {
+    ...adminSharedCopy(t),
+    ...copyFor(
+      [
+        'adminBanFilter.type',
+        'adminBanFilter.typeHint',
+        'adminBanFilter.pattern',
+        'adminBanFilter.patternHint',
+        'adminBanFilter.patternPlaceholder',
+        'adminBanFilter.note',
+        'adminBanFilter.noteHint',
+        'adminBanFilter.addFilter',
+        'adminBanFilter.added',
+      ],
+      t,
+    ),
+    ...patternCopy(['adminBanFilter.removeFilter'], t),
+  }
+}

package/src/view/admin-nav.ts

@@ -57,6 +57,10 @@ export const ADMIN_SECTIONS: PanelNav = [
     children: [
       { href: '/admin/users/mail', titleKey: 'adminNav.admin-users-mail.title' },
       { href: '/admin/users/prune', titleKey: 'adminNav.admin-users-prune.title' },
+      {
+        href: '/admin/users/ban-filters',
+        titleKey: 'adminNav.admin-users-ban-filters.title',
+      },
     ],
   },
   {

package/src/view/auth-copy.ts

@@ -34,6 +34,8 @@ export function registerFormCopy(
         'authForm.register.password',
         'authForm.register.honeypot',
         'authForm.register.challengeHint',
+        'authForm.register.announcements',
+        'authForm.register.announcementsHint',
         'authForm.register.submit',
       ],
       t,

package/src/view/board-index.ts

@@ -1,5 +1,6 @@
 import { buildTree, type ForumListingRow, type ForumNode, keepVisibleSubtrees } from '@meith/forums'
 import type { Translator } from '@meith/i18n'
+import type { CompiledWordFilter } from '@meith/markdown'
 import type {
   BoardIndexModel,
   CategoryBlockModel,
@@ -13,6 +14,7 @@ import { type MemberIdentity, nameClassOf } from './member-identity'
 import { memberHref } from './member-profile'
 import { postLink } from './post-link'
 import { formatTime } from './time'
+import { filterWords } from './word-filter'
 
 export interface BoardIndexInput {
   readonly rows: readonly ForumListingRow[]
@@ -23,6 +25,7 @@ export interface BoardIndexInput {
   readonly now: Date
   readonly t?: Translator
   readonly identities?: ReadonlyMap<number, MemberIdentity>
+  readonly wordFilter?: CompiledWordFilter | undefined
 }
 
 export function forumHref(row: { id: number; slug: string }): string {
@@ -43,12 +46,13 @@ function toLastPost(
   now: Date,
   t: Translator | undefined,
   identities: ReadonlyMap<number, MemberIdentity> | undefined,
+  wordFilter: CompiledWordFilter | undefined,
 ): LastPostModel | null {
   const last = row.lastPost
   if (last === null) return null
 
   return {
-    threadTitle: last.threadTitle,
+    threadTitle: filterWords(last.threadTitle, wordFilter),
     href: threadHref(last.threadId, last.postId),
     author: {
       userId: last.userId,
@@ -67,6 +71,7 @@ function toForumRow(
   unreadForumIds: ReadonlySet<number> | undefined,
   identities: ReadonlyMap<number, MemberIdentity> | undefined,
   ownThreadsOnlyForumIds: ReadonlySet<number> | undefined,
+  wordFilter: CompiledWordFilter | undefined,
 ): ForumRowModel {
   const ownThreadsOnly = ownThreadsOnlyForumIds?.has(node.id) ?? false
 
@@ -78,7 +83,7 @@ function toForumRow(
     type: node.type,
     threadCount: count(ownThreadsOnly ? 0 : node.threadCount, t),
     postCount: count(ownThreadsOnly ? 0 : node.postCount, t),
-    lastPost: ownThreadsOnly ? null : toLastPost(node, now, t, identities),
+    lastPost: ownThreadsOnly ? null : toLastPost(node, now, t, identities, wordFilter),
     isUnread: !ownThreadsOnly && (unreadForumIds?.has(node.id) ?? false),
     subforums: node.children.map(
       (child): LinkModel => ({ label: child.title, href: hrefFor(child) }),
@@ -127,6 +132,7 @@ export function buildSectionView(input: SectionInput): BoardIndexBlock | null {
       input.unreadForumIds,
       input.identities,
       input.ownThreadsOnlyForumIds,
+      input.wordFilter,
     )
 
   return { block: { category: row(node) }, forums: node.children.map(row) }
@@ -150,6 +156,7 @@ export function buildBoardIndexView(input: BoardIndexInput): BoardIndexView {
           input.unreadForumIds,
           input.identities,
           input.ownThreadsOnlyForumIds,
+          input.wordFilter,
         ),
       },
       forums: node.children.map((child) =>
@@ -160,6 +167,7 @@ export function buildBoardIndexView(input: BoardIndexInput): BoardIndexView {
           input.unreadForumIds,
           input.identities,
           input.ownThreadsOnlyForumIds,
+          input.wordFilter,
         ),
       ),
     })),

package/src/view/board-latest.ts

@@ -70,7 +70,7 @@ function authorOf(
 
 export function buildLatestThreadsModel(input: LatestInput<LatestThreadRow>): LatestThreadsModel {
   const threads: LatestThreadModel[] = input.rows.map((row) => ({
-    title: row.title,
+    title: filterWords(row.title, input.wordFilter),
     href: `/thread/${row.threadId}-${row.slug}`,
     forum: {
       label: row.forumTitle,
@@ -86,7 +86,7 @@ export function buildLatestThreadsModel(input: LatestInput<LatestThreadRow>): La
 
 export function buildLatestPostsModel(input: LatestInput<LatestPostRow>): LatestPostsModel {
   const posts: LatestPostModel[] = input.rows.map((row) => ({
-    threadTitle: row.threadTitle,
+    threadTitle: filterWords(row.threadTitle, input.wordFilter),
     href: postHref(row),
     forum: {
       label: row.forumTitle,

package/src/view/discovery-view.ts

@@ -1,8 +1,10 @@
 import type { Translator } from '@meith/i18n'
+import type { CompiledWordFilter } from '@meith/markdown'
 import type { DiscoveryViewModel } from '@meith/theme-kit'
 
 import { count } from './count'
 import { formatTime, untranslated } from './time'
+import { filterWords } from './word-filter'
 
 export const DISCOVERY_LABELS = {
   new: { labelKey: 'discovery.new.label', blurbKey: 'discovery.new.blurb' },
@@ -40,6 +42,7 @@ export function buildDiscoveryView(input: {
   readonly refusalMessage?: string | null | undefined
   readonly now: Date
   readonly t?: Translator | undefined
+  readonly wordFilter?: CompiledWordFilter | undefined
 }): DiscoveryViewModel {
   const refusal = input.refusalMessage ?? null
   const t = input.t ?? untranslated()
@@ -55,7 +58,7 @@ export function buildDiscoveryView(input: {
     })),
     rows: input.rows.map((row) => ({
       threadId: row.threadId,
-      title: row.title,
+      title: filterWords(row.title, input.wordFilter),
       href: `/thread/${row.threadId}-${row.slug}`,
       forum: { label: row.forumTitle, href: `/${row.forumId}-${row.forumSlug}` },
       authorUsername: row.authorUsername,

package/src/view/editor-toolbar.ts

@@ -62,7 +62,6 @@ function button(spec: ToolSpec, t: Translator): EditorToolbarButtonModel {
 
 export interface EditorToolbarInput {
   readonly textareaId?: string
-  /** Whether this composer takes attachments. Defaults to `false`. */
   readonly attachments?: boolean
   readonly t?: Translator
 }

package/src/view/forum-display.ts

@@ -1,5 +1,6 @@
 import type { ForumListingRow } from '@meith/forums'
 import type { Translator } from '@meith/i18n'
+import type { CompiledWordFilter } from '@meith/markdown'
 import type {
   ForumDisplayModel,
   ForumRowModel,
@@ -16,6 +17,7 @@ import { type MemberIdentity, nameClassOf } from './member-identity'
 import { memberHref } from './member-profile'
 import { postLink } from './post-link'
 import { formatTime } from './time'
+import { filterWords } from './word-filter'
 
 export function threadHref(row: ThreadListingRow): string {
   return `/thread/${row.id}-${row.slug}`
@@ -32,10 +34,11 @@ function lastPost(
   now: Date,
   t: Translator | undefined,
   identities: ReadonlyMap<number, MemberIdentity> | undefined,
+  wordFilter: CompiledWordFilter | undefined,
 ): LastPostModel | null {
   if (!post) return null
   return {
-    threadTitle: thread.title,
+    threadTitle: filterWords(thread.title, wordFilter),
     href: postLink(threadHref(thread), post.postId),
     author: {
       userId: post.userId,
@@ -73,6 +76,7 @@ export function threadRowModel(
   readState: Pick<ReadState, 'forumReadAt' | 'threadLastPostId'> | null = null,
   t?: Translator,
   identities?: ReadonlyMap<number, MemberIdentity>,
+  wordFilter?: CompiledWordFilter | undefined,
 ): ThreadRowModel {
   const last = row.lastPost
   const isUnread =
@@ -82,7 +86,7 @@ export function threadRowModel(
     last.at > (readState.forumReadAt.get(row.forumId) ?? new Date(0))
   return {
     id: row.id,
-    title: row.title,
+    title: filterWords(row.title, wordFilter),
     href: threadHref(row),
     prefix: row.prefix,
     author: {
@@ -97,7 +101,7 @@ export function threadRowModel(
     isLocked: row.isLocked,
     isUnread,
     isMoved: row.isMoved,
-    lastPost: lastPost(row.lastPost, row, now, t, identities),
+    lastPost: lastPost(row.lastPost, row, now, t, identities, wordFilter),
   }
 }
 
@@ -115,6 +119,7 @@ export interface ForumDisplayInput {
   readonly now: Date
   readonly t?: Translator
   readonly identities?: ReadonlyMap<number, MemberIdentity>
+  readonly wordFilter?: CompiledWordFilter | undefined
 }
 
 export interface ForumDisplayView {
@@ -138,7 +143,14 @@ export function buildForumDisplayView(input: ForumDisplayInput): ForumDisplayVie
             forums: input.subforums.map((row) => forum(row, input.ownThreadsOnlyForumIds, input.t)),
           },
     threads: input.page.rows.map((row) =>
-      threadRowModel(row, input.now, input.readState ?? null, input.t, input.identities),
+      threadRowModel(
+        row,
+        input.now,
+        input.readState ?? null,
+        input.t,
+        input.identities,
+        input.wordFilter,
+      ),
     ),
     pagination: input.pagination ?? {
       page: input.pageNumber,

package/src/view/navigation.ts

@@ -67,10 +67,6 @@ export function defaultNavigationItems(): readonly NavigationItemRow[] {
   }))
 }
 
-/**
- * What a plugin called an item, for the rows the board holds on its behalf.
- * Keyed by the same `plugin.<plugin>.<item>` the row carries.
- */
 export interface NavigationName {
   readonly label: string
   readonly labelKey: string | null

package/src/view/notification-menu.ts

@@ -13,14 +13,12 @@ export type NotificationMenuTabKind = 'notifications' | 'messages' | 'mod'
 
 export interface NotificationMenuRow {
   readonly key: string
-  /** The id a mark-seen form submits, or `null` for a row that is acted on elsewhere. */
   readonly seenId: number | null
   readonly subject: string
   readonly meta: string | null
   readonly href: string | null
   readonly at: TimeModel
   readonly isUnread: boolean
-  /** A short category label shown before the subject, or `null`. */
   readonly tag: string | null
 }
 

package/src/view/notifications.ts

@@ -77,6 +77,7 @@ export function notificationNotice(
   },
   t: Translator = untranslated(),
 ): string | null {
+  if (query.saved === 'announcements') return t.t('notice.announcementsSaved')
   if (query.saved !== undefined) return t.t('notice.preferencesSaved')
   if (query.read === 'all') return t.t('notice.allRead')
   if (query.read === 'one') return t.t('notice.markedRead')

package/src/view/pager.ts

@@ -15,12 +15,6 @@ export type Cursor = Readonly<Record<string, string>>
 export interface PagerInput {
   readonly path: string
   readonly params: QueryParams
-  /**
-   * The query parameters the cursor owns. They are rewritten on every step and
-   * never carried forward from the current address, which is what keeps a
-   * two-part cursor — a rank and an id — from being half of one page and half
-   * of the next.
-   */
   readonly cursorParams: readonly string[]
   readonly nextCursor: Cursor | null
   readonly pageSize?: number

package/src/view/panel-nav.ts

@@ -12,7 +12,6 @@ import { untranslated } from './time'
 export interface PanelSubsection {
   readonly href: string
   readonly titleKey?: string
-  /** Set instead of `titleKey` where the name is data, such as a plugin's. */
   readonly titleText?: string
   readonly record?: boolean
 }

package/src/view/post-form.ts

@@ -1,8 +1,10 @@
 import type { Translator } from '@meith/i18n'
+import type { CompiledWordFilter } from '@meith/markdown'
 import type { PostFormModel } from '@meith/theme-kit'
 
 import { postLink } from './post-link'
 import { untranslated } from './time'
+import { filterWords } from './word-filter'
 
 export interface PostFormInput {
   readonly forum: { readonly id: number; readonly title: string; readonly slug: string }
@@ -26,6 +28,7 @@ export interface ReplyViewInput {
   readonly thread: { readonly id: number; readonly title: string; readonly slug: string }
   readonly errorMessage?: string | null
   readonly t?: Translator
+  readonly wordFilter?: CompiledWordFilter | undefined
 }
 
 export function buildReplyView(input: ReplyViewInput): Omit<PostFormModel, 'regions'> {
@@ -33,7 +36,7 @@ export function buildReplyView(input: ReplyViewInput): Omit<PostFormModel, 'regi
 
   return {
     mode: 'reply',
-    heading: t.t('postForm.reply', { thread: input.thread.title }),
+    heading: t.t('postForm.reply', { thread: filterWords(input.thread.title, input.wordFilter) }),
     cancelHref: `/thread/${input.thread.id}-${input.thread.slug}`,
     cancelLabel: t.t('postForm.backToThread'),
     errorMessage: input.errorMessage ?? null,

package/src/view/presence.ts

@@ -1,10 +1,12 @@
 import type { Translator } from '@meith/i18n'
+import type { CompiledWordFilter } from '@meith/markdown'
 import type { BoardStatsModel, OnlineMemberModel, WhoIsOnlineModel } from '@meith/theme-kit'
 
 import { count } from './count'
 import { type MemberIdentity, nameClassOf } from './member-identity'
 import { memberHref } from './member-profile'
 import { formatTime, untranslated } from './time'
+import { filterWords } from './word-filter'
 
 export interface OnlineRow {
   readonly userId: number
@@ -26,15 +28,17 @@ export interface OnlineInput {
   readonly now: Date
   readonly t?: Translator | undefined
   readonly identities?: ReadonlyMap<number, MemberIdentity>
+  readonly wordFilter?: CompiledWordFilter | undefined
 }
 
 export function locationOf(
   row: OnlineRow,
   t: Translator = untranslated(),
+  wordFilter?: CompiledWordFilter | undefined,
 ): { label: string; href: string | null } {
   if (row.threadId !== null && row.threadTitle !== null) {
     return {
-      label: t.t('presence.reading', { title: row.threadTitle }),
+      label: t.t('presence.reading', { title: filterWords(row.threadTitle, wordFilter) }),
       href: `/thread/${row.threadId}-${row.threadSlug ?? ''}`,
     }
   }
@@ -52,7 +56,7 @@ export function buildWhoIsOnlineModel(input: OnlineInput): WhoIsOnlineModel {
     username: row.username,
     profileHref: memberHref(row.userId),
     nameClass: nameClassOf(input.identities, row.userId),
-    location: locationOf(row, input.t ?? untranslated()),
+    location: locationOf(row, input.t ?? untranslated(), input.wordFilter),
     isInvisible: row.invisible,
     lastSeen: formatTime(row.lastSeenAt, input.now, input.t),
   }))

package/src/view/search-results.ts

@@ -78,7 +78,7 @@ export function buildSearchResultsView(input: SearchResultsInput): SearchResults
     searchedAt: formatTime(input.createdAt, input.now, input.t),
     hits: input.hits.map((hit) => ({
       postId: hit.postId,
-      threadTitle: hit.threadTitle,
+      threadTitle: filterWords(hit.threadTitle, input.wordFilter),
       href: postLink(`/thread/${hit.threadId}-${hit.threadSlug}`, hit.postId),
       excerptHtml: filterWords(hit.excerpt, input.wordFilter),
       authorUsername: hit.authorUsername,

package/src/view/security-activity.ts

@@ -30,11 +30,6 @@ export function authEventLabel(kind: string, t: Translator = untranslated()): st
   return key === undefined ? kind.replace(/_/g, ' ') : t.t(key)
 }
 
-/**
- * Enough of a user-agent string for a member to tell one of their own devices
- * from another, and no more: the full string is a fingerprint, and this is a
- * page whose job is recognition, not identification.
- */
 export function describeDevice(userAgent: string | null, t: Translator = untranslated()): string {
   const unknown = t.t('device.unknown')
   if (userAgent === null || userAgent.trim() === '') return unknown

package/src/view/subscriptions.ts

@@ -1,9 +1,11 @@
 import type { Translator } from '@meith/i18n'
+import type { CompiledWordFilter } from '@meith/markdown'
 import type { SubscriptionMode, SubscriptionRow } from '@meith/subscriptions'
 import { MODE_LABELS, SUBSCRIPTION_MODES } from '@meith/subscriptions'
 import type { TimeModel } from '@meith/theme-kit'
 
 import { formatTime, untranslated } from './time'
+import { filterWords } from './word-filter'
 
 export interface SubscriptionRowView {
   readonly key: string
@@ -28,8 +30,9 @@ export function buildSubscriptionsView(input: {
   readonly rows: readonly SubscriptionRow[]
   readonly now: Date
   readonly t?: Translator
+  readonly wordFilter?: CompiledWordFilter | undefined
 }): SubscriptionsView {
-  const rows = input.rows.map((row) => toRow(row, input.now, input.t))
+  const rows = input.rows.map((row) => toRow(row, input.now, input.t, input.wordFilter))
 
   return {
     threads: rows.filter((row) => row.target === 'thread'),
@@ -39,12 +42,17 @@ export function buildSubscriptionsView(input: {
   }
 }
 
-function toRow(row: SubscriptionRow, now: Date, t: Translator | undefined): SubscriptionRowView {
+function toRow(
+  row: SubscriptionRow,
+  now: Date,
+  t: Translator | undefined,
+  wordFilter: CompiledWordFilter | undefined,
+): SubscriptionRowView {
   return {
     key: `${row.target}:${row.targetId}`,
     target: row.target,
     targetId: row.targetId,
-    title: row.title,
+    title: row.target === 'thread' ? filterWords(row.title, wordFilter) : row.title,
     href: row.href,
     mode: row.mode,
     modeLabel: MODE_LABELS[row.mode],
@@ -70,6 +78,7 @@ export function unsubscribeNotice(
   done: string | undefined,
   t: Translator = untranslated(),
 ): string | null {
+  if (done === 'announcements') return t.t('subscription.announcementsOff')
   if (done === 'email') return t.t('subscription.emailsOff')
   if (done === 'one') return t.t('subscription.doneOne')
   return null

package/src/view/thread-view.ts

@@ -245,7 +245,7 @@ export interface ThreadView {
 export function buildThreadView(input: ThreadViewInput): ThreadView {
   return {
     view: {
-      thread: threadRowModel(input.thread, input.now, null, input.t),
+      thread: threadRowModel(input.thread, input.now, null, input.t, undefined, input.wordFilter),
       forum: { label: input.forum.title, href: forumHref(input.forum) },
       replyHref: input.replyHref ?? null,
       markReadAction: input.markReadAction ?? null,

package/src/view/two-factor.ts

@@ -1,6 +1 @@
-/**
- * The form-state key the fresh recovery codes travel back under. It lives here
- * rather than beside the action because a `'use server'` module may export
- * nothing but async functions, and the client component needs to read it.
- */
 export const RECOVERY_CODES_FIELD = 'recoveryCodes'

package/src/view/usercp.ts

@@ -59,9 +59,7 @@ export function availableTimezones(): readonly string[] {
   if (typeof supported === 'function') {
     try {
       return supported('timeZone')
-    } catch {
-      /* ignore */
-    }
+    } catch {}
   }
 
   return FALLBACK_TIMEZONES