@atproto/bsky 0.0.142 → 0.0.144

package/src/hydration/graph.ts

@@ -4,6 +4,7 @@ import { Record as FollowRecord } from '../lexicon/types/app/bsky/graph/follow'
 import { Record as ListRecord } from '../lexicon/types/app/bsky/graph/list'
 import { Record as ListItemRecord } from '../lexicon/types/app/bsky/graph/listitem'
 import { Record as StarterPackRecord } from '../lexicon/types/app/bsky/graph/starterpack'
+import { Record as VerificationRecord } from '../lexicon/types/app/bsky/graph/verification'
 import { FollowInfo } from '../proto/bsky_pb'
 import { HydrationMap, ItemRef, RecordInfo, parseRecord } from './util'
 
@@ -29,6 +30,9 @@ export type Block = RecordInfo<BlockRecord>
 export type StarterPack = RecordInfo<StarterPackRecord>
 export type StarterPacks = HydrationMap<StarterPack>
 
+export type Verification = RecordInfo<VerificationRecord>
+export type Verifications = HydrationMap<Verification>
+
 export type StarterPackAgg = {
   joinedWeek: number
   joinedAllTime: number
@@ -176,6 +180,21 @@ export class GraphHydrator {
     }, new HydrationMap<Follow>())
   }
 
+  async getVerifications(
+    uris: string[],
+    includeTakedowns = false,
+  ): Promise<Verifications> {
+    if (!uris.length) return new HydrationMap<Verification>()
+    const res = await this.dataplane.getVerificationRecords({ uris })
+    return uris.reduce((acc, uri, i) => {
+      const record = parseRecord<VerificationRecord>(
+        res.records[i],
+        includeTakedowns,
+      )
+      return acc.set(uri, record ?? null)
+    }, new HydrationMap<Verification>())
+  }
+
   async getBlocks(
     uris: string[],
     includeTakedowns = false,

package/src/hydration/hydrator.ts

@@ -46,6 +46,7 @@ import {
   RelationshipPair,
   StarterPackAggs,
   StarterPacks,
+  Verifications,
 } from './graph'
 import {
   LabelHydrator,
@@ -121,6 +122,7 @@ export type HydrationState = {
   labelerAggs?: LabelerAggs
   knownFollowers?: KnownFollowers
   bidirectionalBlocks?: BidirectionalBlocks
+  verifications?: Verifications
 }
 
 export type PostBlock = { embed: boolean; parent: boolean; root: boolean }
@@ -876,15 +878,24 @@ export class Hydrator {
     const likeUris = collections.get(ids.AppBskyFeedLike) ?? []
     const repostUris = collections.get(ids.AppBskyFeedRepost) ?? []
     const followUris = collections.get(ids.AppBskyGraphFollow) ?? []
-    const [posts, likes, reposts, follows, labels, profileState] =
-      await Promise.all([
-        this.feed.getPosts(postUris), // reason: mention, reply, quote
-        this.feed.getLikes(likeUris), // reason: like
-        this.feed.getReposts(repostUris), // reason: repost
-        this.graph.getFollows(followUris), // reason: follow
-        this.label.getLabelsForSubjects(uris, ctx.labelers),
-        this.hydrateProfiles(uris.map(didFromUri), ctx),
-      ])
+    const verificationUris = collections.get(ids.AppBskyGraphVerification) ?? []
+    const [
+      posts,
+      likes,
+      reposts,
+      follows,
+      verifications,
+      labels,
+      profileState,
+    ] = await Promise.all([
+      this.feed.getPosts(postUris), // reason: mention, reply, quote
+      this.feed.getLikes(likeUris), // reason: like
+      this.feed.getReposts(repostUris), // reason: repost
+      this.graph.getFollows(followUris), // reason: follow
+      this.graph.getVerifications(verificationUris), // reason: verified
+      this.label.getLabelsForSubjects(uris, ctx.labelers),
+      this.hydrateProfiles(uris.map(didFromUri), ctx),
+    ])
     const viewerRootPostUris = new Set<string>()
     for (const notif of notifs) {
       if (notif.reason === 'reply') {
@@ -906,6 +917,7 @@ export class Hydrator {
       likes,
       reposts,
       follows,
+      verifications,
       labels,
       threadgates,
       ctx,
@@ -1297,6 +1309,7 @@ export const mergeStates = (
       stateA.bidirectionalBlocks,
       stateB.bidirectionalBlocks,
     ),
+    verifications: mergeMaps(stateA.verifications, stateB.verifications),
   }
 }
 

package/src/lexicon/lexicons.ts

@@ -4860,6 +4860,7 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#bskyAppStatePref',
             'lex:app.bsky.actor.defs#labelersPref',
             'lex:app.bsky.actor.defs#postInteractionSettingsPref',
+            'lex:app.bsky.actor.defs#verificationPrefs',
           ],
         },
       },
@@ -5193,6 +5194,19 @@ export const schemaDict = {
           },
         },
       },
+      verificationPrefs: {
+        type: 'object',
+        description: 'Preferences for how verified accounts appear in the app.',
+        required: [],
+        properties: {
+          hideBadges: {
+            description:
+              'Hide the blue check badges for verified accounts and trusted verifiers.',
+            type: 'boolean',
+            default: false,
+          },
+        },
+      },
       postInteractionSettingsPref: {
         type: 'object',
         description:
@@ -9592,6 +9606,16 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyNotificationDefs: {
+    lexicon: 1,
+    id: 'app.bsky.notification.defs',
+    defs: {
+      recordDeleted: {
+        type: 'object',
+        properties: {},
+      },
+    },
+  },
   AppBskyNotificationGetUnreadCount: {
     lexicon: 1,
     id: 'app.bsky.notification.getUnreadCount',
@@ -9719,7 +9743,7 @@ export const schemaDict = {
           reason: {
             type: 'string',
             description:
-              "Expected values are 'like', 'repost', 'follow', 'mention', 'reply', 'quote', and 'starterpack-joined'.",
+              "Expected values are 'like', 'repost', 'follow', 'mention', 'reply', 'quote', 'starterpack-joined', 'verified', and 'unverified'.",
             knownValues: [
               'like',
               'repost',
@@ -9728,6 +9752,8 @@ export const schemaDict = {
               'reply',
               'quote',
               'starterpack-joined',
+              'verified',
+              'unverified',
             ],
           },
           reasonSubject: {
@@ -12535,6 +12561,7 @@ export const ids = {
   AppBskyLabelerDefs: 'app.bsky.labeler.defs',
   AppBskyLabelerGetServices: 'app.bsky.labeler.getServices',
   AppBskyLabelerService: 'app.bsky.labeler.service',
+  AppBskyNotificationDefs: 'app.bsky.notification.defs',
   AppBskyNotificationGetUnreadCount: 'app.bsky.notification.getUnreadCount',
   AppBskyNotificationListNotifications:
     'app.bsky.notification.listNotifications',

package/src/lexicon/types/app/bsky/actor/defs.ts

@@ -230,6 +230,7 @@ export type Preferences = (
   | $Typed<BskyAppStatePref>
   | $Typed<LabelersPref>
   | $Typed<PostInteractionSettingsPref>
+  | $Typed<VerificationPrefs>
   | { $type: string }
 )[]
 
@@ -543,6 +544,23 @@ export function validateNux<V>(v: V) {
   return validate<Nux & V>(v, id, hashNux)
 }
 
+/** Preferences for how verified accounts appear in the app. */
+export interface VerificationPrefs {
+  $type?: 'app.bsky.actor.defs#verificationPrefs'
+  /** Hide the blue check badges for verified accounts and trusted verifiers. */
+  hideBadges: boolean
+}
+
+const hashVerificationPrefs = 'verificationPrefs'
+
+export function isVerificationPrefs<V>(v: V) {
+  return is$typed(v, id, hashVerificationPrefs)
+}
+
+export function validateVerificationPrefs<V>(v: V) {
+  return validate<VerificationPrefs & V>(v, id, hashVerificationPrefs)
+}
+
 /** Default post interaction settings for the account. These values should be applied as default values when creating new posts. These refs should mirror the threadgate and postgate records exactly. */
 export interface PostInteractionSettingsPref {
   $type?: 'app.bsky.actor.defs#postInteractionSettingsPref'

package/src/lexicon/types/app/bsky/notification/defs.ts

@@ -0,0 +1,29 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { type ValidationResult, BlobRef } from '@atproto/lexicon'
+import { CID } from 'multiformats/cid'
+import { validate as _validate } from '../../../../lexicons'
+import {
+  type $Typed,
+  is$typed as _is$typed,
+  type OmitKey,
+} from '../../../../util'
+
+const is$typed = _is$typed,
+  validate = _validate
+const id = 'app.bsky.notification.defs'
+
+export interface RecordDeleted {
+  $type?: 'app.bsky.notification.defs#recordDeleted'
+}
+
+const hashRecordDeleted = 'recordDeleted'
+
+export function isRecordDeleted<V>(v: V) {
+  return is$typed(v, id, hashRecordDeleted)
+}
+
+export function validateRecordDeleted<V>(v: V) {
+  return validate<RecordDeleted & V>(v, id, hashRecordDeleted)
+}

package/src/lexicon/types/app/bsky/notification/listNotifications.ts

@@ -67,7 +67,7 @@ export interface Notification {
   uri: string
   cid: string
   author: AppBskyActorDefs.ProfileView
-  /** Expected values are 'like', 'repost', 'follow', 'mention', 'reply', 'quote', and 'starterpack-joined'. */
+  /** Expected values are 'like', 'repost', 'follow', 'mention', 'reply', 'quote', 'starterpack-joined', 'verified', and 'unverified'. */
   reason:
     | 'like'
     | 'repost'
@@ -76,6 +76,8 @@ export interface Notification {
     | 'reply'
     | 'quote'
     | 'starterpack-joined'
+    | 'verified'
+    | 'unverified'
     | (string & {})
   reasonSubject?: string
   record: { [_ in string]: unknown }

package/src/views/index.ts

@@ -2,7 +2,7 @@ import { mapDefined } from '@atproto/common'
 import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import { ProfileViewerState } from '../hydration/actor'
 import { FeedItem, Like, Post, Repost } from '../hydration/feed'
-import { Follow } from '../hydration/graph'
+import { Follow, Verification } from '../hydration/graph'
 import { HydrationState } from '../hydration/hydrator'
 import { Label } from '../hydration/label'
 import { RecordInfo } from '../hydration/util'
@@ -48,6 +48,7 @@ import {
   StarterPackViewBasic,
 } from '../lexicon/types/app/bsky/graph/defs'
 import { Record as FollowRecord } from '../lexicon/types/app/bsky/graph/follow'
+import { Record as VerificationRecord } from '../lexicon/types/app/bsky/graph/verification'
 import {
   LabelerView,
   LabelerViewDetailed,
@@ -56,6 +57,7 @@ import {
   Record as LabelerRecord,
   isRecord as isLabelerRecord,
 } from '../lexicon/types/app/bsky/labeler/service'
+import { RecordDeleted as NotificationRecordDeleted } from '../lexicon/types/app/bsky/notification/defs'
 import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
 import { $Typed, Un$Typed } from '../lexicon/util'
 import { Notification } from '../proto/bsky_pb'
@@ -99,6 +101,14 @@ import {
   parseThreadGate,
 } from './util'
 
+const notificationDeletedRecord = {
+  $type: 'app.bsky.notification.defs#recordDeleted' as const,
+}
+
+// Pre-computed CID for the `notificationDeletedRecord`.
+const notificationDeletedRecordCid =
+  'bafyreidad6nyekfa4a67yfb573ptxiv6s7kyxyg2ra6qbbemcruadvtuim'
+
 export class Views {
   public imgUriBuilder: ImageUriBuilder = this.opts.imgUriBuilder
   public videoUriBuilder: VideoUriBuilder = this.opts.videoUriBuilder
@@ -582,6 +592,8 @@ export class Views {
       | FollowRecord
       | ProfileRecord
       | LabelerRecord
+      | VerificationRecord
+      | NotificationRecordDeleted
   }): Label[] {
     if (!uri || !cid || !record) return []
 
@@ -1415,6 +1427,8 @@ export class Views {
       | Repost
       | Follow
       | RecordInfo<ProfileRecord>
+      | Verification
+      | Pick<RecordInfo<Required<NotificationRecordDeleted>>, 'cid' | 'record'>
       | undefined
       | null
 
@@ -1426,6 +1440,13 @@ export class Views {
       recordInfo = state.reposts?.get(notif.uri)
     } else if (uri.collection === ids.AppBskyGraphFollow) {
       recordInfo = state.follows?.get(notif.uri)
+    } else if (uri.collection === ids.AppBskyGraphVerification) {
+      // When a verification record is removed, the record won't be found,
+      // both for the `verified` and `unverified` notifications.
+      recordInfo = state.verifications?.get(notif.uri) ?? {
+        record: notificationDeletedRecord,
+        cid: notificationDeletedRecordCid,
+      }
     } else if (uri.collection === ids.AppBskyActorProfile) {
       const actor = state.actors?.get(authorDid)
       recordInfo =

package/tests/views/__snapshots__/notifications.test.ts.snap

@@ -1652,3 +1652,143 @@ Array [
   },
 ]
 `;
+
+exports[`notification views generates notifications for verification created and removed 1`] = `
+Array [
+  Object {
+    "author": Object {
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "its me!",
+      "did": "user(0)",
+      "displayName": "ali",
+      "handle": "alice.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [
+        Object {
+          "cid": "cids(2)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(0)",
+          "uri": "record(3)",
+          "val": "self-label-a",
+        },
+        Object {
+          "cid": "cids(2)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(0)",
+          "uri": "record(3)",
+          "val": "self-label-b",
+        },
+      ],
+      "viewer": Object {
+        "blockedBy": false,
+        "followedBy": "record(2)",
+        "following": "record(1)",
+        "muted": false,
+      },
+    },
+    "cid": "cids(0)",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "isRead": false,
+    "labels": Array [],
+    "reason": "verified",
+    "record": Object {
+      "$type": "app.bsky.graph.verification",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "displayName": "bobby",
+      "handle": "bob.test",
+      "subject": "user(2)",
+    },
+    "uri": "record(0)",
+  },
+]
+`;
+
+exports[`notification views generates notifications for verification created and removed 2`] = `
+Array [
+  Object {
+    "author": Object {
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "its me!",
+      "did": "user(0)",
+      "displayName": "ali",
+      "handle": "alice.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [
+        Object {
+          "cid": "cids(2)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(0)",
+          "uri": "record(3)",
+          "val": "self-label-a",
+        },
+        Object {
+          "cid": "cids(2)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(0)",
+          "uri": "record(3)",
+          "val": "self-label-b",
+        },
+      ],
+      "viewer": Object {
+        "blockedBy": false,
+        "followedBy": "record(2)",
+        "following": "record(1)",
+        "muted": false,
+      },
+    },
+    "cid": "cids(0)",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "isRead": false,
+    "labels": Array [],
+    "reason": "unverified",
+    "record": Object {
+      "$type": "app.bsky.notification.defs#recordDeleted",
+    },
+    "uri": "record(0)",
+  },
+  Object {
+    "author": Object {
+      "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
+      "createdAt": "1970-01-01T00:00:00.000Z",
+      "description": "its me!",
+      "did": "user(0)",
+      "displayName": "ali",
+      "handle": "alice.test",
+      "indexedAt": "1970-01-01T00:00:00.000Z",
+      "labels": Array [
+        Object {
+          "cid": "cids(2)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(0)",
+          "uri": "record(3)",
+          "val": "self-label-a",
+        },
+        Object {
+          "cid": "cids(2)",
+          "cts": "1970-01-01T00:00:00.000Z",
+          "src": "user(0)",
+          "uri": "record(3)",
+          "val": "self-label-b",
+        },
+      ],
+      "viewer": Object {
+        "blockedBy": false,
+        "followedBy": "record(2)",
+        "following": "record(1)",
+        "muted": false,
+      },
+    },
+    "cid": "cids(0)",
+    "indexedAt": "1970-01-01T00:00:00.000Z",
+    "isRead": true,
+    "labels": Array [],
+    "reason": "verified",
+    "record": Object {
+      "$type": "app.bsky.notification.defs#recordDeleted",
+    },
+    "uri": "record(0)",
+  },
+]
+`;

package/tests/views/notifications.test.ts

@@ -20,6 +20,11 @@ describe('notification views', () => {
     agent = network.bsky.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc)
+    await network.bsky.db.db
+      .updateTable('actor')
+      .set({ trustedVerifier: true })
+      .where('did', '=', alice)
+      .execute()
     await network.processAll()
     alice = sc.dids.alice
   })
@@ -151,6 +156,39 @@ describe('notification views', () => {
     expect(forSnapshot(sort(notifsDan.data.notifications))).toMatchSnapshot()
   })
 
+  it('generates notifications for verification created and removed', async () => {
+    await sc.verify(
+      sc.dids.alice,
+      sc.dids.bob,
+      sc.accounts[sc.dids.bob].handle,
+      sc.profiles[sc.dids.bob].displayName,
+    )
+    await network.processAll()
+    const notifsBob1 = await agent.app.bsky.notification.listNotifications(
+      { reasons: ['verified', 'unverified'] },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.bob,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
+    )
+    expect(forSnapshot(sort(notifsBob1.data.notifications))).toMatchSnapshot()
+
+    await sc.unverify(sc.dids.alice, sc.dids.bob)
+    await network.processAll()
+    const notifsBob2 = await agent.app.bsky.notification.listNotifications(
+      { reasons: ['verified', 'unverified'] },
+      {
+        headers: await network.serviceHeaders(
+          sc.dids.bob,
+          ids.AppBskyNotificationListNotifications,
+        ),
+      },
+    )
+    expect(forSnapshot(sort(notifsBob2.data.notifications))).toMatchSnapshot()
+  })
+
   it('fetches notifications without a last-seen', async () => {
     const notifRes = await agent.api.app.bsky.notification.listNotifications(
       {},