@atproto/bsky 0.0.149 → 0.0.151

package/src/data-plane/server/indexing/plugins/like.ts

@@ -1,4 +1,4 @@
-import { Selectable } from 'kysely'
+import { Insertable, Selectable } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
@@ -6,10 +6,13 @@ import * as Like from '../../../../lexicon/types/app/bsky/feed/like'
 import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { Notification } from '../../db/tables/notification'
 import { countAll, excluded } from '../../db/util'
 import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedLike
+
+type Notif = Insertable<Notification>
 type IndexedLike = Selectable<DatabaseSchemaType['like']>
 
 const insertFn = async (
@@ -27,6 +30,8 @@ const insertFn = async (
       creator: uri.host,
       subject: obj.subject.uri,
       subjectCid: obj.subject.cid,
+      via: obj.via?.uri,
+      viaCid: obj.via?.cid,
       createdAt: normalizeDatetimeAlways(obj.createdAt),
       indexedAt: timestamp,
     })
@@ -53,20 +58,45 @@ const findDuplicate = async (
 const notifsForInsert = (obj: IndexedLike) => {
   const subjectUri = new AtUri(obj.subject)
   // prevent self-notifications
-  const isSelf = subjectUri.host === obj.creator
-  return isSelf
-    ? []
-    : [
+  const isLikeFromSubjectUser = subjectUri.host === obj.creator
+  if (isLikeFromSubjectUser) {
+    return []
+  }
+
+  const notifs: Notif[] = [
+    // Notification to the author of the liked record.
+    {
+      did: subjectUri.host,
+      author: obj.creator,
+      recordUri: obj.uri,
+      recordCid: obj.cid,
+      reason: 'like' as const,
+      reasonSubject: subjectUri.toString(),
+      sortAt: obj.sortAt,
+    },
+  ]
+
+  if (obj.via) {
+    const viaUri = new AtUri(obj.via)
+    const isLikeFromViaSubjectUser = viaUri.host === obj.creator
+    // prevent self-notifications
+    if (!isLikeFromViaSubjectUser) {
+      notifs.push(
+        // Notification to the reposter via whose repost the like was made.
         {
-          did: subjectUri.host,
+          did: viaUri.host,
           author: obj.creator,
           recordUri: obj.uri,
           recordCid: obj.cid,
-          reason: 'like' as const,
-          reasonSubject: subjectUri.toString(),
+          reason: 'like-via-repost' as const,
+          reasonSubject: viaUri.toString(),
           sortAt: obj.sortAt,
         },
-      ]
+      )
+    }
+  }
+
+  return notifs
 }
 
 const deleteFn = async (

package/src/data-plane/server/indexing/plugins/repost.ts

@@ -1,4 +1,4 @@
-import { Selectable } from 'kysely'
+import { Insertable, Selectable } from 'kysely'
 import { CID } from 'multiformats/cid'
 import { AtUri, normalizeDatetimeAlways } from '@atproto/syntax'
 import * as lex from '../../../../lexicon/lexicons'
@@ -6,10 +6,12 @@ import * as Repost from '../../../../lexicon/types/app/bsky/feed/repost'
 import { BackgroundQueue } from '../../background'
 import { Database } from '../../db'
 import { DatabaseSchema, DatabaseSchemaType } from '../../db/database-schema'
+import { Notification } from '../../db/tables/notification'
 import { countAll, excluded } from '../../db/util'
 import { RecordProcessor } from '../processor'
 
 const lexId = lex.ids.AppBskyFeedRepost
+type Notif = Insertable<Notification>
 type IndexedRepost = Selectable<DatabaseSchemaType['repost']>
 
 const insertFn = async (
@@ -25,6 +27,8 @@ const insertFn = async (
     creator: uri.host,
     subject: obj.subject.uri,
     subjectCid: obj.subject.cid,
+    via: obj.via?.uri,
+    viaCid: obj.via?.cid,
     createdAt: normalizeDatetimeAlways(obj.createdAt),
     indexedAt: timestamp,
   }
@@ -72,20 +76,45 @@ const findDuplicate = async (
 const notifsForInsert = (obj: IndexedRepost) => {
   const subjectUri = new AtUri(obj.subject)
   // prevent self-notifications
-  const isSelf = subjectUri.host === obj.creator
-  return isSelf
-    ? []
-    : [
+  const isRepostFromSubjectUser = subjectUri.host === obj.creator
+  if (isRepostFromSubjectUser) {
+    return []
+  }
+
+  const notifs: Notif[] = [
+    // Notification to the author of the reposted record.
+    {
+      did: subjectUri.host,
+      author: obj.creator,
+      recordUri: obj.uri,
+      recordCid: obj.cid,
+      reason: 'repost' as const,
+      reasonSubject: subjectUri.toString(),
+      sortAt: obj.sortAt,
+    },
+  ]
+
+  if (obj.via) {
+    const viaUri = new AtUri(obj.via)
+    const isRepostFromViaSubjectUser = viaUri.host === obj.creator
+    // prevent self-notifications
+    if (!isRepostFromViaSubjectUser) {
+      notifs.push(
+        // Notification to the reposter via whose repost the repost was made.
         {
-          did: subjectUri.host,
+          did: viaUri.host,
           author: obj.creator,
           recordUri: obj.uri,
           recordCid: obj.cid,
-          reason: 'repost' as const,
-          reasonSubject: subjectUri.toString(),
+          reason: 'repost-via-repost' as const,
+          reasonSubject: viaUri.toString(),
           sortAt: obj.sortAt,
         },
-      ]
+      )
+    }
+  }
+
+  return notifs
 }
 
 const deleteFn = async (

package/src/lexicon/lexicons.ts

@@ -6221,6 +6221,12 @@ export const schemaDict = {
               'Context provided by feed generator that may be passed back alongside interactions.',
             maxLength: 2000,
           },
+          reqId: {
+            type: 'string',
+            description:
+              'Unique identifier per request that may be passed back alongside interactions.',
+            maxLength: 100,
+          },
         },
       },
       replyRef: {
@@ -6259,6 +6265,14 @@ export const schemaDict = {
             type: 'ref',
             ref: 'lex:app.bsky.actor.defs#profileViewBasic',
           },
+          uri: {
+            type: 'string',
+            format: 'at-uri',
+          },
+          cid: {
+            type: 'string',
+            format: 'cid',
+          },
           indexedAt: {
             type: 'string',
             format: 'datetime',
@@ -6517,6 +6531,12 @@ export const schemaDict = {
               'Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton.',
             maxLength: 2000,
           },
+          reqId: {
+            type: 'string',
+            description:
+              'Unique identifier per request that may be passed back alongside interactions.',
+            maxLength: 100,
+          },
         },
       },
       requestLess: {
@@ -7065,6 +7085,12 @@ export const schemaDict = {
                   ref: 'lex:app.bsky.feed.defs#skeletonFeedPost',
                 },
               },
+              reqId: {
+                type: 'string',
+                description:
+                  'Unique identifier per request that may be passed back alongside interactions.',
+                maxLength: 100,
+              },
             },
           },
         },
@@ -7558,6 +7584,10 @@ export const schemaDict = {
               type: 'string',
               format: 'datetime',
             },
+            via: {
+              type: 'ref',
+              ref: 'lex:com.atproto.repo.strongRef',
+            },
           },
         },
       },
@@ -7772,6 +7802,10 @@ export const schemaDict = {
               type: 'string',
               format: 'datetime',
             },
+            via: {
+              type: 'ref',
+              ref: 'lex:com.atproto.repo.strongRef',
+            },
           },
         },
       },
@@ -7784,7 +7818,7 @@ export const schemaDict = {
       main: {
         type: 'query',
         description:
-          'Find posts matching search criteria, returning views of those posts.',
+          'Find posts matching search criteria, returning views of those posts. Note that this API endpoint may require authentication (eg, not public) for some service providers and implementations.',
         parameters: {
           type: 'params',
           required: ['q'],
@@ -9827,7 +9861,7 @@ export const schemaDict = {
           reason: {
             type: 'string',
             description:
-              "Expected values are 'like', 'repost', 'follow', 'mention', 'reply', 'quote', 'starterpack-joined', 'verified', and 'unverified'.",
+              'The reason why this notification was delivered - e.g. your post was liked, or you received a new follower.',
             knownValues: [
               'like',
               'repost',
@@ -9838,6 +9872,8 @@ export const schemaDict = {
               'starterpack-joined',
               'verified',
               'unverified',
+              'like-via-repost',
+              'repost-via-repost',
             ],
           },
           reasonSubject: {

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

@@ -100,6 +100,8 @@ export interface FeedViewPost {
   reason?: $Typed<ReasonRepost> | $Typed<ReasonPin> | { $type: string }
   /** Context provided by feed generator that may be passed back alongside interactions. */
   feedContext?: string
+  /** Unique identifier per request that may be passed back alongside interactions. */
+  reqId?: string
 }
 
 const hashFeedViewPost = 'feedViewPost'
@@ -140,6 +142,8 @@ export function validateReplyRef<V>(v: V) {
 export interface ReasonRepost {
   $type?: 'app.bsky.feed.defs#reasonRepost'
   by: AppBskyActorDefs.ProfileViewBasic
+  uri?: string
+  cid?: string
   indexedAt: string
 }
 
@@ -376,6 +380,8 @@ export interface Interaction {
     | (string & {})
   /** Context on a feed item that was originally supplied by the feed generator on getFeedSkeleton. */
   feedContext?: string
+  /** Unique identifier per request that may be passed back alongside interactions. */
+  reqId?: string
 }
 
 const hashInteraction = 'interaction'

package/src/lexicon/types/app/bsky/feed/getFeedSkeleton.ts

@@ -29,6 +29,8 @@ export type InputSchema = undefined
 export interface OutputSchema {
   cursor?: string
   feed: AppBskyFeedDefs.SkeletonFeedPost[]
+  /** Unique identifier per request that may be passed back alongside interactions. */
+  reqId?: string
 }
 
 export type HandlerInput = undefined

package/src/lexicon/types/app/bsky/feed/like.ts

@@ -19,6 +19,7 @@ export interface Record {
   $type: 'app.bsky.feed.like'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
+  via?: ComAtprotoRepoStrongRef.Main
   [k: string]: unknown
 }
 

package/src/lexicon/types/app/bsky/feed/repost.ts

@@ -19,6 +19,7 @@ export interface Record {
   $type: 'app.bsky.feed.repost'
   subject: ComAtprotoRepoStrongRef.Main
   createdAt: string
+  via?: ComAtprotoRepoStrongRef.Main
   [k: string]: unknown
 }
 

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', 'starterpack-joined', 'verified', and 'unverified'. */
+  /** The reason why this notification was delivered - e.g. your post was liked, or you received a new follower. */
   reason:
     | 'like'
     | 'repost'
@@ -78,6 +78,8 @@ export interface Notification {
     | 'starterpack-joined'
     | 'verified'
     | 'unverified'
+    | 'like-via-repost'
+    | 'repost-via-repost'
     | (string & {})
   reasonSubject?: string
   record: { [_ in string]: unknown }

package/src/views/index.ts

@@ -868,7 +868,7 @@ export class Views {
       const repost = state.reposts?.get(item.repost.uri)
       if (!repost) return
       if (repost.record.subject.uri !== item.post.uri) return
-      reason = this.reasonRepost(creatorFromUri(item.repost.uri), repost, state)
+      reason = this.reasonRepost(item.repost.uri, repost, state)
       if (!reason) return
     }
     const post = this.post(item.post.uri, state)
@@ -958,15 +958,18 @@ export class Views {
   }
 
   reasonRepost(
-    creatorDid: string,
+    uri: string,
     repost: Repost,
     state: HydrationState,
   ): $Typed<ReasonRepost> | undefined {
+    const creatorDid = creatorFromUri(uri)
     const creator = this.profileBasic(creatorDid, state)
     if (!creator) return
     return {
       $type: 'app.bsky.feed.defs#reasonRepost',
       by: creator,
+      uri,
+      cid: repost.cid,
       indexedAt: this.indexedAt(repost).toISOString(),
     }
   }

package/tests/__snapshots__/feed-generation.test.ts.snap

@@ -646,6 +646,7 @@ Array [
         "threadMuted": false,
       },
     },
+    "reqId": "req-id-abc-def-ghi",
   },
   Object {
     "feedContext": "item-1",
@@ -686,6 +687,7 @@ Array [
         "threadMuted": false,
       },
     },
+    "reqId": "req-id-abc-def-ghi",
   },
   Object {
     "feedContext": "item-2",
@@ -811,6 +813,7 @@ Array [
         "threadMuted": false,
       },
     },
+    "reqId": "req-id-abc-def-ghi",
   },
   Object {
     "feedContext": "item-4",
@@ -950,6 +953,7 @@ Array [
         },
       },
     },
+    "reqId": "req-id-abc-def-ghi",
   },
   Object {
     "feedContext": "item-5",
@@ -1143,8 +1147,11 @@ Array [
           "muted": false,
         },
       },
+      "cid": "cids(10)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
+      "uri": "record(13)",
     },
+    "reqId": "req-id-abc-def-ghi",
   },
 ]
 `;
@@ -1207,6 +1214,7 @@ Array [
       "repostCount": 0,
       "uri": "record(0)",
     },
+    "reqId": "req-id-abc-def-ghi",
   },
   Object {
     "feedContext": "item-2",
@@ -1315,6 +1323,7 @@ Array [
       "repostCount": 0,
       "uri": "record(2)",
     },
+    "reqId": "req-id-abc-def-ghi",
   },
   Object {
     "feedContext": "item-4",
@@ -1428,6 +1437,7 @@ Array [
         "uri": "record(5)",
       },
     },
+    "reqId": "req-id-abc-def-ghi",
   },
 ]
 `;
@@ -1498,6 +1508,7 @@ Array [
         "threadMuted": false,
       },
     },
+    "reqId": "req-id-abc-def-ghi",
   },
   Object {
     "feedContext": "item-2",
@@ -1623,6 +1634,7 @@ Array [
         "threadMuted": false,
       },
     },
+    "reqId": "req-id-abc-def-ghi",
   },
   Object {
     "feedContext": "item-4",
@@ -1762,6 +1774,7 @@ Array [
         },
       },
     },
+    "reqId": "req-id-abc-def-ghi",
   },
 ]
 `;

package/tests/feed-generation.test.ts

@@ -848,6 +848,7 @@ describe('feed generation', () => {
         body: {
           feed: feedResults,
           cursor: cursorResult,
+          reqId: 'req-id-abc-def-ghi',
           $auth: jwtBody(req.headers.authorization), // for testing purposes
         },
       }

package/tests/views/__snapshots__/author-feed.test.ts.snap

@@ -971,7 +971,9 @@ Array [
           "muted": false,
         },
       },
+      "cid": "cids(6)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
+      "uri": "record(4)",
     },
   },
   Object {
@@ -985,7 +987,7 @@ Array [
           "muted": false,
         },
       },
-      "cid": "cids(6)",
+      "cid": "cids(7)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,
@@ -995,11 +997,11 @@ Array [
         "createdAt": "1970-01-01T00:00:00.000Z",
         "reply": Object {
           "parent": Object {
-            "cid": "cids(7)",
+            "cid": "cids(8)",
             "uri": "record(6)",
           },
           "root": Object {
-            "cid": "cids(7)",
+            "cid": "cids(8)",
             "uri": "record(6)",
           },
         },
@@ -1024,14 +1026,14 @@ Array [
           "handle": "alice.test",
           "labels": Array [
             Object {
-              "cid": "cids(8)",
+              "cid": "cids(9)",
               "cts": "1970-01-01T00:00:00.000Z",
               "src": "user(1)",
               "uri": "record(9)",
               "val": "self-label-a",
             },
             Object {
-              "cid": "cids(8)",
+              "cid": "cids(9)",
               "cts": "1970-01-01T00:00:00.000Z",
               "src": "user(1)",
               "uri": "record(9)",
@@ -1045,7 +1047,7 @@ Array [
             "muted": false,
           },
         },
-        "cid": "cids(7)",
+        "cid": "cids(8)",
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
@@ -1074,14 +1076,14 @@ Array [
           "handle": "alice.test",
           "labels": Array [
             Object {
-              "cid": "cids(8)",
+              "cid": "cids(9)",
               "cts": "1970-01-01T00:00:00.000Z",
               "src": "user(1)",
               "uri": "record(9)",
               "val": "self-label-a",
             },
             Object {
-              "cid": "cids(8)",
+              "cid": "cids(9)",
               "cts": "1970-01-01T00:00:00.000Z",
               "src": "user(1)",
               "uri": "record(9)",
@@ -1095,7 +1097,7 @@ Array [
             "muted": false,
           },
         },
-        "cid": "cids(7)",
+        "cid": "cids(8)",
         "indexedAt": "1970-01-01T00:00:00.000Z",
         "labels": Array [],
         "likeCount": 3,
@@ -1316,7 +1318,9 @@ Array [
           "muted": false,
         },
       },
+      "cid": "cids(5)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
+      "uri": "record(5)",
     },
     "reply": Object {
       "grandparentAuthor": Object {
@@ -1368,8 +1372,8 @@ Array [
           "images": Array [
             Object {
               "alt": "../dev-env/assets/key-landscape-small.jpg",
-              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(4)/cids(5)@jpeg",
-              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(4)/cids(5)@jpeg",
+              "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(4)/cids(6)@jpeg",
+              "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(4)/cids(6)@jpeg",
             },
           ],
         },
@@ -1404,7 +1408,7 @@ Array [
                   "$type": "blob",
                   "mimeType": "image/jpeg",
                   "ref": Object {
-                    "$link": "cids(5)",
+                    "$link": "cids(6)",
                   },
                   "size": 4114,
                 },
@@ -1549,7 +1553,9 @@ Array [
           "muted": false,
         },
       },
+      "cid": "cids(7)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
+      "uri": "record(6)",
     },
   },
   Object {
@@ -1568,7 +1574,7 @@ Array [
           "muted": false,
         },
       },
-      "cid": "cids(6)",
+      "cid": "cids(8)",
       "embed": Object {
         "$type": "app.bsky.embed.record#view",
         "record": Object {
@@ -1582,7 +1588,7 @@ Array [
               "muted": false,
             },
           },
-          "cid": "cids(7)",
+          "cid": "cids(9)",
           "embeds": Array [
             Object {
               "$type": "app.bsky.embed.recordWithMedia#view",
@@ -1591,13 +1597,13 @@ Array [
                 "images": Array [
                   Object {
                     "alt": "../dev-env/assets/key-landscape-small.jpg",
-                    "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(5)@jpeg",
-                    "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(5)@jpeg",
+                    "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(6)@jpeg",
+                    "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(6)@jpeg",
                   },
                   Object {
                     "alt": "../dev-env/assets/key-alt.jpg",
-                    "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(8)@jpeg",
-                    "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(8)@jpeg",
+                    "fullsize": "https://bsky.public.url/img/feed_fullsize/plain/user(6)/cids(10)@jpeg",
+                    "thumb": "https://bsky.public.url/img/feed_thumbnail/plain/user(6)/cids(10)@jpeg",
                   },
                 ],
               },
@@ -1617,7 +1623,7 @@ Array [
                       "muted": false,
                     },
                   },
-                  "cid": "cids(9)",
+                  "cid": "cids(11)",
                   "indexedAt": "1970-01-01T00:00:00.000Z",
                   "labels": Array [],
                   "likeCount": 0,
@@ -1659,7 +1665,7 @@ Array [
                       "$type": "blob",
                       "mimeType": "image/jpeg",
                       "ref": Object {
-                        "$link": "cids(5)",
+                        "$link": "cids(6)",
                       },
                       "size": 4114,
                     },
@@ -1670,7 +1676,7 @@ Array [
                       "$type": "blob",
                       "mimeType": "image/jpeg",
                       "ref": Object {
-                        "$link": "cids(8)",
+                        "$link": "cids(10)",
                       },
                       "size": 12736,
                     },
@@ -1679,7 +1685,7 @@ Array [
               },
               "record": Object {
                 "record": Object {
-                  "cid": "cids(9)",
+                  "cid": "cids(11)",
                   "uri": "record(11)",
                 },
               },
@@ -1698,7 +1704,7 @@ Array [
         "embed": Object {
           "$type": "app.bsky.embed.record",
           "record": Object {
-            "cid": "cids(7)",
+            "cid": "cids(9)",
             "uri": "record(10)",
           },
         },
@@ -1743,7 +1749,7 @@ Array [
           "muted": false,
         },
       },
-      "cid": "cids(10)",
+      "cid": "cids(12)",
       "indexedAt": "1970-01-01T00:00:00.000Z",
       "labels": Array [],
       "likeCount": 0,