@atproto/bsky 0.0.15 → 0.0.16

package/src/services/feed/views.ts

@@ -5,7 +5,6 @@ import {
   GeneratorView,
   PostView,
 } from '../../lexicon/types/app/bsky/feed/defs'
-import { isListRule } from '../../lexicon/types/app/bsky/feed/threadgate'
 import {
   Main as EmbedImages,
   isMain as isEmbedImages,
@@ -22,6 +21,8 @@ import {
   ViewNotFound,
   ViewRecord,
 } from '../../lexicon/types/app/bsky/embed/record'
+import { Record as PostRecord } from '../../lexicon/types/app/bsky/feed/post'
+import { isListRule } from '../../lexicon/types/app/bsky/feed/threadgate'
 import {
   PostEmbedViews,
   FeedGenInfo,
@@ -39,6 +40,8 @@ import { ImageUriBuilder } from '../../image/uri'
 import { LabelCache } from '../../label-cache'
 import { ActorInfoMap, ActorService } from '../actor'
 import { ListInfoMap, GraphService } from '../graph'
+import { AtUri } from '@atproto/syntax'
+import { parseThreadGate } from './util'
 
 export class FeedViews {
   constructor(
@@ -59,8 +62,11 @@ export class FeedViews {
   formatFeedGeneratorView(
     info: FeedGenInfo,
     profiles: ActorInfoMap,
-  ): GeneratorView {
+  ): GeneratorView | undefined {
     const profile = profiles[info.creator]
+    if (!profile) {
+      return undefined
+    }
     return {
       uri: info.uri,
       cid: info.cid,
@@ -91,8 +97,8 @@ export class FeedViews {
   formatFeed(
     items: FeedRow[],
     state: FeedHydrationState,
+    viewer: string | null,
     opts?: {
-      viewer?: string | null
       usePostViewUnion?: boolean
     },
   ): FeedViewPost[] {
@@ -101,7 +107,7 @@ export class FeedViews {
     const actors = this.services.actor.views.profileBasicPresentation(
       Object.keys(profiles),
       state,
-      opts,
+      viewer,
     )
     const feed: FeedViewPost[] = []
     for (const item of items) {
@@ -114,6 +120,7 @@ export class FeedViews {
         embeds,
         labels,
         lists,
+        viewer,
       )
       // skip over not found & blocked posts
       if (!post || blocks[post.uri]?.reply) {
@@ -149,6 +156,7 @@ export class FeedViews {
           labels,
           lists,
           blocks,
+          viewer,
           opts,
         )
         const replyRoot = this.formatMaybePostView(
@@ -160,6 +168,7 @@ export class FeedViews {
           labels,
           lists,
           blocks,
+          viewer,
           opts,
         )
         if (replyRoot && replyParent) {
@@ -182,6 +191,7 @@ export class FeedViews {
     embeds: PostEmbedViews,
     labels: Labels,
     lists: ListInfoMap,
+    viewer: string | null,
   ): PostView | undefined {
     const post = posts[uri]
     const gate = threadgates[uri]
@@ -207,6 +217,14 @@ export class FeedViews {
         ? {
             repost: post.requesterRepost ?? undefined,
             like: post.requesterLike ?? undefined,
+            replyDisabled: this.userReplyDisabled(
+              uri,
+              actors,
+              posts,
+              threadgates,
+              lists,
+              viewer,
+            ),
           }
         : undefined,
       labels: [...postLabels, ...postSelfLabels],
@@ -217,6 +235,50 @@ export class FeedViews {
     }
   }
 
+  userReplyDisabled(
+    uri: string,
+    actors: ActorInfoMap,
+    posts: PostInfoMap,
+    threadgates: ThreadgateInfoMap,
+    lists: ListInfoMap,
+    viewer: string | null,
+  ): boolean | undefined {
+    if (viewer === null) {
+      return undefined
+    } else if (posts[uri]?.violatesThreadGate) {
+      return true
+    }
+
+    const rootUriStr: string =
+      posts[uri]?.record?.['reply']?.['root']?.['uri'] ?? uri
+    const gate = threadgates[rootUriStr]?.record
+    if (!gate) {
+      return undefined
+    }
+    const rootPost = posts[rootUriStr]?.record as PostRecord | undefined
+    const ownerDid = new AtUri(rootUriStr).hostname
+
+    const {
+      canReply,
+      allowFollowing,
+      allowListUris = [],
+    } = parseThreadGate(viewer, ownerDid, rootPost ?? null, gate ?? null)
+
+    if (canReply) {
+      return false
+    }
+    if (allowFollowing && actors[ownerDid]?.viewer?.followedBy) {
+      return false
+    }
+    for (const listUri of allowListUris) {
+      const list = lists[listUri]
+      if (list?.viewerInList) {
+        return false
+      }
+    }
+    return true
+  }
+
   formatMaybePostView(
     uri: string,
     actors: ActorInfoMap,
@@ -226,6 +288,7 @@ export class FeedViews {
     labels: Labels,
     lists: ListInfoMap,
     blocks: PostBlocksMap,
+    viewer: string | null,
     opts?: {
       usePostViewUnion?: boolean
     },
@@ -238,6 +301,7 @@ export class FeedViews {
       embeds,
       labels,
       lists,
+      viewer,
     )
     if (!post) {
       if (!opts?.usePostViewUnion) return

package/src/services/graph/index.ts

@@ -4,6 +4,10 @@ import { ImageUriBuilder } from '../../image/uri'
 import { valuesList } from '../../db/util'
 import { ListInfo } from './types'
 import { ActorInfoMap } from '../actor'
+import {
+  ListView,
+  ListViewBasic,
+} from '../../lexicon/types/app/bsky/graph/defs'
 
 export * from './types'
 
@@ -91,6 +95,12 @@ export class GraphService {
           .whereRef('list_block.subjectUri', '=', ref('list.uri'))
           .select('list_block.uri')
           .as('viewerListBlockUri'),
+        this.db.db
+          .selectFrom('list_item')
+          .whereRef('list_item.listUri', '=', ref('list.uri'))
+          .where('list_item.subjectDid', '=', viewer ?? '')
+          .select('list_item.uri')
+          .as('viewerInList'),
       ])
   }
 
@@ -99,7 +109,11 @@ export class GraphService {
       .selectFrom('list_item')
       .innerJoin('actor as subject', 'subject.did', 'list_item.subjectDid')
       .selectAll('subject')
-      .select(['list_item.cid as cid', 'list_item.sortAt as sortAt'])
+      .select([
+        'list_item.uri as uri',
+        'list_item.cid as cid',
+        'list_item.sortAt as sortAt',
+      ])
   }
 
   async getBlockAndMuteState(
@@ -229,7 +243,10 @@ export class GraphService {
     )
   }
 
-  formatListView(list: ListInfo, profiles: ActorInfoMap) {
+  formatListView(list: ListInfo, profiles: ActorInfoMap): ListView | undefined {
+    if (!profiles[list.creator]) {
+      return undefined
+    }
     return {
       ...this.formatListViewBasic(list),
       creator: profiles[list.creator],
@@ -237,10 +254,11 @@ export class GraphService {
       descriptionFacets: list.descriptionFacets
         ? JSON.parse(list.descriptionFacets)
         : undefined,
+      indexedAt: list.sortAt,
     }
   }
 
-  formatListViewBasic(list: ListInfo) {
+  formatListViewBasic(list: ListInfo): ListViewBasic {
     return {
       uri: list.uri,
       cid: list.cid,

package/src/services/graph/types.ts

@@ -4,6 +4,7 @@ import { List } from '../../db/tables/list'
 export type ListInfo = Selectable<List> & {
   viewerMuted: string | null
   viewerListBlockUri: string | null
+  viewerInList: string | null
 }
 
 export type ListInfoMap = Record<string, ListInfo>

package/src/services/indexing/plugins/block.ts

@@ -1,6 +1,5 @@
 import { Selectable } from 'kysely'
-import { AtUri } from '@atproto/syntax'
-import { toSimplifiedISOSafe } from '@atproto/common'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
 import * as Block from '../../../lexicon/types/app/bsky/graph/block'
 import * as lex from '../../../lexicon/lexicons'
@@ -27,7 +26,7 @@ const insertFn = async (
       cid: cid.toString(),
       creator: uri.host,
       subjectDid: obj.subject,
-      createdAt: toSimplifiedISOSafe(obj.createdAt),
+      createdAt: normalizeDatetimeAlways(obj.createdAt),
       indexedAt: timestamp,
     })
     .onConflict((oc) => oc.doNothing())

package/src/services/indexing/plugins/feed-generator.ts

@@ -1,6 +1,5 @@
 import { Selectable } from 'kysely'
-import { AtUri } from '@atproto/syntax'
-import { toSimplifiedISOSafe } from '@atproto/common'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
 import * as FeedGenerator from '../../../lexicon/types/app/bsky/feed/generator'
 import * as lex from '../../../lexicon/lexicons'
@@ -33,7 +32,7 @@ const insertFn = async (
         ? JSON.stringify(obj.descriptionFacets)
         : undefined,
       avatarCid: obj.avatar?.ref.toString(),
-      createdAt: toSimplifiedISOSafe(obj.createdAt),
+      createdAt: normalizeDatetimeAlways(obj.createdAt),
       indexedAt: timestamp,
     })
     .onConflict((oc) => oc.doNothing())

package/src/services/indexing/plugins/follow.ts

@@ -1,6 +1,5 @@
 import { Selectable } from 'kysely'
-import { AtUri } from '@atproto/syntax'
-import { toSimplifiedISOSafe } from '@atproto/common'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
 import * as Follow from '../../../lexicon/types/app/bsky/graph/follow'
 import * as lex from '../../../lexicon/lexicons'
@@ -28,7 +27,7 @@ const insertFn = async (
       cid: cid.toString(),
       creator: uri.host,
       subjectDid: obj.subject,
-      createdAt: toSimplifiedISOSafe(obj.createdAt),
+      createdAt: normalizeDatetimeAlways(obj.createdAt),
       indexedAt: timestamp,
     })
     .onConflict((oc) => oc.doNothing())

package/src/services/indexing/plugins/like.ts

@@ -1,6 +1,5 @@
 import { Selectable } from 'kysely'
-import { AtUri } from '@atproto/syntax'
-import { toSimplifiedISOSafe } from '@atproto/common'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
 import * as Like from '../../../lexicon/types/app/bsky/feed/like'
 import * as lex from '../../../lexicon/lexicons'
@@ -29,7 +28,7 @@ const insertFn = async (
       creator: uri.host,
       subject: obj.subject.uri,
       subjectCid: obj.subject.cid,
-      createdAt: toSimplifiedISOSafe(obj.createdAt),
+      createdAt: normalizeDatetimeAlways(obj.createdAt),
       indexedAt: timestamp,
     })
     .onConflict((oc) => oc.doNothing())

package/src/services/indexing/plugins/list-block.ts

@@ -1,6 +1,5 @@
 import { Selectable } from 'kysely'
-import { AtUri } from '@atproto/syntax'
-import { toSimplifiedISOSafe } from '@atproto/common'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
 import * as ListBlock from '../../../lexicon/types/app/bsky/graph/listblock'
 import * as lex from '../../../lexicon/lexicons'
@@ -27,7 +26,7 @@ const insertFn = async (
       cid: cid.toString(),
       creator: uri.host,
       subjectUri: obj.subject,
-      createdAt: toSimplifiedISOSafe(obj.createdAt),
+      createdAt: normalizeDatetimeAlways(obj.createdAt),
       indexedAt: timestamp,
     })
     .onConflict((oc) => oc.doNothing())

package/src/services/indexing/plugins/list-item.ts

@@ -1,6 +1,5 @@
 import { Selectable } from 'kysely'
-import { AtUri } from '@atproto/syntax'
-import { toSimplifiedISOSafe } from '@atproto/common'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
 import * as ListItem from '../../../lexicon/types/app/bsky/graph/listitem'
 import * as lex from '../../../lexicon/lexicons'
@@ -35,7 +34,7 @@ const insertFn = async (
       creator: uri.host,
       subjectDid: obj.subject,
       listUri: obj.list,
-      createdAt: toSimplifiedISOSafe(obj.createdAt),
+      createdAt: normalizeDatetimeAlways(obj.createdAt),
       indexedAt: timestamp,
     })
     .onConflict((oc) => oc.doNothing())

package/src/services/indexing/plugins/list.ts

@@ -1,6 +1,5 @@
 import { Selectable } from 'kysely'
-import { AtUri } from '@atproto/syntax'
-import { toSimplifiedISOSafe } from '@atproto/common'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { CID } from 'multiformats/cid'
 import * as List from '../../../lexicon/types/app/bsky/graph/list'
 import * as lex from '../../../lexicon/lexicons'
@@ -33,7 +32,7 @@ const insertFn = async (
         ? JSON.stringify(obj.descriptionFacets)
         : undefined,
       avatarCid: obj.avatar?.ref.toString(),
-      createdAt: toSimplifiedISOSafe(obj.createdAt),
+      createdAt: normalizeDatetimeAlways(obj.createdAt),
       indexedAt: timestamp,
     })
     .onConflict((oc) => oc.doNothing())

package/src/services/indexing/plugins/post.ts

@@ -1,7 +1,6 @@
 import { Insertable, Selectable, sql } from 'kysely'
 import { CID } from 'multiformats/cid'
-import { AtUri } from '@atproto/syntax'
-import { toSimplifiedISOSafe } from '@atproto/common'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { jsonStringToLex } from '@atproto/lexicon'
 import {
   Record as PostRecord,
@@ -68,7 +67,7 @@ const insertFn = async (
     cid: cid.toString(),
     creator: uri.host,
     text: obj.text,
-    createdAt: toSimplifiedISOSafe(obj.createdAt),
+    createdAt: normalizeDatetimeAlways(obj.createdAt),
     replyRoot: obj.reply?.root?.uri || null,
     replyRootCid: obj.reply?.root?.cid || null,
     replyParent: obj.reply?.parent?.uri || null,
@@ -420,7 +419,7 @@ async function validateReply(
   const violatesThreadGate = await feedutil.violatesThreadGate(
     db,
     creator,
-    new AtUri(reply.root.uri).host,
+    new AtUri(reply.root.uri).hostname,
     replyRefs.root?.record ?? null,
     replyRefs.gate?.record ?? null,
   )

package/src/services/indexing/plugins/repost.ts

@@ -1,7 +1,6 @@
 import { Selectable } from 'kysely'
 import { CID } from 'multiformats/cid'
-import { AtUri } from '@atproto/syntax'
-import { toSimplifiedISOSafe } from '@atproto/common'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as Repost from '../../../lexicon/types/app/bsky/feed/repost'
 import * as lex from '../../../lexicon/lexicons'
 import { DatabaseSchema, DatabaseSchemaType } from '../../../db/database-schema'
@@ -27,7 +26,7 @@ const insertFn = async (
     creator: uri.host,
     subject: obj.subject.uri,
     subjectCid: obj.subject.cid,
-    createdAt: toSimplifiedISOSafe(obj.createdAt),
+    createdAt: normalizeDatetimeAlways(obj.createdAt),
     indexedAt: timestamp,
   }
   const [inserted] = await Promise.all([

package/src/services/indexing/plugins/thread-gate.ts

@@ -1,6 +1,5 @@
-import { AtUri } from '@atproto/syntax'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { InvalidRequestError } from '@atproto/xrpc-server'
-import { toSimplifiedISOSafe } from '@atproto/common'
 import { CID } from 'multiformats/cid'
 import * as Threadgate from '../../../lexicon/types/app/bsky/feed/threadgate'
 import * as lex from '../../../lexicon/lexicons'
@@ -33,7 +32,7 @@ const insertFn = async (
       cid: cid.toString(),
       creator: uri.host,
       postUri: obj.post,
-      createdAt: toSimplifiedISOSafe(obj.createdAt),
+      createdAt: normalizeDatetimeAlways(obj.createdAt),
       indexedAt: timestamp,
     })
     .onConflict((oc) => oc.doNothing())

package/src/services/label/index.ts

@@ -1,6 +1,5 @@
 import { sql } from 'kysely'
-import { AtUri } from '@atproto/syntax'
-import { toSimplifiedISOSafe } from '@atproto/common'
+import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import { Database } from '../../db'
 import { Label, isSelfLabels } from '../../lexicon/types/com/atproto/label/defs'
 import { ids } from '../../lexicon/lexicons'
@@ -166,7 +165,7 @@ export function getSelfLabels(details: {
   const src = new AtUri(uri).host // record creator
   const cts =
     typeof record.createdAt === 'string'
-      ? toSimplifiedISOSafe(record.createdAt)
+      ? normalizeDatetimeAlways(record.createdAt)
       : new Date(0).toISOString()
   return record.labels.values.map(({ val }) => {
     return { src, uri, cid, val, cts, neg: false }