@meith/subscriptions 0.34.0 → 0.35.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@meith/subscriptions",
-  "version": "0.34.0",
+  "version": "0.35.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -19,7 +19,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@meith/core": "0.34.0",
-    "@meith/i18n": "0.34.0"
+    "@meith/core": "0.35.1",
+    "@meith/i18n": "0.35.1"
   }
 }

package/src/index.ts

@@ -32,8 +32,8 @@ export {
 export type {
   PendingForUser,
   PendingPost,
+  SubscriberAudienceSource,
   SubscriptionNotifierPort,
   SubscriptionRepository,
   SubscriptionRow,
-  VisibleForumSource,
 } from './types'

package/src/notifier.ts

@@ -2,9 +2,9 @@ import { CADENCE_INTERVAL_MS, type DigestCadence, type SubscriptionMode } from '
 import { mintUnsubscribeToken } from './tokens'
 import type {
   PendingPost,
+  SubscriberAudienceSource,
   SubscriptionNotifierPort,
   SubscriptionRepository,
-  VisibleForumSource,
 } from './types'
 
 export const MAX_USERS_PER_RUN = 50
@@ -53,7 +53,7 @@ export interface RunOutcome {
 export class SubscriptionNotifier {
   private readonly subscriptions: SubscriptionRepository
   private readonly notifications: SubscriptionNotifierPort
-  private readonly forums: VisibleForumSource
+  private readonly forums: SubscriberAudienceSource
   private readonly now: () => Date
 
   private readonly secret: string | null
@@ -61,7 +61,7 @@ export class SubscriptionNotifier {
   constructor(deps: {
     subscriptions: SubscriptionRepository
     notifications: SubscriptionNotifierPort
-    forums: VisibleForumSource
+    forums: SubscriberAudienceSource
     unsubscribeSecret?: string | null
     now?: () => Date
   }) {
@@ -154,11 +154,11 @@ export class SubscriptionNotifier {
       considered += 1
 
       try {
-        const visibleForumIds = await this.forums.visibleForumIdsFor(userId)
+        const audience = await this.forums.audienceFor(userId)
         const pending = await this.subscriptions.pendingFor({
           userId,
           mode,
-          visibleForumIds,
+          audience,
           limit: MAX_POSTS_PER_USER,
         })
 

package/src/service.ts

@@ -1,3 +1,4 @@
+import type { ThreadAudience } from '@meith/core'
 import { ValidationError } from '@meith/core'
 import { msg } from '@meith/i18n'
 
@@ -55,12 +56,9 @@ export class SubscriptionService {
     return this.repository.modeFor(userId, target, targetId)
   }
 
-  async list(
-    userId: number,
-    visibleForumIds: readonly number[],
-  ): Promise<readonly SubscriptionRow[]> {
+  async list(userId: number, audience: ThreadAudience): Promise<readonly SubscriptionRow[]> {
     return this.repository.listFor(userId, {
-      visibleForumIds,
+      audience,
       limit: SUBSCRIPTIONS_PAGE_SIZE,
     })
   }

package/src/types.ts

@@ -1,3 +1,5 @@
+import type { ThreadAudience } from '@meith/core'
+
 import type { DigestCadence, SubscriptionMode, SubscriptionTarget } from './modes'
 
 export interface SubscriptionRow {
@@ -53,7 +55,7 @@ export interface SubscriptionRepository {
 
   listFor(
     userId: number,
-    options: { readonly visibleForumIds: readonly number[]; readonly limit: number },
+    options: { readonly audience: ThreadAudience; readonly limit: number },
   ): Promise<readonly SubscriptionRow[]>
 
   usersWithPending(input: {
@@ -65,7 +67,7 @@ export interface SubscriptionRepository {
   pendingFor(input: {
     readonly userId: number
     readonly mode: SubscriptionMode
-    readonly visibleForumIds: readonly number[]
+    readonly audience: ThreadAudience
     readonly limit: number
   }): Promise<PendingForUser>
 
@@ -91,6 +93,6 @@ export interface SubscriptionNotifierPort {
   }): Promise<void>
 }
 
-export interface VisibleForumSource {
-  visibleForumIdsFor(userId: number): Promise<readonly number[]>
+export interface SubscriberAudienceSource {
+  audienceFor(userId: number): Promise<ThreadAudience>
 }