@meith/web 0.23.1 → 0.23.3

package/src/components/moderation/thread-tools-form.tsx

@@ -11,36 +11,6 @@ import { type Copy, fromCopy } from '../shell/copy'
 const BUTTON =
   'inline-flex h-8 items-center rounded-md border border-border px-3 text-xs font-medium hover:opacity-90 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ring'
 
-function ToolButton({
-  threadId,
-  tool,
-  label,
-  destructive,
-}: {
-  threadId: number
-  tool: string
-  label: string
-  destructive?: boolean
-}) {
-  const [state, action] = useActionState(threadToolAction, EMPTY_STATE)
-
-  return (
-    <form action={action} className="inline">
-      <FormError message={state.error} />
-      <input type="hidden" name="threadId" value={threadId} />
-      <input type="hidden" name="tool" value={tool} />
-      <button
-        type="submit"
-        className={
-          destructive === true ? `${BUTTON} border-destructive/40 text-destructive` : BUTTON
-        }
-      >
-        {label}
-      </button>
-    </form>
-  )
-}
-
 export interface MoveOption {
   readonly id: number
   readonly title: string
@@ -65,73 +35,83 @@ export function ThreadToolsForm({
   copy: Copy
   children?: React.ReactNode
 }) {
-  const [moveState, moveAction] = useActionState(threadToolAction, EMPTY_STATE)
+  const [state, action] = useActionState(threadToolAction, EMPTY_STATE)
 
   return (
     <section
       aria-label={heading}
-      className="flex flex-wrap items-center gap-3 rounded-lg border border-border bg-secondary px-4 py-3"
+      className="flex flex-col gap-2 rounded-lg border border-border bg-secondary px-4 py-3"
     >
-      <span className="text-xs font-medium text-muted-foreground">{heading}</span>
-
-      {rights.lock && (
-        <ToolButton
-          threadId={threadId}
-          tool={isLocked ? 'unlock' : 'lock'}
-          label={
-            isLocked
-              ? fromCopy(copy, 'moderationForm.tool.unlock')
-              : fromCopy(copy, 'moderationForm.tool.lock')
-          }
-        />
-      )}
-      {rights.stick && (
-        <ToolButton
-          threadId={threadId}
-          tool={isSticky ? 'unstick' : 'stick'}
-          label={
-            isSticky
-              ? fromCopy(copy, 'moderationForm.tool.unpin')
-              : fromCopy(copy, 'moderationForm.tool.pin')
-          }
-        />
-      )}
-      {rights.delete && (
-        <ToolButton
-          threadId={threadId}
-          tool="delete"
-          label={fromCopy(copy, 'moderationForm.tool.deleteThread')}
-          destructive
-        />
-      )}
+      <div className="flex flex-wrap items-center gap-3">
+        <span className="text-xs font-medium text-muted-foreground">{heading}</span>
 
-      {rights.move && moveTargets.length > 0 && (
-        <form action={moveAction} className="flex items-center gap-2">
-          <FormError message={moveState.error} />
+        <form action={action} className="flex flex-wrap items-center gap-3">
           <input type="hidden" name="threadId" value={threadId} />
-          <label className="flex items-center gap-2 text-xs">
-            <span className="sr-only">{fromCopy(copy, 'moderationForm.moveTo')}</span>
-            <select
-              name="toForumId"
-              className="h-8 rounded-md border border-border bg-background px-2 text-xs focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ring"
+
+          {rights.lock && (
+            <button
+              type="submit"
+              name="tool"
+              value={isLocked ? 'unlock' : 'lock'}
+              className={BUTTON}
+            >
+              {isLocked
+                ? fromCopy(copy, 'moderationForm.tool.unlock')
+                : fromCopy(copy, 'moderationForm.tool.lock')}
+            </button>
+          )}
+          {rights.stick && (
+            <button
+              type="submit"
+              name="tool"
+              value={isSticky ? 'unstick' : 'stick'}
+              className={BUTTON}
             >
-              {moveTargets.map((forum) => (
-                <option key={forum.id} value={forum.id}>
-                  {forum.title}
-                </option>
-              ))}
-            </select>
-          </label>
-          <button type="submit" name="tool" value="move" className={BUTTON}>
-            {fromCopy(copy, 'moderationForm.tool.move')}
-          </button>
-          <button type="submit" name="tool" value="copy" className={BUTTON}>
-            {fromCopy(copy, 'moderationForm.tool.copy')}
-          </button>
+              {isSticky
+                ? fromCopy(copy, 'moderationForm.tool.unpin')
+                : fromCopy(copy, 'moderationForm.tool.pin')}
+            </button>
+          )}
+          {rights.delete && (
+            <button
+              type="submit"
+              name="tool"
+              value="delete"
+              className={`${BUTTON} border-destructive/40 text-destructive`}
+            >
+              {fromCopy(copy, 'moderationForm.tool.deleteThread')}
+            </button>
+          )}
+
+          {rights.move && moveTargets.length > 0 && (
+            <span className="flex items-center gap-2">
+              <label className="flex items-center gap-2 text-xs">
+                <span className="sr-only">{fromCopy(copy, 'moderationForm.moveTo')}</span>
+                <select
+                  name="toForumId"
+                  className="h-8 rounded-md border border-border bg-background px-2 text-xs focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-ring"
+                >
+                  {moveTargets.map((forum) => (
+                    <option key={forum.id} value={forum.id}>
+                      {forum.title}
+                    </option>
+                  ))}
+                </select>
+              </label>
+              <button type="submit" name="tool" value="move" className={BUTTON}>
+                {fromCopy(copy, 'moderationForm.tool.move')}
+              </button>
+              <button type="submit" name="tool" value="copy" className={BUTTON}>
+                {fromCopy(copy, 'moderationForm.tool.copy')}
+              </button>
+            </span>
+          )}
         </form>
-      )}
 
-      {children}
+        {children}
+      </div>
+
+      <FormError message={state.error} />
     </section>
   )
 }

package/src/server/marketplace-admin.ts

@@ -93,12 +93,12 @@ export interface MarketplaceCatalogView {
 function installSteps(kind: ListingKind, packageName: string): readonly string[] {
   return kind === 'plugin'
     ? [
-        `pnpm add ${packageName} --filter @meith/web`,
+        `npm install ${packageName}`,
         `community plugin:add ${packageName}`,
         'Rebuild and redeploy for it to take effect.',
       ]
     : [
-        `pnpm add ${packageName} --filter @meith/web`,
+        `npm install ${packageName}`,
         'Register it in community.config.ts (and set it as defaultTheme if it should be the board default).',
         'Rebuild and redeploy for it to take effect.',
       ]

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

package/src/theme/contract.fixture.ts

@@ -326,8 +326,8 @@ export const SLOT_FIXTURES: { readonly [K in SlotName]?: SlotFixture<K> } = {
   },
 
   ThreadRow: {
-    model: { thread: THREAD, select: null },
-    requires: ['Bikeshedding the bike shed', '/thread/91-bikeshedding', '27'],
+    model: { thread: { ...THREAD, visibility: 'deleted' }, select: null },
+    requires: ['Bikeshedding the bike shed', '/thread/91-bikeshedding', '27', 'data-visibility'],
   },
 
   SubforumList: {

package/src/view/account-copy.ts

@@ -1,5 +1,6 @@
 import type { Translator } from '@meith/i18n'
 
+import { otpFieldCopy } from './auth-copy'
 import { copyFor, splitAround } from './copy'
 import { untranslated } from './time'
 
@@ -201,6 +202,7 @@ export function twoFactorFormsCopy(
     'accountForm.twoFactor.codes': t.t('accountForm.twoFactor.codes', {
       count: recoveryCodesLeft,
     }),
+    ...otpFieldCopy(t),
   }
 }
 

package/src/view/admin-copy.ts

@@ -55,6 +55,14 @@ export function forumAdminCopy(t: Translator = untranslated()): Readonly<Record<
         'adminForum.perm.grant',
         'adminForum.perm.deny',
         'adminForum.perm.ancestor',
+        'adminForum.permGroup.viewing',
+        'adminForum.permGroup.posting',
+        'adminForum.permGroup.ownContent',
+        'adminForum.permGroup.moderation',
+        'adminForum.permGroup.attachments',
+        'adminForum.permGroup.approvals',
+        'adminForum.permGroup.other',
+        'adminForum.inheritsAll',
         'adminForum.copied',
         'adminForum.copyNote',
         'adminForum.topLevel',
@@ -99,6 +107,7 @@ export function forumAdminCopy(t: Translator = untranslated()): Readonly<Record<
         'adminForum.perm.inheritedFrom',
         'adminForum.saveGroup',
         'adminForum.copyTo',
+        'adminForum.overridesSet',
       ],
       t,
     ),

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

@@ -1,6 +1,7 @@
 import type { Translator } from '@meith/i18n'
 
 import { adminSharedCopy } from './admin-copy'
+import { otpFieldCopy } from './auth-copy'
 import { copyFor, patternCopy, splitAround } from './copy'
 import { untranslated } from './time'
 
@@ -21,6 +22,7 @@ export function adminFormsCopy(t: Translator = untranslated()): Readonly<Record<
       t,
     ),
     ...patternCopy(['adminPanel.idleNote'], t),
+    ...otpFieldCopy(t),
   }
 }
 

package/src/view/auth-copy.ts

@@ -79,19 +79,26 @@ export function resendVerificationFormCopy(
   return copyFor(['authForm.email', 'authForm.resend.submit'], t)
 }
 
+export function otpFieldCopy(t: Translator = untranslated()): Readonly<Record<string, string>> {
+  return copyFor(['otp.recoveryLabel', 'otp.useApp', 'otp.useRecovery'], t)
+}
+
 export function secondFactorFormCopy(
   t: Translator = untranslated(),
 ): Readonly<Record<string, string>> {
-  return copyFor(
-    [
-      'authForm.secondFactor.code',
-      'authForm.secondFactor.recoveryHint',
-      'authForm.secondFactor.recoveryHintExhausted',
-      'authForm.secondFactor.submit',
-      'authForm.secondFactor.cancel',
-    ],
-    t,
-  )
+  return {
+    ...copyFor(
+      [
+        'authForm.secondFactor.code',
+        'authForm.secondFactor.recoveryHint',
+        'authForm.secondFactor.recoveryHintExhausted',
+        'authForm.secondFactor.submit',
+        'authForm.secondFactor.cancel',
+      ],
+      t,
+    ),
+    ...otpFieldCopy(t),
+  }
 }
 
 export function passkeyCopy(t: Translator = untranslated()): Readonly<Record<string, string>> {

package/src/view/content-copy.ts

@@ -3,16 +3,20 @@ import type { Translator } from '@meith/i18n'
 import { copyFor, patternCopy, splitAround } from './copy'
 import { untranslated } from './time'
 
+const RECOVERY_KEYS = [
+  'composer.autosave.failed',
+  'composer.autosave.saved',
+  'composer.autosave.saving',
+  'composer.recovery.available',
+  'composer.recovery.discard',
+  'composer.recovery.restore',
+] as const
+
 export function replyFormCopy(t: Translator = untranslated()): Readonly<Record<string, string>> {
   return copyFor(
     [
+      ...RECOVERY_KEYS,
       'composer.draftSaved',
-      'composer.autosave.failed',
-      'composer.autosave.saved',
-      'composer.autosave.saving',
-      'composer.recovery.available',
-      'composer.recovery.discard',
-      'composer.recovery.restore',
       'composer.notifyReplies',
       'composer.reply.submit',
       'composer.reply.write',
@@ -44,6 +48,7 @@ export function newThreadFormCopy(
   return {
     ...copyFor(
       [
+        ...RECOVERY_KEYS,
         'composer.draftSaved',
         'composer.notifyReplies',
         'composer.newThread.subject',

package/src/view/forum-display.ts

@@ -101,6 +101,7 @@ export function threadRowModel(
     isLocked: row.isLocked,
     isUnread,
     isMoved: row.isMoved,
+    visibility: row.visibility,
     lastPost: lastPost(row.lastPost, row, now, t, identities, wordFilter),
   }
 }