@meith/web 0.30.1 → 0.32.0

package/src/view/thread-view.ts

@@ -2,12 +2,14 @@ import type { ForumRow } from '@meith/forums'
 import type { Translator } from '@meith/i18n'
 import { type BoardVocabulary, type CompiledWordFilter, postBodyHtml } from '@meith/markdown'
 import { editedNote, type PostListingRow, type PostPage } from '@meith/posts'
-import { suppress } from '@meith/relations'
+import { isOnline, suppress } from '@meith/relations'
+import type { SubscriptionMode } from '@meith/subscriptions'
 import type {
   PaginationModel,
   PostAttachmentModel,
   PostBitModel,
   ThreadViewModel,
+  ThreadWatchModel,
 } from '@meith/theme-kit'
 import type { ThreadListingRow } from '@meith/threads'
 
@@ -58,6 +60,11 @@ function withinEditWindow(
   return elapsed <= capabilities.editWindowMinutes
 }
 
+export interface AuthorPresence {
+  readonly lastActiveAt: Date | null
+  readonly invisible: boolean
+}
+
 interface PostContext {
   readonly now: Date
   readonly replyHref: string | null
@@ -67,6 +74,8 @@ interface PostContext {
   readonly signatures: ReadonlyMap<number, string>
   readonly avatars: ReadonlyMap<number, string>
   readonly identities: ReadonlyMap<number, MemberIdentity>
+  readonly presence: ReadonlyMap<number, AuthorPresence>
+  readonly viewerSeesInvisible: boolean
   readonly ignoredIds: ReadonlySet<number>
   readonly revealedPostIds: ReadonlySet<number>
   readonly revealHref: (postId: number, number: number) => string
@@ -92,6 +101,12 @@ function post(post: PostListingRow, thread: ThreadListingRow, context: PostConte
   const identity =
     post.authorUserId === null ? undefined : context.identities.get(post.authorUserId)
 
+  const presence = post.authorUserId === null ? undefined : context.presence.get(post.authorUserId)
+  const authorIsOnline =
+    presence !== undefined &&
+    (!presence.invisible || context.viewerSeesInvisible) &&
+    isOnline(presence.lastActiveAt, now)
+
   const mayEdit =
     post.visibility !== 'deleted' &&
     (isOwn
@@ -123,7 +138,7 @@ function post(post: PostListingRow, thread: ThreadListingRow, context: PostConte
       joinedAt: post.authorJoinedAt === null ? null : formatDate(post.authorJoinedAt, t),
       signatureHtml:
         hidden || post.authorUserId === null ? null : (signatures.get(post.authorUserId) ?? null),
-      isOnline: false,
+      isOnline: authorIsOnline,
       fields: hidden || post.authorUserId === null ? [] : (fields.get(post.authorUserId) ?? []),
     },
     bodyHtml: hidden
@@ -191,6 +206,8 @@ export interface ThreadViewInput {
   readonly pagination?: PaginationModel
   readonly nextHref: string | null
   readonly markReadAction?: string | null
+  readonly watchOffered?: boolean
+  readonly watchMode?: SubscriptionMode | null
   readonly replyHref?: string | null
   readonly capabilities?: PostCapabilities
   readonly now: Date
@@ -199,6 +216,8 @@ export interface ThreadViewInput {
   readonly signatures?: ReadonlyMap<number, string>
   readonly avatars?: ReadonlyMap<number, string>
   readonly identities?: ReadonlyMap<number, MemberIdentity>
+  readonly presence?: ReadonlyMap<number, AuthorPresence>
+  readonly viewerSeesInvisible?: boolean
   readonly attachments?: ReadonlyMap<number, readonly PostAttachmentModel[]>
   readonly ignoredIds?: ReadonlySet<number>
   readonly revealedPostIds?: ReadonlySet<number>
@@ -212,6 +231,7 @@ const EMPTY_SIGNATURES: ReadonlyMap<number, string> = new Map()
 const EMPTY_ATTACHMENTS: ReadonlyMap<number, readonly PostAttachmentModel[]> = new Map()
 const EMPTY_AVATARS: ReadonlyMap<number, string> = new Map()
 const EMPTY_IDENTITIES: ReadonlyMap<number, MemberIdentity> = new Map()
+const EMPTY_PRESENCE: ReadonlyMap<number, AuthorPresence> = new Map()
 
 export function revealHref(currentHref: string, postId: number, number: number): string {
   const [path = '', hash] = currentHref.split('#')
@@ -227,6 +247,18 @@ export function threadToolsHeading(
   return t.t(isForumModerator ? 'thread.moderatorTools' : 'thread.threadTools')
 }
 
+export function threadWatch(input: {
+  readonly offered: boolean
+  readonly mode: SubscriptionMode | null
+  readonly threadId: number
+}): ThreadWatchModel | null {
+  if (!input.offered) return null
+
+  return input.mode === null
+    ? { subscribed: false, action: `/api/subscribe/thread/${input.threadId}` }
+    : { subscribed: true, action: `/api/unsubscribe/thread/${input.threadId}` }
+}
+
 export function revealedFrom(raw: string | readonly string[] | undefined): ReadonlySet<number> {
   if (raw === undefined) return EMPTY_IDS
   const values = typeof raw === 'string' ? [raw] : raw
@@ -253,6 +285,11 @@ export function buildThreadView(input: ThreadViewInput): ThreadView {
       forum: { label: input.forum.title, href: forumHref(input.forum) },
       replyHref: input.replyHref ?? null,
       markReadAction: input.markReadAction ?? null,
+      watch: threadWatch({
+        offered: input.watchOffered ?? false,
+        mode: input.watchMode ?? null,
+        threadId: input.thread.id,
+      }),
     },
     posts: input.page.rows.map((entry) =>
       post(entry, input.thread, {
@@ -265,6 +302,8 @@ export function buildThreadView(input: ThreadViewInput): ThreadView {
         attachments: input.attachments ?? EMPTY_ATTACHMENTS,
         avatars: input.avatars ?? EMPTY_AVATARS,
         identities: input.identities ?? EMPTY_IDENTITIES,
+        presence: input.presence ?? EMPTY_PRESENCE,
+        viewerSeesInvisible: input.viewerSeesInvisible ?? false,
         ignoredIds: input.ignoredIds ?? EMPTY_IDS,
         revealedPostIds: input.revealedPostIds ?? EMPTY_IDS,
         revealHref: (postId, number) => revealHref(input.currentHref ?? '', postId, number),

package/src/view/usercp-nav.ts

@@ -61,6 +61,12 @@ export const USERCP_SECTIONS: PanelNav = [
     icon: 'signature',
     blurbKey: 'userCpNav.usercp-signature.blurb',
   },
+  {
+    href: '/usercp/drafts',
+    titleKey: 'userCpNav.usercp-drafts.title',
+    icon: 'content',
+    blurbKey: 'userCpNav.usercp-drafts.blurb',
+  },
   {
     href: '/usercp/contacts',
     titleKey: 'userCpNav.usercp-contacts.title',

package/src/view/usercp.ts

@@ -6,6 +6,7 @@ import {
 } from '@meith/accounts'
 import { SOURCE_LOCALE, type Translator } from '@meith/i18n'
 import { maxLengthFor, type ResolvedProfileField } from '@meith/profile-fields'
+import { MODE_LABELS, SUBSCRIPTION_MODES, type SubscriptionMode } from '@meith/subscriptions'
 
 import { untranslated } from './time'
 
@@ -129,6 +130,8 @@ export function optionsFormValues(settings: MemberSettings): {
   postsPerPage: string
   threadsPerPage: string
   invisible: boolean
+  autoWatchOwnThreads: SubscriptionMode
+  autoWatchRepliedThreads: SubscriptionMode
 } {
   return {
     timezone: settings.timezone,
@@ -136,9 +139,20 @@ export function optionsFormValues(settings: MemberSettings): {
     postsPerPage: settings.postsPerPage === null ? '' : String(settings.postsPerPage),
     threadsPerPage: settings.threadsPerPage === null ? '' : String(settings.threadsPerPage),
     invisible: settings.invisible,
+    autoWatchOwnThreads: settings.autoWatchOwnThreads,
+    autoWatchRepliedThreads: settings.autoWatchRepliedThreads,
   }
 }
 
+export interface AutoWatchChoice {
+  readonly value: SubscriptionMode
+  readonly label: string
+}
+
+export function autoWatchChoices(): readonly AutoWatchChoice[] {
+  return SUBSCRIPTION_MODES.map((mode) => ({ value: mode, label: MODE_LABELS[mode] }))
+}
+
 export function customFieldInputs(resolved: readonly ResolvedProfileField[]): readonly {
   key: string
   label: string