@atproto/bsky 0.0.76 → 0.0.78

package/dist/views/util.d.ts

@@ -1,7 +1,7 @@
 import { BlobRef } from '@atproto/lexicon';
 import { Record as PostRecord } from '../lexicon/types/app/bsky/feed/post';
 import { Record as GateRecord } from '../lexicon/types/app/bsky/feed/threadgate';
-export declare const creatorFromUri: (uri: string) => string;
+import { Record as PostgateRecord } from '../lexicon/types/app/bsky/feed/postgate';
 export declare const parseThreadGate: (replierDid: string, ownerDid: string, rootPost: PostRecord | null, gate: GateRecord | null) => ParsedThreadGate;
 type ParsedThreadGate = {
     canReply?: boolean;
@@ -10,5 +10,15 @@ type ParsedThreadGate = {
     allowListUris?: string[];
 };
 export declare const cidFromBlobJson: (json: BlobRef) => string;
+export declare const parsePostgate: ({ gate, viewerDid, authorDid, }: {
+    gate: PostgateRecord | undefined;
+    viewerDid: string | undefined;
+    authorDid: string;
+}) => ParsedPostgate;
+type ParsedPostgate = {
+    embeddingRules: {
+        canEmbed: boolean;
+    };
+};
 export {};
 //# sourceMappingURL=util.d.ts.map

package/dist/views/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/views/util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAC1E,OAAO,EACL,MAAM,IAAI,UAAU,EAIrB,MAAM,2CAA2C,CAAA;AAGlD,eAAO,MAAM,cAAc,QAAS,MAAM,KAAG,MAE5C,CAAA;AAED,eAAO,MAAM,eAAe,eACd,MAAM,YACR,MAAM,YACN,UAAU,GAAG,IAAI,QACrB,UAAU,GAAG,IAAI,KACtB,gBAyBF,CAAA;AAED,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,eAAe,SAAU,OAAO,WAS5C,CAAA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../src/views/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAC1E,OAAO,EACL,MAAM,IAAI,UAAU,EAIrB,MAAM,2CAA2C,CAAA;AAClD,OAAO,EACL,MAAM,IAAI,cAAc,EAEzB,MAAM,yCAAyC,CAAA;AAGhD,eAAO,MAAM,eAAe,eACd,MAAM,YACR,MAAM,YACN,UAAU,GAAG,IAAI,QACrB,UAAU,GAAG,IAAI,KACtB,gBAyBF,CAAA;AAED,KAAK,gBAAgB,GAAG;IACtB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,eAAe,SAAU,OAAO,WAS5C,CAAA;AAED,eAAO,MAAM,aAAa,oCAIvB;IACD,IAAI,EAAE,cAAc,GAAG,SAAS,CAAA;IAChC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IAC7B,SAAS,EAAE,MAAM,CAAA;CAClB,KAAG,cAeH,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,cAAc,EAAE;QACd,QAAQ,EAAE,OAAO,CAAA;KAClB,CAAA;CACF,CAAA"}

package/dist/views/util.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cidFromBlobJson = exports.parseThreadGate = exports.creatorFromUri = void 0;
-const syntax_1 = require("@atproto/syntax");
+exports.parsePostgate = exports.cidFromBlobJson = exports.parseThreadGate = void 0;
 const lexicon_1 = require("@atproto/lexicon");
 const threadgate_1 = require("../lexicon/types/app/bsky/feed/threadgate");
+const postgate_1 = require("../lexicon/types/app/bsky/feed/postgate");
 const facet_1 = require("../lexicon/types/app/bsky/richtext/facet");
-const creatorFromUri = (uri) => {
-    return new syntax_1.AtUri(uri).hostname;
-};
-exports.creatorFromUri = creatorFromUri;
 const parseThreadGate = (replierDid, ownerDid, rootPost, gate) => {
     if (replierDid === ownerDid) {
         return { canReply: true };
@@ -17,8 +13,8 @@ const parseThreadGate = (replierDid, ownerDid, rootPost, gate) => {
     if (!gate || !gate.allow) {
         return { canReply: true };
     }
-    const allowMentions = !!gate.allow.find(threadgate_1.isMentionRule);
-    const allowFollowing = !!gate.allow.find(threadgate_1.isFollowingRule);
+    const allowMentions = gate.allow.some(threadgate_1.isMentionRule);
+    const allowFollowing = gate.allow.some(threadgate_1.isFollowingRule);
     const allowListUris = gate.allow?.filter(threadgate_1.isListRule).map((item) => item.list);
     // check mentions first since it's quick and synchronous
     if (allowMentions) {
@@ -43,4 +39,19 @@ const cidFromBlobJson = (json) => {
     return (json['cid'] ?? '');
 };
 exports.cidFromBlobJson = cidFromBlobJson;
+const parsePostgate = ({ gate, viewerDid, authorDid, }) => {
+    if (viewerDid === authorDid) {
+        return { embeddingRules: { canEmbed: true } };
+    }
+    // default state is unset, allow everyone
+    if (!gate || !gate.embeddingRules) {
+        return { embeddingRules: { canEmbed: true } };
+    }
+    const disabled = gate.embeddingRules.some(postgate_1.isDisableRule);
+    if (disabled) {
+        return { embeddingRules: { canEmbed: false } };
+    }
+    return { embeddingRules: { canEmbed: true } };
+};
+exports.parsePostgate = parsePostgate;
 //# sourceMappingURL=util.js.map

package/dist/views/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/views/util.ts"],"names":[],"mappings":";;;AAAA,4CAAuC;AACvC,8CAA0C;AAE1C,0EAKkD;AAClD,oEAAoE;AAE7D,MAAM,cAAc,GAAG,CAAC,GAAW,EAAU,EAAE;IACpD,OAAO,IAAI,cAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAA;AAChC,CAAC,CAAA;AAFY,QAAA,cAAc,kBAE1B;AAEM,MAAM,eAAe,GAAG,CAC7B,UAAkB,EAClB,QAAgB,EAChB,QAA2B,EAC3B,IAAuB,EACL,EAAE;IACpB,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;IAC3B,CAAC;IACD,yGAAyG;IACzG,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QACzB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;IAC3B,CAAC;IAED,MAAM,aAAa,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,0BAAa,CAAC,CAAA;IACtD,MAAM,cAAc,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,4BAAe,CAAC,CAAA;IACzD,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC,uBAAU,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAE7E,wDAAwD;IACxD,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,WAAW,GAAG,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACnD,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,CACxB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,iBAAS,EAAC,IAAI,CAAC,IAAI,IAAI,CAAC,GAAG,KAAK,UAAU,CACrD,CAAA;QACH,CAAC,CAAC,CAAA;QACF,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,CAAA;QACzE,CAAC;IACH,CAAC;IACD,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,aAAa,EAAE,CAAA;AACzD,CAAC,CAAA;AA9BY,QAAA,eAAe,mBA8B3B;AASM,MAAM,eAAe,GAAG,CAAC,IAAa,EAAE,EAAE;IAC/C,IAAI,IAAI,YAAY,iBAAO,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAA;IAC5B,CAAC;IACD,oGAAoG;IACpG,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;QAC7B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,CAAW,CAAA;IACjD,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAW,CAAA;AACtC,CAAC,CAAA;AATY,QAAA,eAAe,mBAS3B"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../src/views/util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.76",
+  "version": "0.0.78",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -40,7 +40,7 @@
     "structured-headers": "^1.0.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.13.1",
+    "@atproto/api": "^0.13.3",
     "@atproto/common": "^0.4.1",
     "@atproto/crypto": "^0.4.0",
     "@atproto/identity": "^0.4.0",
@@ -62,9 +62,9 @@
     "axios": "^0.27.2",
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
-    "@atproto/api": "^0.13.1",
+    "@atproto/api": "^0.13.3",
     "@atproto/lex-cli": "^0.5.0",
-    "@atproto/pds": "^0.4.50",
+    "@atproto/pds": "^0.4.53",
     "@atproto/xrpc": "^0.6.0"
   },
   "scripts": {

package/proto/bsky.proto

@@ -79,6 +79,9 @@ message PostRecordMeta {
   bool violates_thread_gate = 1;
   bool has_media = 2;
   bool is_reply = 3;
+  bool violates_embedding_rules = 4;
+  bool has_post_gate = 5;
+  bool has_thread_gate = 6;
 }
 
 message GetPostRecordsRequest {
@@ -122,6 +125,14 @@ message GetThreadGateRecordsResponse {
   repeated Record records = 1;
 }
 
+message GetPostgateRecordsRequest {
+  repeated string uris = 1;
+}
+
+message GetPostgateRecordsResponse {
+  repeated Record records = 1;
+}
+
 message GetLabelerRecordsRequest {
   repeated string uris = 1;
 }
@@ -220,6 +231,17 @@ message GetLikesBySubjectSortedResponse {
   string cursor = 2;
 }
 
+message GetQuotesBySubjectSortedRequest {
+  RecordRef subject = 1;
+  int32 limit = 2;
+  string cursor = 3;
+}
+
+message GetQuotesBySubjectSortedResponse {
+  repeated string uris = 1;
+  string cursor = 2;
+}
+
 // - return like uris for user A on subject B, C, D...
 //     - viewer state on posts
 message GetLikesByActorAndSubjectsRequest {
@@ -260,6 +282,7 @@ message GetInteractionCountsResponse {
   repeated int32 likes = 1;
   repeated int32 reposts = 2;
   repeated int32 replies = 3;
+  repeated int32 quotes = 4;
 }
 
 message GetCountsForUsersRequest {
@@ -293,6 +316,15 @@ message GetListCountsResponse {
   repeated int32 list_items = 1;
 }
 
+message GetNewUserCountForRangeRequest {
+  google.protobuf.Timestamp start = 1;
+  google.protobuf.Timestamp end = 2;
+}
+
+message GetNewUserCountForRangeResponse {
+  int32 count = 1;
+}
+
 //
 // Reposts
 //
@@ -568,7 +600,6 @@ message GetThreadMutesOnSubjectsResponse {
   repeated bool muted = 1;
 }
 
-
 //
 // Blocks
 //
@@ -1030,15 +1061,19 @@ message GetRecordTakedownResponse {
 
 // Polo-backed Graph Endpoints
 
-// GetFollowsFollowing gets the list of DIDs that the actor follows that also follow the target
+
+
+// GetFollowsFollowing gets the list of DIDs that the actor follows that also follow the targets
 message GetFollowsFollowingRequest {
   string actor_did = 1;
   repeated string target_dids = 2;
 }
+
 message FollowsFollowing {
   string target_did = 1;
   repeated string dids = 2;
 }
+
 message GetFollowsFollowingResponse {
   repeated FollowsFollowing results = 1;
 }
@@ -1068,6 +1103,7 @@ service Service {
   rpc GetActorChatDeclarationRecords(GetActorChatDeclarationRecordsRequest) returns (GetActorChatDeclarationRecordsResponse);
   rpc GetRepostRecords(GetRepostRecordsRequest) returns (GetRepostRecordsResponse);
   rpc GetThreadGateRecords(GetThreadGateRecordsRequest) returns (GetThreadGateRecordsResponse);
+  rpc GetPostgateRecords(GetPostgateRecordsRequest) returns (GetPostgateRecordsResponse);
   rpc GetLabelerRecords(GetLabelerRecordsRequest) returns (GetLabelerRecordsResponse);
   rpc GetStarterPackRecords(GetStarterPackRecordsRequest) returns (GetStarterPackRecordsResponse);
 
@@ -1087,11 +1123,15 @@ service Service {
   rpc GetRepostsByActorAndSubjects(GetRepostsByActorAndSubjectsRequest) returns (GetRepostsByActorAndSubjectsResponse);
   rpc GetActorReposts(GetActorRepostsRequest) returns (GetActorRepostsResponse);
 
+  // Quotes
+  rpc GetQuotesBySubjectSorted(GetQuotesBySubjectSortedRequest) returns (GetQuotesBySubjectSortedResponse);
+
   // Interaction Counts
   rpc GetInteractionCounts(GetInteractionCountsRequest) returns (GetInteractionCountsResponse);
   rpc GetCountsForUsers(GetCountsForUsersRequest) returns (GetCountsForUsersResponse);
   rpc GetStarterPackCounts(GetStarterPackCountsRequest) returns (GetStarterPackCountsResponse);
   rpc GetListCounts(GetListCountsRequest) returns (GetListCountsResponse);
+  rpc GetNewUserCountForRange(GetNewUserCountForRangeRequest) returns (GetNewUserCountForRangeResponse);
 
   // Profile
   rpc GetActors(GetActorsRequest) returns (GetActorsResponse);

package/src/api/app/bsky/feed/getActorLikes.ts

@@ -13,7 +13,7 @@ import {
 import { Views } from '../../../../views'
 import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
-import { creatorFromUri } from '../../../../views/util'
+import { uriToDid as creatorFromUri } from '../../../../util/uris'
 import { FeedItem } from '../../../../hydration/feed'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/app/bsky/feed/getLikes.ts

@@ -11,7 +11,7 @@ import {
 } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { parseString } from '../../../../hydration/util'
-import { creatorFromUri } from '../../../../views/util'
+import { uriToDid as creatorFromUri } from '../../../../util/uris'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 import { InvalidRequestError } from '@atproto/xrpc-server'
 

package/src/api/app/bsky/feed/getListFeed.ts

@@ -7,12 +7,14 @@ import {
   HydrateCtx,
   HydrationState,
   Hydrator,
+  mergeStates,
 } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { DataPlaneClient } from '../../../../data-plane'
 import { mapDefined } from '@atproto/common'
 import { parseString } from '../../../../hydration/util'
 import { FeedItem } from '../../../../hydration/feed'
+import { uriToDid } from '../../../../util/uris'
 
 export default function (server: Server, ctx: AppContext) {
   const getListFeed = createPipeline(
@@ -71,23 +73,34 @@ const hydration = async (inputs: {
   skeleton: Skeleton
 }): Promise<HydrationState> => {
   const { ctx, params, skeleton } = inputs
-  return ctx.hydrator.hydrateFeedItems(skeleton.items, params.hydrateCtx)
+  const [feedItemsState, bidirectionalBlocks] = await Promise.all([
+    ctx.hydrator.hydrateFeedItems(skeleton.items, params.hydrateCtx),
+    getBlocks({ ctx, params, skeleton }),
+  ])
+  return mergeStates(feedItemsState, {
+    bidirectionalBlocks,
+  })
 }
 
 const noBlocksOrMutes = (inputs: {
   ctx: Context
+  params: Params
   skeleton: Skeleton
   hydration: HydrationState
 }): Skeleton => {
-  const { ctx, skeleton, hydration } = inputs
+  const { ctx, params, skeleton, hydration } = inputs
   skeleton.items = skeleton.items.filter((item) => {
     const bam = ctx.views.feedItemBlocksAndMutes(item, hydration)
+    const creatorBlocks = hydration.bidirectionalBlocks?.get(
+      uriToDid(params.list),
+    )
     return (
       !bam.authorBlocked &&
       !bam.authorMuted &&
       !bam.originatorBlocked &&
       !bam.originatorMuted &&
-      !bam.ancestorAuthorBlocked
+      !bam.ancestorAuthorBlocked &&
+      !creatorBlocks?.get(uriToDid(item.post.uri))
     )
   })
   return skeleton
@@ -105,6 +118,20 @@ const presentation = (inputs: {
   return { feed, cursor: skeleton.cursor }
 }
 
+const getBlocks = async (input: {
+  ctx: Context
+  skeleton: Skeleton
+  params: Params
+}) => {
+  const { ctx, skeleton, params } = input
+  const pairs: Map<string, string[]> = new Map()
+  pairs.set(
+    uriToDid(params.list),
+    skeleton.items.map((item) => uriToDid(item.post.uri)),
+  )
+  return await ctx.hydrator.hydrateBidirectionalBlocks(pairs)
+}
+
 type Context = {
   hydrator: Hydrator
   views: Views

package/src/api/app/bsky/feed/getPosts.ts

@@ -9,7 +9,7 @@ import {
   Hydrator,
 } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
-import { creatorFromUri } from '../../../../views/util'
+import { uriToDid as creatorFromUri } from '../../../../util/uris'
 import { resHeaders } from '../../../util'
 import { ids } from '../../../../lexicon/lexicons'
 

package/src/api/app/bsky/feed/getQuotes.ts

@@ -0,0 +1,108 @@
+import { Server } from '../../../../lexicon'
+import AppContext from '../../../../context'
+import { createPipeline } from '../../../../pipeline'
+import { clearlyBadCursor, resHeaders } from '../../../util'
+import {
+  HydrateCtx,
+  HydrationState,
+  Hydrator,
+} from '../../../../hydration/hydrator'
+import { Views } from '../../../../views'
+import { mapDefined } from '@atproto/common'
+import { QueryParams } from '../../../../lexicon/types/app/bsky/feed/getQuotes'
+import { parseString } from '../../../../hydration/util'
+
+export default function (server: Server, ctx: AppContext) {
+  const getQuotes = createPipeline(skeleton, hydration, noBlocks, presentation)
+  server.app.bsky.feed.getQuotes({
+    auth: ctx.authVerifier.standardOptional,
+    handler: async ({ params, auth, req }) => {
+      const { viewer, includeTakedowns } = ctx.authVerifier.parseCreds(auth)
+      const labelers = ctx.reqLabelers(req)
+      const hydrateCtx = await ctx.hydrator.createContext({
+        labelers,
+        viewer,
+        includeTakedowns,
+      })
+      const result = await getQuotes({ ...params, hydrateCtx }, ctx)
+      return {
+        encoding: 'application/json',
+        body: result,
+        headers: resHeaders({ labelers: hydrateCtx.labelers }),
+      }
+    },
+  })
+}
+
+const skeleton = async (inputs: {
+  ctx: Context
+  params: Params
+}): Promise<Skeleton> => {
+  const { ctx, params } = inputs
+  if (clearlyBadCursor(params.cursor)) {
+    return { uris: [] }
+  }
+  const quotesRes = await ctx.hydrator.dataplane.getQuotesBySubjectSorted({
+    subject: { uri: params.uri, cid: params.cid },
+    cursor: params.cursor,
+    limit: params.limit,
+  })
+  return {
+    uris: quotesRes.uris,
+    cursor: parseString(quotesRes.cursor),
+  }
+}
+
+const hydration = async (inputs: {
+  ctx: Context
+  params: Params
+  skeleton: Skeleton
+}) => {
+  const { ctx, params, skeleton } = inputs
+  return await ctx.hydrator.hydratePosts(
+    skeleton.uris.map((uri) => ({ uri })),
+    params.hydrateCtx,
+  )
+}
+
+const noBlocks = (inputs: {
+  ctx: Context
+  skeleton: Skeleton
+  hydration: HydrationState
+}) => {
+  const { ctx, skeleton, hydration } = inputs
+  skeleton.uris = skeleton.uris.filter((uri) => {
+    return !ctx.views.viewerBlockExists(uri, hydration)
+  })
+  return skeleton
+}
+
+const presentation = (inputs: {
+  ctx: Context
+  params: Params
+  skeleton: Skeleton
+  hydration: HydrationState
+}) => {
+  const { ctx, params, skeleton, hydration } = inputs
+  const postViews = mapDefined(skeleton.uris, (uri) => {
+    return ctx.views.post(uri, hydration)
+  })
+  return {
+    posts: postViews,
+    cursor: skeleton.cursor,
+    uri: params.uri,
+    cid: params.cid,
+  }
+}
+
+type Context = {
+  hydrator: Hydrator
+  views: Views
+}
+
+type Params = QueryParams & { hydrateCtx: HydrateCtx }
+
+type Skeleton = {
+  uris: string[]
+  cursor?: string
+}

package/src/api/app/bsky/feed/getRepostedBy.ts

@@ -10,7 +10,7 @@ import {
 } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { parseString } from '../../../../hydration/util'
-import { creatorFromUri } from '../../../../views/util'
+import { uriToDid as creatorFromUri } from '../../../../util/uris'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/app/bsky/feed/searchPosts.ts

@@ -14,7 +14,7 @@ import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { DataPlaneClient } from '../../../../data-plane'
 import { parseString } from '../../../../hydration/util'
-import { creatorFromUri } from '../../../../views/util'
+import { uriToDid as creatorFromUri } from '../../../../util/uris'
 import { resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {

package/src/api/app/bsky/graph/getFollowers.ts

@@ -10,7 +10,7 @@ import {
   SkeletonFnInput,
   createPipeline,
 } from '../../../../pipeline'
-import { didFromUri } from '../../../../hydration/util'
+import { uriToDid as didFromUri } from '../../../../util/uris'
 import {
   HydrateCtx,
   Hydrator,

package/src/api/app/bsky/graph/getList.ts

@@ -19,7 +19,7 @@ import {
 import { Views } from '../../../../views'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 import { ListItemInfo } from '../../../../proto/bsky_pb'
-import { didFromUri } from '../../../../hydration/util'
+import { uriToDid as didFromUri } from '../../../../util/uris'
 
 export default function (server: Server, ctx: AppContext) {
   const getList = createPipeline(skeleton, hydration, noBlocks, presentation)
@@ -70,7 +70,7 @@ const hydration = async (
       params.hydrateCtx,
     ),
   ])
-  const bidirectionalBlocks = await maybeGetBlocksForReferenceList({
+  const bidirectionalBlocks = await maybeGetBlocksForReferenceAndCurateList({
     ctx,
     params,
     skeleton,
@@ -106,7 +106,7 @@ const presentation = (
   return { list, items, cursor }
 }
 
-const maybeGetBlocksForReferenceList = async (input: {
+const maybeGetBlocksForReferenceAndCurateList = async (input: {
   ctx: Context
   listState: HydrationState
   skeleton: SkeletonState
@@ -118,8 +118,8 @@ const maybeGetBlocksForReferenceList = async (input: {
   const listRecord = listState.lists?.get(list)
   const creator = didFromUri(list)
   if (
-    listRecord?.record.purpose !== 'app.bsky.graph.defs#referencelist' ||
-    params.hydrateCtx.viewer === creator
+    params.hydrateCtx.viewer === creator ||
+    listRecord?.record.purpose === 'app.bsky.graph.defs#modlist'
   ) {
     return
   }

package/src/api/app/bsky/notification/listNotifications.ts

@@ -2,6 +2,7 @@ import { InvalidRequestError } from '@atproto/xrpc-server'
 import { mapDefined } from '@atproto/common'
 import { Server } from '../../../../lexicon'
 import { QueryParams } from '../../../../lexicon/types/app/bsky/notification/listNotifications'
+import { isRecord as isPostRecord } from '../../../../lexicon/types/app/bsky/feed/post'
 import AppContext from '../../../../context'
 import {
   createPipeline,
@@ -13,7 +14,7 @@ import {
 import { HydrateCtx, Hydrator } from '../../../../hydration/hydrator'
 import { Views } from '../../../../views'
 import { Notification } from '../../../../proto/bsky_pb'
-import { didFromUri } from '../../../../hydration/util'
+import { uriToDid as didFromUri } from '../../../../util/uris'
 import { clearlyBadCursor, resHeaders } from '../../../util'
 
 export default function (server: Server, ctx: AppContext) {
@@ -90,13 +91,38 @@ const hydration = async (
 const noBlockOrMutes = (
   input: RulesFnInput<Context, Params, SkeletonState>,
 ) => {
-  const { skeleton, hydration, ctx } = input
+  const { skeleton, hydration, ctx, params } = input
   skeleton.notifs = skeleton.notifs.filter((item) => {
     const did = didFromUri(item.uri)
-    return (
-      !ctx.views.viewerBlockExists(did, hydration) &&
-      !ctx.views.viewerMuteExists(did, hydration)
-    )
+    if (
+      ctx.views.viewerBlockExists(did, hydration) ||
+      ctx.views.viewerMuteExists(did, hydration)
+    ) {
+      return false
+    }
+    // Filter out hidden replies only if the viewer owns
+    // the threadgate and they hid the reply.
+    if (item.reason === 'reply') {
+      const post = hydration.posts?.get(item.uri)
+      if (post) {
+        const rootPostUri = isPostRecord(post.record)
+          ? post.record.reply?.root.uri
+          : undefined
+        const isRootPostByViewer =
+          rootPostUri && didFromUri(rootPostUri) === params.hydrateCtx?.viewer
+        const isHiddenReply = isRootPostByViewer
+          ? ctx.views.replyIsHiddenByThreadgate(
+              item.uri,
+              rootPostUri,
+              hydration,
+            )
+          : false
+        if (isHiddenReply) {
+          return false
+        }
+      }
+    }
+    return true
   })
   return skeleton
 }

package/src/api/index.ts

@@ -13,6 +13,7 @@ import getPostThread from './app/bsky/feed/getPostThread'
 import getPosts from './app/bsky/feed/getPosts'
 import searchPosts from './app/bsky/feed/searchPosts'
 import getActorLikes from './app/bsky/feed/getActorLikes'
+import getQuotes from './app/bsky/feed/getQuotes'
 import getProfile from './app/bsky/actor/getProfile'
 import getProfiles from './app/bsky/actor/getProfiles'
 import getRepostedBy from './app/bsky/feed/getRepostedBy'
@@ -72,6 +73,7 @@ export default function (server: Server, ctx: AppContext) {
   getFeedGenerators(server, ctx)
   getLikes(server, ctx)
   getListFeed(server, ctx)
+  getQuotes(server, ctx)
   getPostThread(server, ctx)
   getPosts(server, ctx)
   searchPosts(server, ctx)

package/src/data-plane/server/db/database-schema.ts

@@ -6,7 +6,8 @@ import * as post from './tables/post'
 import * as postEmbed from './tables/post-embed'
 import * as postAgg from './tables/post-agg'
 import * as repost from './tables/repost'
-import * as threadGate from './tables/thread-gate'
+import * as threadgate from './tables/thread-gate'
+import * as postgate from './tables/post-gate'
 import * as feedItem from './tables/feed-item'
 import * as follow from './tables/follow'
 import * as like from './tables/like'
@@ -35,6 +36,7 @@ import * as taggedSuggestion from './tables/tagged-suggestion'
 import * as blobTakedown from './tables/blob-takedown'
 import * as labeler from './tables/labeler'
 import * as starterPack from './tables/starter-pack'
+import * as quote from './tables/quote'
 
 export type DatabaseSchemaType = duplicateRecord.PartialDB &
   profile.PartialDB &
@@ -43,7 +45,8 @@ export type DatabaseSchemaType = duplicateRecord.PartialDB &
   postEmbed.PartialDB &
   postAgg.PartialDB &
   repost.PartialDB &
-  threadGate.PartialDB &
+  threadgate.PartialDB &
+  postgate.PartialDB &
   feedItem.PartialDB &
   follow.PartialDB &
   like.PartialDB &
@@ -71,7 +74,8 @@ export type DatabaseSchemaType = duplicateRecord.PartialDB &
   blobTakedown.PartialDB &
   labeler.PartialDB &
   starterPack.PartialDB &
-  taggedSuggestion.PartialDB
+  taggedSuggestion.PartialDB &
+  quote.PartialDB
 
 export type DatabaseSchema = Kysely<DatabaseSchemaType>
 

package/src/data-plane/server/db/migrations/20240723T220700077Z-quotes-post-aggs.ts

@@ -0,0 +1,12 @@
+import { Kysely } from 'kysely'
+
+export async function up(db: Kysely<unknown>): Promise<void> {
+  await db.schema
+    .alterTable('post_agg')
+    .addColumn('quoteCount', 'bigint', (col) => col.notNull().defaultTo(0))
+    .execute()
+}
+
+export async function down(db: Kysely<unknown>): Promise<void> {
+  await db.schema.alterTable('post_agg').dropColumn('quoteCount').execute()
+}