From 4ab2483547d5dabfba88ed4419a4f374bbd7cae7 Mon Sep 17 00:00:00 2001 From: Hailey <me@haileyok.com> Date: Thu, 22 Aug 2024 09:49:06 -0700 Subject: [PATCH] Add `quoteCount` to `embed` view (#2735) Co-authored-by: devin ivy <devinivy@gmail.com> --- .changeset/wet-paws-unite.md | 6 ++++++ lexicons/app/bsky/embed/record.json | 1 + packages/api/src/client/lexicons.ts | 3 +++ .../src/client/types/app/bsky/embed/record.ts | 1 + packages/bsky/src/lexicon/lexicons.ts | 3 +++ .../lexicon/types/app/bsky/embed/record.ts | 1 + packages/bsky/src/views/index.ts | 1 + .../feed-generation.test.ts.snap | 5 +++++ .../__snapshots__/indexing.test.ts.snap | 2 ++ .../__snapshots__/author-feed.test.ts.snap | 9 ++++++++ .../__snapshots__/block-lists.test.ts.snap | 1 + .../views/__snapshots__/blocks.test.ts.snap | 1 + .../__snapshots__/list-feed.test.ts.snap | 2 ++ .../views/__snapshots__/posts.test.ts.snap | 3 +++ .../views/__snapshots__/quotes.test.ts.snap | 3 +++ .../views/__snapshots__/timeline.test.ts.snap | 21 +++++++++++++++++++ packages/ozone/src/lexicon/lexicons.ts | 3 +++ .../lexicon/types/app/bsky/embed/record.ts | 1 + packages/pds/src/lexicon/lexicons.ts | 3 +++ .../lexicon/types/app/bsky/embed/record.ts | 1 + .../__snapshots__/feedgen.test.ts.snap | 1 + .../proxied/__snapshots__/views.test.ts.snap | 10 +++++++++ 22 files changed, 82 insertions(+) create mode 100644 .changeset/wet-paws-unite.md diff --git a/.changeset/wet-paws-unite.md b/.changeset/wet-paws-unite.md new file mode 100644 index 00000000..7b212b95 --- /dev/null +++ b/.changeset/wet-paws-unite.md @@ -0,0 +1,6 @@ +--- +"@atproto/bsky": patch +"@atproto/api": patch +--- + +add `quoteCount` to embed view diff --git a/lexicons/app/bsky/embed/record.json b/lexicons/app/bsky/embed/record.json index 94620fe5..a0ffabc9 100644 --- a/lexicons/app/bsky/embed/record.json +++ b/lexicons/app/bsky/embed/record.json @@ -50,6 +50,7 @@ "replyCount": { "type": "integer" }, "repostCount": { "type": "integer" }, "likeCount": { "type": "integer" }, + "quoteCount": { "type": "integer" }, "embeds": { "type": "array", "items": { diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts index 8b1a9e4c..8af84f4b 100644 --- a/packages/api/src/client/lexicons.ts +++ b/packages/api/src/client/lexicons.ts @@ -5034,6 +5034,9 @@ export const schemaDict = { likeCount: { type: 'integer', }, + quoteCount: { + type: 'integer', + }, embeds: { type: 'array', items: { diff --git a/packages/api/src/client/types/app/bsky/embed/record.ts b/packages/api/src/client/types/app/bsky/embed/record.ts index faf409cf..d3515be3 100644 --- a/packages/api/src/client/types/app/bsky/embed/record.ts +++ b/packages/api/src/client/types/app/bsky/embed/record.ts @@ -67,6 +67,7 @@ export interface ViewRecord { replyCount?: number repostCount?: number likeCount?: number + quoteCount?: number embeds?: ( | AppBskyEmbedImages.View | AppBskyEmbedExternal.View diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts index e8191d0e..e0c1d4f9 100644 --- a/packages/bsky/src/lexicon/lexicons.ts +++ b/packages/bsky/src/lexicon/lexicons.ts @@ -5034,6 +5034,9 @@ export const schemaDict = { likeCount: { type: 'integer', }, + quoteCount: { + type: 'integer', + }, embeds: { type: 'array', items: { diff --git a/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts b/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts index 4a2446be..ee51b0d5 100644 --- a/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts +++ b/packages/bsky/src/lexicon/types/app/bsky/embed/record.ts @@ -67,6 +67,7 @@ export interface ViewRecord { replyCount?: number repostCount?: number likeCount?: number + quoteCount?: number embeds?: ( | AppBskyEmbedImages.View | AppBskyEmbedExternal.View diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts index fbb64a12..707df1d7 100644 --- a/packages/bsky/src/views/index.ts +++ b/packages/bsky/src/views/index.ts @@ -950,6 +950,7 @@ export class Views { likeCount: postView.likeCount, replyCount: postView.replyCount, repostCount: postView.repostCount, + quoteCount: postView.quoteCount, indexedAt: postView.indexedAt, embeds: depth > 1 ? undefined : postView.embed ? [postView.embed] : [], } diff --git a/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap b/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap index 5ec58418..099dd259 100644 --- a/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap +++ b/packages/bsky/tests/__snapshots__/feed-generation.test.ts.snap @@ -656,6 +656,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(2)", @@ -939,6 +940,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(2)", @@ -958,6 +960,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(5)", @@ -1162,6 +1165,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(3)", @@ -1464,6 +1468,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(5)", diff --git a/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap b/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap index d898b644..495786e1 100644 --- a/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap +++ b/packages/bsky/tests/data-plane/__snapshots__/indexing.test.ts.snap @@ -290,6 +290,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(9)", @@ -340,6 +341,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(7)", diff --git a/packages/bsky/tests/views/__snapshots__/author-feed.test.ts.snap b/packages/bsky/tests/views/__snapshots__/author-feed.test.ts.snap index 6a8016ca..c518b2a8 100644 --- a/packages/bsky/tests/views/__snapshots__/author-feed.test.ts.snap +++ b/packages/bsky/tests/views/__snapshots__/author-feed.test.ts.snap @@ -291,6 +291,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(9)", @@ -341,6 +342,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(7)", @@ -852,6 +854,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(2)", @@ -871,6 +874,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(1)", @@ -1162,6 +1166,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(2)", @@ -1616,6 +1621,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(11)", @@ -1635,6 +1641,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(10)", @@ -2054,6 +2061,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(10)", @@ -2104,6 +2112,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(9)", diff --git a/packages/bsky/tests/views/__snapshots__/block-lists.test.ts.snap b/packages/bsky/tests/views/__snapshots__/block-lists.test.ts.snap index 1cf69a6d..5270c1cb 100644 --- a/packages/bsky/tests/views/__snapshots__/block-lists.test.ts.snap +++ b/packages/bsky/tests/views/__snapshots__/block-lists.test.ts.snap @@ -73,6 +73,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(3)", diff --git a/packages/bsky/tests/views/__snapshots__/blocks.test.ts.snap b/packages/bsky/tests/views/__snapshots__/blocks.test.ts.snap index 6fd62448..a0d7e67c 100644 --- a/packages/bsky/tests/views/__snapshots__/blocks.test.ts.snap +++ b/packages/bsky/tests/views/__snapshots__/blocks.test.ts.snap @@ -73,6 +73,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(3)", diff --git a/packages/bsky/tests/views/__snapshots__/list-feed.test.ts.snap b/packages/bsky/tests/views/__snapshots__/list-feed.test.ts.snap index aeb285e0..31505cd7 100644 --- a/packages/bsky/tests/views/__snapshots__/list-feed.test.ts.snap +++ b/packages/bsky/tests/views/__snapshots__/list-feed.test.ts.snap @@ -483,6 +483,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(10)", @@ -533,6 +534,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(9)", diff --git a/packages/bsky/tests/views/__snapshots__/posts.test.ts.snap b/packages/bsky/tests/views/__snapshots__/posts.test.ts.snap index 3853e772..bf3dacd2 100644 --- a/packages/bsky/tests/views/__snapshots__/posts.test.ts.snap +++ b/packages/bsky/tests/views/__snapshots__/posts.test.ts.snap @@ -199,6 +199,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(3)", @@ -340,6 +341,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(3)", @@ -359,6 +361,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(6)", diff --git a/packages/bsky/tests/views/__snapshots__/quotes.test.ts.snap b/packages/bsky/tests/views/__snapshots__/quotes.test.ts.snap index 748c5d46..c1f47cd9 100644 --- a/packages/bsky/tests/views/__snapshots__/quotes.test.ts.snap +++ b/packages/bsky/tests/views/__snapshots__/quotes.test.ts.snap @@ -148,6 +148,7 @@ Object { }, ], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(1)", @@ -254,6 +255,7 @@ Object { }, ], "likeCount": 0, + "quoteCount": 2, "replyCount": 0, "repostCount": 0, "uri": "record(1)", @@ -351,6 +353,7 @@ Object { }, ], "likeCount": 0, + "quoteCount": 2, "replyCount": 0, "repostCount": 0, "uri": "record(1)", diff --git a/packages/bsky/tests/views/__snapshots__/timeline.test.ts.snap b/packages/bsky/tests/views/__snapshots__/timeline.test.ts.snap index c64fb076..98372650 100644 --- a/packages/bsky/tests/views/__snapshots__/timeline.test.ts.snap +++ b/packages/bsky/tests/views/__snapshots__/timeline.test.ts.snap @@ -375,6 +375,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(6)", @@ -1356,6 +1357,7 @@ Array [ }, ], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(15)", @@ -1936,6 +1938,7 @@ Array [ }, ], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(11)", @@ -1963,6 +1966,7 @@ Array [ }, ], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(8)", @@ -2680,6 +2684,7 @@ Array [ }, ], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(8)", @@ -2730,6 +2735,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(7)", @@ -2958,6 +2964,7 @@ Array [ }, ], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(11)", @@ -2985,6 +2992,7 @@ Array [ }, ], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(8)", @@ -3167,6 +3175,7 @@ Array [ }, ], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(11)", @@ -3439,6 +3448,7 @@ Array [ }, ], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(4)", @@ -3466,6 +3476,7 @@ Array [ }, ], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(2)", @@ -4197,6 +4208,7 @@ Array [ }, ], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(2)", @@ -4247,6 +4259,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(0)", @@ -4454,6 +4467,7 @@ Array [ }, ], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(4)", @@ -4725,6 +4739,7 @@ Array [ }, ], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(2)", @@ -4752,6 +4767,7 @@ Array [ }, ], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(1)", @@ -5295,6 +5311,7 @@ Array [ }, ], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(1)", @@ -5345,6 +5362,7 @@ Array [ "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(0)", @@ -5519,6 +5537,7 @@ Array [ }, ], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(2)", @@ -6276,6 +6295,7 @@ Array [ }, ], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(12)", @@ -6303,6 +6323,7 @@ Array [ }, ], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(11)", diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts index 8b1a9e4c..8af84f4b 100644 --- a/packages/ozone/src/lexicon/lexicons.ts +++ b/packages/ozone/src/lexicon/lexicons.ts @@ -5034,6 +5034,9 @@ export const schemaDict = { likeCount: { type: 'integer', }, + quoteCount: { + type: 'integer', + }, embeds: { type: 'array', items: { diff --git a/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts b/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts index 4a2446be..ee51b0d5 100644 --- a/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts +++ b/packages/ozone/src/lexicon/types/app/bsky/embed/record.ts @@ -67,6 +67,7 @@ export interface ViewRecord { replyCount?: number repostCount?: number likeCount?: number + quoteCount?: number embeds?: ( | AppBskyEmbedImages.View | AppBskyEmbedExternal.View diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts index 8b1a9e4c..8af84f4b 100644 --- a/packages/pds/src/lexicon/lexicons.ts +++ b/packages/pds/src/lexicon/lexicons.ts @@ -5034,6 +5034,9 @@ export const schemaDict = { likeCount: { type: 'integer', }, + quoteCount: { + type: 'integer', + }, embeds: { type: 'array', items: { diff --git a/packages/pds/src/lexicon/types/app/bsky/embed/record.ts b/packages/pds/src/lexicon/types/app/bsky/embed/record.ts index 4a2446be..ee51b0d5 100644 --- a/packages/pds/src/lexicon/types/app/bsky/embed/record.ts +++ b/packages/pds/src/lexicon/types/app/bsky/embed/record.ts @@ -67,6 +67,7 @@ export interface ViewRecord { replyCount?: number repostCount?: number likeCount?: number + quoteCount?: number embeds?: ( | AppBskyEmbedImages.View | AppBskyEmbedExternal.View diff --git a/packages/pds/tests/proxied/__snapshots__/feedgen.test.ts.snap b/packages/pds/tests/proxied/__snapshots__/feedgen.test.ts.snap index b96e1e2d..5b307c94 100644 --- a/packages/pds/tests/proxied/__snapshots__/feedgen.test.ts.snap +++ b/packages/pds/tests/proxied/__snapshots__/feedgen.test.ts.snap @@ -120,6 +120,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(5)", diff --git a/packages/pds/tests/proxied/__snapshots__/views.test.ts.snap b/packages/pds/tests/proxied/__snapshots__/views.test.ts.snap index ff505278..ce10a73c 100644 --- a/packages/pds/tests/proxied/__snapshots__/views.test.ts.snap +++ b/packages/pds/tests/proxied/__snapshots__/views.test.ts.snap @@ -1309,6 +1309,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(9)", @@ -1359,6 +1360,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(7)", @@ -1697,6 +1699,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(0)", @@ -2163,6 +2166,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(11)", @@ -2182,6 +2186,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(8)", @@ -2863,6 +2868,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(8)", @@ -2913,6 +2919,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 1, "uri": "record(7)", @@ -3127,6 +3134,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(11)", @@ -3146,6 +3154,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 2, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(8)", @@ -3322,6 +3331,7 @@ Object { "indexedAt": "1970-01-01T00:00:00.000Z", "labels": Array [], "likeCount": 0, + "quoteCount": 1, "replyCount": 0, "repostCount": 0, "uri": "record(11)",