@meith/web 0.31.0 → 0.33.0

package/src/theme/contract.fixture.ts

@@ -147,10 +147,23 @@ export const SLOT_FIXTURES: { readonly [K in SlotName]?: SlotFixture<K> } = {
       boardTitle: 'The Bike Shed',
       homeHref: '/',
       viewer: VIEWER,
-      navigation: [{ label: 'Unanswered', href: '/discover/unanswered' }],
+      navigation: [
+        { label: 'Unanswered', href: '/discover/unanswered' },
+        {
+          label: 'Community',
+          href: '/community',
+          submenu: [{ label: 'Rules', href: '/community/rules' }],
+        },
+      ],
       children: region('user-panel'),
     },
-    requires: ['The Bike Shed', region('user-panel'), '/discover/unanswered'],
+    requires: [
+      'The Bike Shed',
+      region('user-panel'),
+      '/discover/unanswered',
+      '/community/rules',
+      'Rules',
+    ],
   },
 
   UserPanel: {
@@ -331,8 +344,18 @@ export const SLOT_FIXTURES: { readonly [K in SlotName]?: SlotFixture<K> } = {
   },
 
   ThreadRow: {
-    model: { thread: { ...THREAD, visibility: 'deleted' }, select: null },
-    requires: ['Bikeshedding the bike shed', '/thread/91-bikeshedding', '27', 'data-visibility'],
+    model: {
+      thread: { ...THREAD, visibility: 'deleted' },
+      select: null,
+      regions: { pluginBadges: pluginRegion('threadrow-badges') },
+    },
+    requires: [
+      'Bikeshedding the bike shed',
+      '/thread/91-bikeshedding',
+      '27',
+      'data-visibility',
+      pluginRegion('threadrow-badges'),
+    ],
   },
 
   SubforumList: {
@@ -351,13 +374,19 @@ export const SLOT_FIXTURES: { readonly [K in SlotName]?: SlotFixture<K> } = {
       forum: { label: 'General discussion', href: '/f/3-general' },
       replyHref: '/thread/91-bikeshedding/reply',
       markReadAction: '/thread/91-bikeshedding/mark-read',
+      watch: { subscribed: true, action: '/thread/91-bikeshedding/unwatch' },
       regions: {
         posts: region('posts'),
         pagination: region('pagination'),
         quickReply: region('quick-reply'),
       },
     },
-    requires: ['Bikeshedding the bike shed', region('posts'), region('pagination')],
+    requires: [
+      'Bikeshedding the bike shed',
+      '/thread/91-bikeshedding/unwatch',
+      region('posts'),
+      region('pagination'),
+    ],
   },
 
   PostBit: {
@@ -417,6 +446,7 @@ export const SLOT_FIXTURES: { readonly [K in SlotName]?: SlotFixture<K> } = {
       buttons: [
         {
           tag: 'bold',
+          insertion: null,
           label: 'Bold',
           title: 'Bold (Ctrl+B)',
           keyShortcut: 'Control+b',
@@ -425,6 +455,7 @@ export const SLOT_FIXTURES: { readonly [K in SlotName]?: SlotFixture<K> } = {
         },
         {
           tag: 'link',
+          insertion: null,
           label: 'Link',
           title: 'Link',
           keyShortcut: null,

package/src/view/account-copy.ts

@@ -48,6 +48,10 @@ export function optionsFormCopy(
         'accountForm.options.pageSizeHint',
         'accountForm.options.invisible',
         'accountForm.options.invisibleHint',
+        'accountForm.options.autoWatchOwnThreads',
+        'accountForm.options.autoWatchOwnThreadsHint',
+        'accountForm.options.autoWatchRepliedThreads',
+        'accountForm.options.autoWatchRepliedThreadsHint',
         'accountForm.options.submit',
       ],
       t,
@@ -286,6 +290,36 @@ export function activityDetailLabel(
   return t.t('accountForm.activity.detail', { at, device, address })
 }
 
+export function feedTokenCopy(t: Translator = untranslated()): Readonly<Record<string, string>> {
+  return copyFor(
+    [
+      'accountForm.feed.title',
+      'accountForm.feed.blurb',
+      'accountForm.feed.none',
+      'accountForm.feed.active',
+      'accountForm.feed.generate',
+      'accountForm.feed.regenerate',
+      'accountForm.feed.revoke',
+      'accountForm.feed.copyNow',
+      'accountForm.feed.revealHint',
+      'accountForm.feed.rssLabel',
+      'accountForm.feed.atomLabel',
+      'accountForm.feed.warning',
+      'form.working',
+    ],
+    t,
+  )
+}
+
+export function feedTokenDetailLabel(
+  created: string,
+  lastUsed: string | null,
+  t: Translator = untranslated(),
+): string {
+  const used = lastUsed === null ? t.t('accountForm.feed.neverUsed') : lastUsed
+  return t.t('accountForm.feed.detail', { created, used })
+}
+
 export function notificationFormsCopy(
   t: Translator = untranslated(),
 ): Readonly<Record<string, string>> {
@@ -304,6 +338,11 @@ export function notificationFormsCopy(
       'accountForm.announcements.description',
       'accountForm.announcements.blurb',
       'accountForm.announcements.submit',
+      'accountForm.boardDigest.legend',
+      'accountForm.boardDigest.description',
+      'accountForm.boardDigest.weekly',
+      'accountForm.boardDigest.monthly',
+      'accountForm.boardDigest.submit',
       'accountForm.push.heading',
       'accountForm.push.subscribe',
       'accountForm.push.unsubscribe',

package/src/view/admin-copy.ts

@@ -61,8 +61,10 @@ export function forumAdminCopy(t: Translator = untranslated()): Readonly<Record<
         'adminForum.permGroup.moderation',
         'adminForum.permGroup.attachments',
         'adminForum.permGroup.approvals',
+        'adminForum.permGroup.numeric',
         'adminForum.permGroup.other',
-        'adminForum.inheritsAll',
+        'adminForum.permission',
+        'adminForum.saveMatrix',
         'adminForum.unsavedChanges',
         'adminForum.copied',
         'adminForum.copyNote',
@@ -102,14 +104,7 @@ export function forumAdminCopy(t: Translator = untranslated()): Readonly<Record<
       t,
     ),
     ...patternCopy(
-      [
-        'adminForum.perm.setHere',
-        'adminForum.perm.inheritedDefault',
-        'adminForum.perm.inheritedFrom',
-        'adminForum.saveGroup',
-        'adminForum.copyTo',
-        'adminForum.overridesSet',
-      ],
+      ['adminForum.perm.inheritedDefault', 'adminForum.perm.inheritedFrom', 'adminForum.copyTo'],
       t,
     ),
   }

package/src/view/admin-nav.ts

@@ -104,6 +104,12 @@ export const ADMIN_SECTIONS: PanelNav = [
     icon: 'tokens',
     blurbKey: 'adminNav.admin-api-tokens.blurb',
   },
+  {
+    href: '/admin/webhooks',
+    titleKey: 'adminNav.admin-webhooks.title',
+    icon: 'subscriptions',
+    blurbKey: 'adminNav.admin-webhooks.blurb',
+  },
   {
     href: '/admin/system',
     titleKey: 'adminNav.admin-system.title',

package/src/view/admin-panel-copy.ts

@@ -15,7 +15,12 @@ export function adminFormsCopy(t: Translator = untranslated()): Readonly<Record<
         'adminPanel.reason.default',
         'adminPanel.password',
         'adminPanel.twoFactorCode',
-        'adminPanel.twoFactorCodeHint',
+        'adminPanel.twoFactor.title',
+        'adminPanel.twoFactor.lede',
+        'adminPanel.twoFactor.recoveryHint',
+        'adminPanel.twoFactor.recoveryHintExhausted',
+        'adminPanel.twoFactor.submit',
+        'adminPanel.twoFactor.cancel',
         'adminPanel.enter',
         'adminPanel.leave',
       ],
@@ -47,6 +52,29 @@ export function apiTokenFormsCopy(
   )
 }
 
+export function webhookFormsCopy(t: Translator = untranslated()): Readonly<Record<string, string>> {
+  return copyFor(
+    [
+      'adminPanel.webhook.copyNow',
+      'adminPanel.webhook.url',
+      'adminPanel.webhook.urlPlaceholder',
+      'adminPanel.webhook.urlHint',
+      'adminPanel.webhook.topics',
+      'adminPanel.webhook.topicsHint',
+      'adminPanel.webhook.format',
+      'adminPanel.webhook.formatHint',
+      'adminPanel.webhook.format.json',
+      'adminPanel.webhook.format.discord',
+      'adminPanel.webhook.active',
+      'adminPanel.webhook.create',
+      'adminPanel.webhook.enable',
+      'adminPanel.webhook.disable',
+      'adminPanel.webhook.delete',
+    ],
+    t,
+  )
+}
+
 export function systemFormsCopy(t: Translator = untranslated()): Readonly<Record<string, string>> {
   return {
     ...copyFor(

package/src/view/attachments.ts

@@ -1,4 +1,8 @@
-import { type AttachmentRecord, attachmentType } from '@meith/attachments/types'
+import {
+  type AttachmentRecord,
+  type AttachmentStatus,
+  attachmentType,
+} from '@meith/attachments/types'
 import type { PostAttachmentModel } from '@meith/theme-kit'
 
 export function formatBytes(bytes: number): string {
@@ -33,6 +37,34 @@ export function attachmentModel(record: AttachmentRecord): PostAttachmentModel |
   }
 }
 
+export interface EditableAttachment {
+  readonly id: number
+  readonly filename: string
+  readonly size: string
+  readonly status: AttachmentStatus
+  readonly isImage: boolean
+  readonly href: string | null
+  readonly thumbnailHref: string | null
+}
+
+export function editableAttachment(record: AttachmentRecord): EditableAttachment {
+  const ready = record.status === 'ready' && record.storageKey !== null
+  const type = attachmentType(record.contentType)
+
+  return {
+    id: record.id,
+    filename: record.filename,
+    size: formatBytes(record.sizeBytes),
+    status: record.status,
+    isImage: ready && type?.inline === true,
+    href: ready ? attachmentHref(record.id) : null,
+    thumbnailHref:
+      ready && type?.inline === true && record.thumbnailKey !== null
+        ? thumbnailHref(record.id)
+        : null,
+  }
+}
+
 export function attachmentsByPost(
   records: readonly AttachmentRecord[],
 ): ReadonlyMap<number, readonly PostAttachmentModel[]> {

package/src/view/board-index.ts

@@ -64,6 +64,26 @@ function toLastPost(
   }
 }
 
+export interface ForumRowHydration {
+  readonly lastPost: LastPostModel | null
+  readonly isUnread: boolean
+}
+
+export function hydrateForumRow(
+  row: ForumListingRow,
+  ownThreadsOnly: boolean,
+  unreadForumIds: ReadonlySet<number> | undefined,
+  now: Date,
+  t: Translator | undefined,
+  identities: ReadonlyMap<number, MemberIdentity> | undefined,
+  wordFilter: CompiledWordFilter | undefined,
+): ForumRowHydration {
+  return {
+    lastPost: ownThreadsOnly ? null : toLastPost(row, now, t, identities, wordFilter),
+    isUnread: !ownThreadsOnly && (unreadForumIds?.has(row.id) ?? false),
+  }
+}
+
 function toForumRow(
   node: ForumNode<ForumListingRow>,
   now: Date,
@@ -74,6 +94,15 @@ function toForumRow(
   wordFilter: CompiledWordFilter | undefined,
 ): ForumRowModel {
   const ownThreadsOnly = ownThreadsOnlyForumIds?.has(node.id) ?? false
+  const hydration = hydrateForumRow(
+    node,
+    ownThreadsOnly,
+    unreadForumIds,
+    now,
+    t,
+    identities,
+    wordFilter,
+  )
 
   return {
     id: node.id,
@@ -83,8 +112,8 @@ 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, wordFilter),
-    isUnread: !ownThreadsOnly && (unreadForumIds?.has(node.id) ?? false),
+    lastPost: hydration.lastPost,
+    isUnread: hydration.isUnread,
     subforums: node.children.map(
       (child): LinkModel => ({ label: child.title, href: hrefFor(child) }),
     ),

package/src/view/board-title.ts

@@ -0,0 +1 @@
+export const BOARD_TITLE = 'Meith'

package/src/view/content-copy.ts

@@ -28,18 +28,25 @@ export function replyFormCopy(t: Translator = untranslated()): Readonly<Record<s
 }
 
 export function editPostFormCopy(t: Translator = untranslated()): Readonly<Record<string, string>> {
-  return copyFor(
-    [
-      'composer.edit.reason',
-      'composer.edit.submit',
-      'composer.edit.delete',
-      'composer.edit.deleteBlurb',
-      'composer.edit.restore',
-      'composer.edit.restoreBlurb',
-      'composer.preview',
-    ],
-    t,
-  )
+  return {
+    ...copyFor(
+      [
+        'composer.edit.reason',
+        'composer.edit.submit',
+        'composer.edit.delete',
+        'composer.edit.deleteBlurb',
+        'composer.edit.restore',
+        'composer.edit.restoreBlurb',
+        'composer.edit.attachments',
+        'composer.edit.remove',
+        'composer.edit.attachmentProcessing',
+        'composer.edit.attachmentFailed',
+        'composer.preview',
+      ],
+      t,
+    ),
+    ...patternCopy(['composer.edit.removeAttachment'], t),
+  }
 }
 
 export function newThreadFormCopy(
@@ -63,7 +70,10 @@ export function newThreadFormCopy(
         'composer.newThread.pollChoicesHint',
         'composer.newThread.pollRevote',
         'composer.newThread.pollPublic',
+        'composer.newThread.morePollOptions',
         'composer.newThread.submit',
+        'pollEdit.closesAt',
+        'pollEdit.closesAtHint',
       ],
       t,
     ),

package/src/view/copy.ts

@@ -23,6 +23,10 @@ export function patternCopy(
 const CHROME_KEYS = [
   'form.working',
   'form.notSaved',
+  'confirm.confirm',
+  'confirm.cancel',
+  'confirm.heading',
+  'notice.dismiss',
   'composer.message',
   'composer.tabs',
   'composer.write',
@@ -36,37 +40,48 @@ const CHROME_KEYS = [
   'composer.tool.italic',
   'composer.tool.strikethrough',
   'composer.tool.link',
+  'composer.tool.image',
   'composer.tool.quote',
   'composer.tool.code',
   'composer.tool.bulletedList',
   'composer.tool.numberedList',
+  'composer.tool.taskList',
   'composer.tool.heading',
+  'composer.tool.table',
   'composer.tool.spoiler',
   'composer.tool.attachment',
   'composer.placeholder.bold',
   'composer.placeholder.italic',
   'composer.placeholder.struck',
   'composer.placeholder.spoiler',
+  'composer.placeholder.image',
+  'composer.placeholder.table',
   'composer.help.summary',
   'composer.help.bold',
   'composer.help.italic',
   'composer.help.struck',
   'composer.help.link',
+  'composer.help.image',
   'composer.help.codeInline',
   'composer.help.codeBlock',
   'composer.help.quote',
   'composer.help.list',
+  'composer.help.taskList',
   'composer.help.heading',
+  'composer.help.table',
   'composer.help.note',
   'composer.help.spoiler',
   'composer.help.mention',
   'composer.help.attachment',
   'composer.attachments.label',
+  'composer.attachments.remove',
   'composer.mention.suggestions',
+  'composer.recipient.suggestions',
   'composer.attachment.uploading',
   'composer.thanks.thanked',
   'composer.thanks.thanks',
   'composer.multiquote.button',
+  'composer.multiquote.tooltip',
   'composer.multiquote.addToReply',
   'composer.multiquote.adding',
   'composer.multiquote.clear',
@@ -75,8 +90,10 @@ const CHROME_KEYS = [
 ] as const
 
 const CHROME_PATTERN_KEYS = [
+  'composer.mention.available',
   'composer.toolShortcut',
   'composer.attachments.hint',
+  'composer.attachments.removeChosen',
   'composer.thanks.count',
   'composer.multiquote.selectedToQuote',
   'composer.multiquote.added',

package/src/view/discovery-view.ts

@@ -9,6 +9,7 @@ import { filterWords } from './word-filter'
 export const DISCOVERY_LABELS = {
   new: { labelKey: 'discovery.new.label', blurbKey: 'discovery.new.blurb' },
   today: { labelKey: 'discovery.today.label', blurbKey: 'discovery.today.blurb' },
+  unread: { labelKey: 'discovery.unread.label', blurbKey: 'discovery.unread.blurb' },
   mine: { labelKey: 'discovery.mine.label', blurbKey: 'discovery.mine.blurb' },
   participated: {
     labelKey: 'discovery.participated.label',
@@ -59,7 +60,7 @@ export function buildDiscoveryView(input: {
     rows: input.rows.map((row) => ({
       threadId: row.threadId,
       title: filterWords(row.title, input.wordFilter),
-      href: `/thread/${row.threadId}-${row.slug}`,
+      href: `/thread/${row.threadId}-${row.slug}${input.view === 'unread' ? '?goto=unread' : ''}`,
       forum: { label: row.forumTitle, href: `/${row.forumId}-${row.forumSlug}` },
       authorUsername: row.authorUsername,
       replyCount: count(row.replyCount, input.t),

package/src/view/drafts.ts

@@ -0,0 +1,45 @@
+import type { DraftSummary } from '@meith/drafts'
+import type { Translator } from '@meith/i18n'
+import type { TimeModel } from '@meith/theme-kit'
+
+import { copyFor } from './copy'
+import { formatTime, untranslated } from './time'
+
+export function draftsPageCopy(t: Translator = untranslated()): Readonly<Record<string, string>> {
+  return copyFor(['draftsPage.delete'], t)
+}
+
+export interface DraftRowView {
+  readonly key: string
+  readonly kind: 'thread' | 'reply'
+  readonly kindLabel: string
+  readonly targetName: string
+  readonly resumeHref: string
+  readonly forumId: number
+  readonly threadId: number | null
+  readonly updatedAt: TimeModel
+}
+
+export function buildDraftsView(input: {
+  readonly drafts: readonly DraftSummary[]
+  readonly now: Date
+  readonly t?: Translator
+}): readonly DraftRowView[] {
+  const t = input.t ?? untranslated()
+
+  return input.drafts.map((draft) => {
+    const isReply = draft.threadId !== null
+    return {
+      key: isReply ? `thread:${draft.threadId}` : `forum:${draft.forumId}`,
+      kind: isReply ? 'reply' : 'thread',
+      kindLabel: t.t(isReply ? 'draftsPage.kind.reply' : 'draftsPage.kind.thread'),
+      targetName: isReply ? (draft.threadTitle ?? draft.forumTitle) : draft.forumTitle,
+      resumeHref: isReply
+        ? `/thread/${draft.threadId}-${draft.threadSlug}/reply`
+        : `/${draft.forumId}-${draft.forumSlug}/new`,
+      forumId: draft.forumId,
+      threadId: draft.threadId,
+      updatedAt: formatTime(draft.updatedAt, input.now, t),
+    }
+  })
+}

package/src/view/editor-toolbar.ts

@@ -32,6 +32,12 @@ const TOOLS: readonly ToolSpec[] = [
     placeholderKey: 'composer.placeholder.struck',
   },
   { tag: 'link', key: 'composer.tool.link', shortcut: 'k', placeholderKey: null },
+  {
+    tag: 'image',
+    key: 'composer.tool.image',
+    shortcut: null,
+    placeholderKey: 'composer.placeholder.image',
+  },
   { tag: 'quote', key: 'composer.tool.quote', shortcut: null, placeholderKey: null },
   { tag: 'code', key: 'composer.tool.code', shortcut: null, placeholderKey: null },
   {
@@ -42,13 +48,21 @@ const TOOLS: readonly ToolSpec[] = [
   },
   { tag: 'bulletedList', key: 'composer.tool.bulletedList', shortcut: null, placeholderKey: null },
   { tag: 'numberedList', key: 'composer.tool.numberedList', shortcut: null, placeholderKey: null },
+  { tag: 'taskList', key: 'composer.tool.taskList', shortcut: null, placeholderKey: null },
   { tag: 'heading', key: 'composer.tool.heading', shortcut: null, placeholderKey: null },
+  {
+    tag: 'table',
+    key: 'composer.tool.table',
+    shortcut: null,
+    placeholderKey: 'composer.placeholder.table',
+  },
 ]
 
 function button(spec: ToolSpec, t: Translator): EditorToolbarButtonModel {
   const label = t.t(spec.key)
   return {
     tag: spec.tag,
+    insertion: null,
     label,
     icon: null,
     title:

package/src/view/forum-display.ts

@@ -11,7 +11,7 @@ import type {
 } from '@meith/theme-kit'
 import type { ReadState, ThreadListingRow, ThreadPage } from '@meith/threads'
 
-import { forumHref } from './board-index'
+import { forumHref, hydrateForumRow } from './board-index'
 import { count } from './count'
 import { type MemberIdentity, nameClassOf } from './member-identity'
 import { memberHref } from './member-profile'
@@ -53,9 +53,22 @@ function lastPost(
 function forum(
   row: ForumListingRow,
   ownThreadsOnlyForumIds: ReadonlySet<number> | undefined,
+  unreadForumIds: ReadonlySet<number> | undefined,
+  now: Date,
   t: Translator | undefined,
+  identities: ReadonlyMap<number, MemberIdentity> | undefined,
+  wordFilter: CompiledWordFilter | undefined,
 ): ForumRowModel {
   const ownThreadsOnly = ownThreadsOnlyForumIds?.has(row.id) ?? false
+  const hydration = hydrateForumRow(
+    row,
+    ownThreadsOnly,
+    unreadForumIds,
+    now,
+    t,
+    identities,
+    wordFilter,
+  )
   return {
     id: row.id,
     title: row.title,
@@ -64,8 +77,8 @@ function forum(
     type: row.type,
     threadCount: count(ownThreadsOnly ? 0 : row.threadCount, t),
     postCount: count(ownThreadsOnly ? 0 : row.postCount, t),
-    lastPost: null,
-    isUnread: false,
+    lastPost: hydration.lastPost,
+    isUnread: hydration.isUnread,
     subforums: [],
   }
 }
@@ -87,7 +100,7 @@ export function threadRowModel(
   return {
     id: row.id,
     title: filterWords(row.title, wordFilter),
-    href: threadHref(row),
+    href: isUnread ? `${threadHref(row)}?goto=unread` : threadHref(row),
     prefix: row.prefix,
     author: {
       userId: row.authorUserId,
@@ -115,7 +128,7 @@ export interface ForumDisplayInput {
   readonly nextHref: string | null
   readonly pagination?: PaginationModel
   readonly newThreadHref?: string | null
-  readonly readState?: Pick<ReadState, 'forumReadAt' | 'threadLastPostId'> | null
+  readonly readState?: Pick<ReadState, 'forumReadAt' | 'threadLastPostId' | 'unreadForumIds'> | null
   readonly markReadAction?: string | null
   readonly now: Date
   readonly t?: Translator
@@ -131,9 +144,18 @@ export interface ForumDisplayView {
 }
 
 export function buildForumDisplayView(input: ForumDisplayInput): ForumDisplayView {
+  const unreadForumIds = input.readState?.unreadForumIds
   return {
     display: {
-      forum: forum(input.forum, input.ownThreadsOnlyForumIds, input.t),
+      forum: forum(
+        input.forum,
+        input.ownThreadsOnlyForumIds,
+        unreadForumIds,
+        input.now,
+        input.t,
+        input.identities,
+        input.wordFilter,
+      ),
       newThreadHref: input.newThreadHref ?? null,
       markReadAction: input.markReadAction ?? null,
     },
@@ -141,7 +163,17 @@ export function buildForumDisplayView(input: ForumDisplayInput): ForumDisplayVie
       input.subforums.length === 0
         ? null
         : {
-            forums: input.subforums.map((row) => forum(row, input.ownThreadsOnlyForumIds, input.t)),
+            forums: input.subforums.map((row) =>
+              forum(
+                row,
+                input.ownThreadsOnlyForumIds,
+                unreadForumIds,
+                input.now,
+                input.t,
+                input.identities,
+                input.wordFilter,
+              ),
+            ),
           },
     threads: input.page.rows.map((row) =>
       threadRowModel(