Appview: add associated.labeler info to all profile views (bluesky-so…

…cial#2341) * lexicon: add associated field to profile and profile-basic views, for indicating whether labeler * appview: add associated.labeler to profile and profile-basic views * dev-env: downgrade get-port, non-esm-only version
aendra-rininsland · Mar 19, 2024 · c28e374 · c28e374
1 parent ae4d0f9
commit c28e374
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 3 deletions.
diff --git a/lexicons/app/bsky/actor/defs.json b/lexicons/app/bsky/actor/defs.json
@@ -14,6 +14,10 @@
           "maxLength": 640
         },
         "avatar": { "type": "string" },
+        "associated": {
+          "type": "ref",
+          "ref": "#profileAssociated"
+        },
         "viewer": { "type": "ref", "ref": "#viewerState" },
         "labels": {
           "type": "array",
@@ -38,6 +42,10 @@
           "maxLength": 2560
         },
         "avatar": { "type": "string" },
+        "associated": {
+          "type": "ref",
+          "ref": "#profileAssociated"
+        },
         "indexedAt": { "type": "string", "format": "datetime" },
         "viewer": { "type": "ref", "ref": "#viewerState" },
         "labels": {

diff --git a/packages/api/src/client/lexicons.ts b/packages/api/src/client/lexicons.ts
@@ -3622,6 +3622,10 @@ export const schemaDict = {
           avatar: {
             type: 'string',
           },
+          associated: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileAssociated',
+          },
           viewer: {
             type: 'ref',
             ref: 'lex:app.bsky.actor.defs#viewerState',
@@ -3660,6 +3664,10 @@ export const schemaDict = {
           avatar: {
             type: 'string',
           },
+          associated: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileAssociated',
+          },
           indexedAt: {
             type: 'string',
             format: 'datetime',

diff --git a/packages/api/src/client/types/app/bsky/actor/defs.ts b/packages/api/src/client/types/app/bsky/actor/defs.ts
@@ -13,6 +13,7 @@ export interface ProfileViewBasic {
   handle: string
   displayName?: string
   avatar?: string
+  associated?: ProfileAssociated
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   [k: string]: unknown
@@ -36,6 +37,7 @@ export interface ProfileView {
   displayName?: string
   description?: string
   avatar?: string
+  associated?: ProfileAssociated
   indexedAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]

diff --git a/packages/bsky/src/lexicon/lexicons.ts b/packages/bsky/src/lexicon/lexicons.ts
@@ -3622,6 +3622,10 @@ export const schemaDict = {
           avatar: {
             type: 'string',
           },
+          associated: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileAssociated',
+          },
           viewer: {
             type: 'ref',
             ref: 'lex:app.bsky.actor.defs#viewerState',
@@ -3660,6 +3664,10 @@ export const schemaDict = {
           avatar: {
             type: 'string',
           },
+          associated: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileAssociated',
+          },
           indexedAt: {
             type: 'string',
             format: 'datetime',

diff --git a/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts b/packages/bsky/src/lexicon/types/app/bsky/actor/defs.ts
@@ -13,6 +13,7 @@ export interface ProfileViewBasic {
   handle: string
   displayName?: string
   avatar?: string
+  associated?: ProfileAssociated
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   [k: string]: unknown
@@ -36,6 +37,7 @@ export interface ProfileView {
   displayName?: string
   description?: string
   avatar?: string
+  associated?: ProfileAssociated
   indexedAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]

diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts
@@ -155,6 +155,9 @@ export class Views {
             cidFromBlobJson(actor.profile.avatar),
           )
         : undefined,
+      // associated.feedgens and associated.lists info not necessarily included
+      // on profile and profile-basic views, but should be on profile-detailed.
+      associated: actor?.isLabeler ? { labeler: true } : undefined,
       viewer: this.profileViewer(did, state),
       labels,
     }

diff --git a/packages/bsky/tests/views/__snapshots__/labeler-service.test.ts.snap b/packages/bsky/tests/views/__snapshots__/labeler-service.test.ts.snap
@@ -7,6 +7,9 @@ Object {
       "$type": "app.bsky.labeler.defs#labelerView",
       "cid": "cids(0)",
       "creator": Object {
+        "associated": Object {
+          "labeler": true,
+        },
         "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
         "description": "its me!",
         "did": "user(0)",
@@ -48,6 +51,9 @@ Object {
       "$type": "app.bsky.labeler.defs#labelerView",
       "cid": "cids(3)",
       "creator": Object {
+        "associated": Object {
+          "labeler": true,
+        },
         "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
         "description": "hi im bob label_me",
         "did": "user(2)",
@@ -77,6 +83,9 @@ Object {
       "$type": "app.bsky.labeler.defs#labelerViewDetailed",
       "cid": "cids(0)",
       "creator": Object {
+        "associated": Object {
+          "labeler": true,
+        },
         "avatar": "https://bsky.public.url/img/avatar/plain/user(1)/cids(1)@jpeg",
         "description": "its me!",
         "did": "user(0)",
@@ -126,6 +135,9 @@ Object {
       "$type": "app.bsky.labeler.defs#labelerViewDetailed",
       "cid": "cids(3)",
       "creator": Object {
+        "associated": Object {
+          "labeler": true,
+        },
         "avatar": "https://bsky.public.url/img/avatar/plain/user(3)/cids(1)@jpeg",
         "description": "hi im bob label_me",
         "did": "user(2)",

diff --git a/packages/bsky/tests/views/labeler-service.test.ts b/packages/bsky/tests/views/labeler-service.test.ts
@@ -135,6 +135,15 @@ describe('labeler service views', () => {
     )
   })
 
+  it('renders profile as labeler in non-detailed profile views', async () => {
+    const { data: res } = await agent.api.app.bsky.actor.searchActors(
+      { q: sc.accounts[alice].handle },
+      { headers: await network.serviceHeaders(bob) },
+    )
+    expect(res.actors.length).toBe(1)
+    expect(res.actors[0].associated?.labeler).toBe(true)
+  })
+
   it('blocked by labeler takedown', async () => {
     await network.bsky.ctx.dataplane.takedownActor({ did: alice })
     const res = await agent.api.app.bsky.labeler.getServices(

diff --git a/packages/dev-env/package.json b/packages/dev-env/package.json
@@ -36,7 +36,7 @@
     "axios": "^0.27.2",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",
-    "get-port": "^6.1.2",
+    "get-port": "^5.1.1",
     "multiformats": "^9.9.0",
     "uint8arrays": "3.0.0"
   }

diff --git a/packages/ozone/src/lexicon/lexicons.ts b/packages/ozone/src/lexicon/lexicons.ts
@@ -3622,6 +3622,10 @@ export const schemaDict = {
           avatar: {
             type: 'string',
           },
+          associated: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileAssociated',
+          },
           viewer: {
             type: 'ref',
             ref: 'lex:app.bsky.actor.defs#viewerState',
@@ -3660,6 +3664,10 @@ export const schemaDict = {
           avatar: {
             type: 'string',
           },
+          associated: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileAssociated',
+          },
           indexedAt: {
             type: 'string',
             format: 'datetime',

diff --git a/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts b/packages/ozone/src/lexicon/types/app/bsky/actor/defs.ts
@@ -13,6 +13,7 @@ export interface ProfileViewBasic {
   handle: string
   displayName?: string
   avatar?: string
+  associated?: ProfileAssociated
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   [k: string]: unknown
@@ -36,6 +37,7 @@ export interface ProfileView {
   displayName?: string
   description?: string
   avatar?: string
+  associated?: ProfileAssociated
   indexedAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]

diff --git a/packages/pds/src/lexicon/lexicons.ts b/packages/pds/src/lexicon/lexicons.ts
@@ -3622,6 +3622,10 @@ export const schemaDict = {
           avatar: {
             type: 'string',
           },
+          associated: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileAssociated',
+          },
           viewer: {
             type: 'ref',
             ref: 'lex:app.bsky.actor.defs#viewerState',
@@ -3660,6 +3664,10 @@ export const schemaDict = {
           avatar: {
             type: 'string',
           },
+          associated: {
+            type: 'ref',
+            ref: 'lex:app.bsky.actor.defs#profileAssociated',
+          },
           indexedAt: {
             type: 'string',
             format: 'datetime',

diff --git a/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts b/packages/pds/src/lexicon/types/app/bsky/actor/defs.ts
@@ -13,6 +13,7 @@ export interface ProfileViewBasic {
   handle: string
   displayName?: string
   avatar?: string
+  associated?: ProfileAssociated
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]
   [k: string]: unknown
@@ -36,6 +37,7 @@ export interface ProfileView {
   displayName?: string
   description?: string
   avatar?: string
+  associated?: ProfileAssociated
   indexedAt?: string
   viewer?: ViewerState
   labels?: ComAtprotoLabelDefs.Label[]

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml