@meith/db 0.34.0 → 0.35.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/db",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -22,37 +22,37 @@
   "dependencies": {
     "drizzle-orm": "^0.45.2",
     "postgres": "^3.4.7",
-    "@meith/accounts": "0.34.0",
-    "@meith/admin": "0.34.0",
-    "@meith/antispam": "0.34.0",
-    "@meith/api": "0.34.0",
-    "@meith/attachments": "0.34.0",
-    "@meith/authorization": "0.34.0",
-    "@meith/avatars": "0.34.0",
-    "@meith/backup": "0.34.0",
-    "@meith/board-digest": "0.34.0",
-    "@meith/core": "0.34.0",
-    "@meith/drafts": "0.34.0",
-    "@meith/events": "0.34.0",
-    "@meith/groups": "0.34.0",
-    "@meith/forums": "0.34.0",
-    "@meith/i18n": "0.34.0",
-    "@meith/markdown": "0.34.0",
-    "@meith/marketplace": "0.34.0",
-    "@meith/messages": "0.34.0",
-    "@meith/moderation": "0.34.0",
-    "@meith/notifications": "0.34.0",
-    "@meith/plugin-kit": "0.34.0",
-    "@meith/polls": "0.34.0",
-    "@meith/profile-fields": "0.34.0",
-    "@meith/relations": "0.34.0",
-    "@meith/reputation": "0.34.0",
-    "@meith/search": "0.34.0",
-    "@meith/settings": "0.34.0",
-    "@meith/subscriptions": "0.34.0",
-    "@meith/signatures": "0.34.0",
-    "@meith/tasks": "0.34.0",
-    "@meith/threads": "0.34.0"
+    "@meith/accounts": "0.35.0",
+    "@meith/admin": "0.35.0",
+    "@meith/antispam": "0.35.0",
+    "@meith/api": "0.35.0",
+    "@meith/attachments": "0.35.0",
+    "@meith/authorization": "0.35.0",
+    "@meith/avatars": "0.35.0",
+    "@meith/backup": "0.35.0",
+    "@meith/board-digest": "0.35.0",
+    "@meith/core": "0.35.0",
+    "@meith/drafts": "0.35.0",
+    "@meith/events": "0.35.0",
+    "@meith/forums": "0.35.0",
+    "@meith/groups": "0.35.0",
+    "@meith/i18n": "0.35.0",
+    "@meith/markdown": "0.35.0",
+    "@meith/marketplace": "0.35.0",
+    "@meith/messages": "0.35.0",
+    "@meith/moderation": "0.35.0",
+    "@meith/notifications": "0.35.0",
+    "@meith/plugin-kit": "0.35.0",
+    "@meith/polls": "0.35.0",
+    "@meith/profile-fields": "0.35.0",
+    "@meith/relations": "0.35.0",
+    "@meith/reputation": "0.35.0",
+    "@meith/search": "0.35.0",
+    "@meith/settings": "0.35.0",
+    "@meith/signatures": "0.35.0",
+    "@meith/subscriptions": "0.35.0",
+    "@meith/tasks": "0.35.0",
+    "@meith/threads": "0.35.0"
   },
   "devDependencies": {
     "drizzle-kit": "^0.31.6",

package/src/identity-link-repo.ts

@@ -1,4 +1,4 @@
-import { and, asc, eq } from 'drizzle-orm'
+import { and, asc, eq, gt, or, sql } from 'drizzle-orm'
 
 import type {
   LinkIdentityInput,
@@ -136,10 +136,17 @@ export class PostgresPasskeyRepository implements PasskeyRepository {
     return removed.length > 0
   }
 
-  async markUsed(passkeyId: number, signCount: number, now: Date): Promise<void> {
-    await this.db
+  async markUsed(passkeyId: number, signCount: number, now: Date): Promise<boolean> {
+    const rows = await this.db
       .update(passkeys)
       .set({ signCount, lastUsedAt: now })
-      .where(eq(passkeys.id, passkeyId))
+      .where(
+        and(
+          eq(passkeys.id, passkeyId),
+          or(eq(sql`${signCount}`, 0), gt(sql`${signCount}`, passkeys.signCount)),
+        ),
+      )
+      .returning({ id: passkeys.id })
+    return rows.length > 0
   }
 }

package/src/message-repo.ts

@@ -336,6 +336,29 @@ export class PostgresMessageRepository implements MessageRepository {
     return rows.length
   }
 
+  async restore(input: {
+    readonly userId: number
+    readonly copyIds: readonly number[]
+  }): Promise<number> {
+    if (input.copyIds.length === 0) return 0
+
+    const rows = resultRows(
+      await this.db.execute(sql`
+        update private_message_copies
+           set folder = case when role = 'author' then 'sent' else 'inbox' end
+         where owner_user_id = ${input.userId}
+           and folder = 'trash'
+           and id in (${sql.join(
+             input.copyIds.map((id) => sql`${id}`),
+             sql`, `,
+           )})
+        returning id
+      `),
+    ) as Array<{ id: number }>
+
+    return rows.length
+  }
+
   async remove(input: {
     readonly userId: number
     readonly copyIds: readonly number[]

package/src/notification-repo.ts

@@ -266,6 +266,15 @@ export class PostgresNotificationRepository implements NotificationRepository {
     return rows.length > 0
   }
 
+  async removeAllPushSubscriptions(userId: number): Promise<number> {
+    const rows = resultRows(
+      await this.db.execute(sql`
+        delete from push_subscriptions where user_id = ${userId} returning id
+      `),
+    ) as Array<{ id: number }>
+    return rows.length
+  }
+
   async pushSubscriptionsFor(userId: number): Promise<readonly PushSubscriptionRecord[]> {
     const rows = resultRows(
       await this.db.execute(sql`

package/src/post-repo.ts

@@ -111,7 +111,7 @@ export class PostgresPostRepository implements PostRepository {
          where r.post_id = ${postId}
            and exists (select 1 from posts p where p.id = r.post_id and p.thread_id = ${threadId})
         union all
-        select p.revision_count, p.message, p.subject, p.edited_by_user_id,
+        select p.revision_count + 1, p.message, p.subject, p.edited_by_user_id,
                coalesce(u.username, p.author_username, 'Deleted member'),
                p.edit_reason, coalesce(p.edited_at, p.created_at), true
           from posts p

package/src/post-writes.ts

@@ -6,6 +6,7 @@ import {
   CORE_RENDERING,
   type MarkdownPipeline,
   renderThrough,
+  sourceAsMarkdown,
   vocabularyOptions,
 } from '@meith/markdown'
 import type {
@@ -58,8 +59,9 @@ export class PostgresPostWriteRepository implements PostWriteRepository {
     const rows = resultRows(
       await this.db.execute(sql`
         select p.id, p.thread_id, p.forum_id, p.author_user_id, p.subject, p.message,
-               p.visibility, p.is_first_post, p.revision_count, p.created_at,
-               t.slug as thread_slug, t.title as thread_title, t.is_locked,
+               p.body_format, p.visibility, p.is_first_post, p.revision_count, p.created_at,
+               t.slug as thread_slug, t.title as thread_title,
+               t.author_user_id as thread_author_user_id, t.is_locked,
                t.visibility as thread_visibility,
                f.slug as forum_slug, f.is_open
           from posts p
@@ -74,12 +76,14 @@ export class PostgresPostWriteRepository implements PostWriteRepository {
       author_user_id: number | null
       subject: string | null
       message: string
+      body_format: number
       visibility: 'visible' | 'unapproved' | 'deleted'
       is_first_post: boolean
       revision_count: number
       created_at: Date
       thread_slug: string
       thread_title: string
+      thread_author_user_id: number | null
       is_locked: boolean
       thread_visibility: 'visible' | 'unapproved' | 'deleted'
       forum_slug: string
@@ -96,7 +100,7 @@ export class PostgresPostWriteRepository implements PostWriteRepository {
         forumId: Number(row.forum_id),
         authorUserId: row.author_user_id === null ? null : Number(row.author_user_id),
         subject: row.subject,
-        message: row.message,
+        message: sourceAsMarkdown(row.message, Number(row.body_format)),
         visibility: row.visibility,
         isFirstPost: row.is_first_post,
         revisionCount: Number(row.revision_count),
@@ -106,6 +110,7 @@ export class PostgresPostWriteRepository implements PostWriteRepository {
         id: Number(row.thread_id),
         slug: row.thread_slug,
         title: row.thread_title,
+        authorUserId: row.thread_author_user_id === null ? null : Number(row.thread_author_user_id),
         isLocked: row.is_locked,
         visibility: row.thread_visibility,
       },

package/src/subscription-repo.ts

@@ -1,6 +1,6 @@
 import { sql } from 'drizzle-orm'
 
-import { PUBLIC_CONTENT } from '@meith/core'
+import { PUBLIC_CONTENT, type ThreadAudience } from '@meith/core'
 import type {
   DigestCadence,
   PendingForUser,
@@ -15,6 +15,7 @@ import type { Database } from './client'
 import { resultRows } from './result-rows'
 import { toDate } from './row-values'
 import { idList } from './sql-lists'
+import { inAudience } from './thread-audience'
 import { visibleIn } from './visibility'
 
 interface TableShape {
@@ -31,11 +32,10 @@ function shapeFor(target: SubscriptionTarget): TableShape {
 function pendingPosts(
   userId: number,
   mode: SubscriptionMode | null,
-  visibleForumIds: readonly number[] | null,
+  audience: ThreadAudience,
 ): ReturnType<typeof sql> {
   const byMode = mode === null ? sql`` : sql`and s.mode = ${mode}`
-  const visible =
-    visibleForumIds === null ? sql`` : sql`and t.forum_id in ${idList(visibleForumIds)}`
+  const visible = sql`and ${inAudience(sql`t.forum_id`, sql`t.author_user_id`, audience)}`
 
   return sql`
     select p.id as post_id, p.thread_id, t.title as thread_title, t.slug as thread_slug,
@@ -155,15 +155,15 @@ export class PostgresSubscriptionRepository implements SubscriptionRepository {
 
   async listFor(
     userId: number,
-    options: { readonly visibleForumIds: readonly number[]; readonly limit: number },
+    options: { readonly audience: ThreadAudience; readonly limit: number },
   ): Promise<readonly SubscriptionRow[]> {
-    const visible = idList(options.visibleForumIds)
+    const visibleForums = idList(options.audience.forumIds)
 
     const rows = resultRows(
       await this.db.execute(sql`
         with pending as (
           select target, target_id, count(*)::int as pending
-            from (${pendingPosts(userId, null, options.visibleForumIds)}) p
+            from (${pendingPosts(userId, null, options.audience)}) p
            group by target, target_id
         )
         select 'thread'::text as target, s.thread_id as target_id, t.title,
@@ -175,7 +175,7 @@ export class PostgresSubscriptionRepository implements SubscriptionRepository {
                  on pending.target = 'thread' and pending.target_id = s.thread_id
          where s.user_id = ${userId}
            and ${visibleIn(sql`t.visibility`, PUBLIC_CONTENT)}
-           and t.forum_id in ${visible}
+           and ${inAudience(sql`t.forum_id`, sql`t.author_user_id`, options.audience)}
 
         union all
 
@@ -186,7 +186,7 @@ export class PostgresSubscriptionRepository implements SubscriptionRepository {
           join forums f on f.id = s.forum_id
           left join pending
                  on pending.target = 'forum' and pending.target_id = s.forum_id
-         where s.user_id = ${userId} and s.forum_id in ${visible}
+         where s.user_id = ${userId} and s.forum_id in ${visibleForums}
 
          order by created_at desc, target_id desc
          limit ${options.limit}
@@ -269,12 +269,12 @@ export class PostgresSubscriptionRepository implements SubscriptionRepository {
   async pendingFor(input: {
     readonly userId: number
     readonly mode: SubscriptionMode
-    readonly visibleForumIds: readonly number[]
+    readonly audience: ThreadAudience
     readonly limit: number
   }): Promise<PendingForUser> {
     const rows = resultRows(
       await this.db.execute(sql`
-        select * from (${pendingPosts(input.userId, input.mode, input.visibleForumIds)}) p
+        select * from (${pendingPosts(input.userId, input.mode, input.audience)}) p
          order by p.post_id
          limit ${input.limit}
       `),

package/src/thread-repo.ts

@@ -122,12 +122,19 @@ export class PostgresThreadRepository implements ThreadRepository {
       .select({
         forumId: threads.forumId,
         authorUserId: threads.authorUserId,
+        visibility: threads.visibility,
       })
       .from(threads)
       .where(eq(threads.id, threadId))
       .limit(1)
     const row = rows[0]
-    return row ? { forumId: row.forumId, authorUserId: row.authorUserId } : null
+    return row
+      ? {
+          forumId: row.forumId,
+          authorUserId: row.authorUserId,
+          visibility: row.visibility as ThreadLocation['visibility'],
+        }
+      : null
   }
 
   async findById(

package/src/user-bulk-repo.ts

@@ -358,7 +358,11 @@ export class PostgresUserBulkRepository {
     return sql.join(conditions, sql` and `)
   }
 
-  async claimMassMailChunk(massMailId: number, limit: number): Promise<MassMailChunk> {
+  async claimMassMailChunk(
+    massMailId: number,
+    limit: number,
+    enqueue: (recipients: readonly MassMailRecipient[]) => Promise<void>,
+  ): Promise<MassMailChunk> {
     return this.db.transaction(async (tx) => {
       const mails = resultRows(
         await tx.execute(sql`
@@ -393,6 +397,8 @@ export class PostgresUserBulkRepository {
       const finished = recipients.length < limit
       const cursor = recipients.at(-1)?.userId ?? after
 
+      await enqueue(recipients)
+
       await tx.execute(sql`
         update mass_mails
            set last_user_id = ${cursor},