Blocks

.github/workflows/build-and-push-pds-aws.yaml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - blocks
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
   USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}

.github/workflows/build-and-push-pds-ghcr.yaml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - blocks
 env:
   REGISTRY: ghcr.io
   USERNAME: ${{ github.actor }}

lexicons/app/bsky/actor/defs.json

@@ -80,6 +80,8 @@
       "type": "object",
       "properties": {
         "muted": {"type": "boolean"},
+        "blockedBy": {"type": "boolean"},
+        "blocking": {"type": "string", "format": "at-uri"},
         "following": {"type": "string", "format": "at-uri"},
         "followedBy": {"type": "string", "format": "at-uri"}
       }

lexicons/app/bsky/embed/record.json

@@ -14,7 +14,7 @@
       "type": "object",
       "required":  ["record"],
       "properties": {
-        "record": {"type": "union", "refs": ["#viewRecord", "#viewNotFound"]}
+        "record": {"type": "union", "refs": ["#viewRecord", "#viewNotFound", "#viewBlocked"]}
       }
     },
     "viewRecord": {
@@ -50,6 +50,13 @@
       "properties": {
         "uri": {"type": "string", "format": "at-uri"}
       }
+    },
+    "viewBlocked": {
+      "type": "object",
+      "required":  ["uri"],
+      "properties": {
+        "uri": {"type": "string", "format": "at-uri"}
+      }
     }
   }
 }

lexicons/app/bsky/feed/defs.json

@@ -67,10 +67,10 @@
       "required": ["post"],
       "properties": {
         "post": {"type": "ref", "ref": "#postView"},
-        "parent": {"type": "union", "refs": ["#threadViewPost", "#notFoundPost"]},
+        "parent": {"type": "union", "refs": ["#threadViewPost", "#notFoundPost", "#blockedPost"]},
         "replies": {
           "type": "array",
-          "items": {"type": "union", "refs": ["#threadViewPost", "#notFoundPost"]}
+          "items": {"type": "union", "refs": ["#threadViewPost", "#notFoundPost", "#blockedPost"]}
         }
       }
     },
@@ -81,6 +81,14 @@
         "uri": {"type": "string", "format": "at-uri"},
         "notFound": {"type": "boolean", "const": true}
       }
+    },
+    "blockedPost": {
+      "type": "object",
+      "required": ["uri", "blocked"],
+      "properties": {
+        "uri": {"type": "string", "format": "at-uri"},
+        "blocked": {"type": "boolean", "const": true}
+      }
     }
   }
 }

lexicons/app/bsky/feed/getAuthorFeed.json

@@ -27,7 +27,11 @@
             }
           }
         }
-      }
+      },
+      "errors": [
+        {"name": "BlockedActor"},
+        {"name": "BlockedByActor"}
+      ]
     }
   }
 }

lexicons/app/bsky/feed/getPostThread.json

@@ -20,7 +20,11 @@
           "properties": {
             "thread": {
               "type": "union",
-              "refs": ["app.bsky.feed.defs#threadViewPost", "app.bsky.feed.defs#notFoundPost"]
+              "refs": [
+                "app.bsky.feed.defs#threadViewPost",
+                "app.bsky.feed.defs#notFoundPost",
+                "app.bsky.feed.defs#blockedPost"
+              ]
             }
           }
         }

lexicons/app/bsky/graph/block.json

@@ -0,0 +1,19 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.graph.block",
+  "defs": {
+    "main": {
+      "type": "record",
+      "description": "A block.",
+      "key": "tid",
+      "record": {
+        "type": "object",
+        "required": ["subject", "createdAt"],
+        "properties": {
+          "subject": {"type": "string", "format": "did"},
+          "createdAt": {"type": "string", "format": "datetime"}
+        }
+      }
+    }
+  }
+}

lexicons/app/bsky/graph/getBlocks.json

@@ -0,0 +1,31 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.graph.getBlocks",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "Who is the requester's account blocking?",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {"type": "integer", "minimum": 1, "maximum": 100, "default": 50},
+          "cursor": {"type": "string"}
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["blocks"],
+          "properties": {
+            "cursor": {"type": "string"},
+            "blocks": {
+              "type": "array",
+              "items": {"type": "ref", "ref": "app.bsky.actor.defs#profileView"}
+            }
+          }
+        }
+      }
+    }
+  }
+}

packages/api/src/client/index.ts

@@ -88,7 +88,9 @@ import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline'
 import * as AppBskyFeedLike from './types/app/bsky/feed/like'
 import * as AppBskyFeedPost from './types/app/bsky/feed/post'
 import * as AppBskyFeedRepost from './types/app/bsky/feed/repost'
+import * as AppBskyGraphBlock from './types/app/bsky/graph/block'
 import * as AppBskyGraphFollow from './types/app/bsky/graph/follow'
+import * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks'
 import * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers'
 import * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows'
 import * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes'
@@ -181,7 +183,9 @@ export * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline'
 export * as AppBskyFeedLike from './types/app/bsky/feed/like'
 export * as AppBskyFeedPost from './types/app/bsky/feed/post'
 export * as AppBskyFeedRepost from './types/app/bsky/feed/repost'
+export * as AppBskyGraphBlock from './types/app/bsky/graph/block'
 export * as AppBskyGraphFollow from './types/app/bsky/graph/follow'
+export * as AppBskyGraphGetBlocks from './types/app/bsky/graph/getBlocks'
 export * as AppBskyGraphGetFollowers from './types/app/bsky/graph/getFollowers'
 export * as AppBskyGraphGetFollows from './types/app/bsky/graph/getFollows'
 export * as AppBskyGraphGetMutes from './types/app/bsky/graph/getMutes'
@@ -1339,13 +1343,26 @@ export class RepostRecord {
 
 export class GraphNS {
   _service: AtpServiceClient
+  block: BlockRecord
   follow: FollowRecord
 
   constructor(service: AtpServiceClient) {
     this._service = service
+    this.block = new BlockRecord(service)
     this.follow = new FollowRecord(service)
   }
 
+  getBlocks(
+    params?: AppBskyGraphGetBlocks.QueryParams,
+    opts?: AppBskyGraphGetBlocks.CallOptions,
+  ): Promise<AppBskyGraphGetBlocks.Response> {
+    return this._service.xrpc
+      .call('app.bsky.graph.getBlocks', params, undefined, opts)
+      .catch((e) => {
+        throw AppBskyGraphGetBlocks.toKnownErr(e)
+      })
+  }
+
   getFollowers(
     params?: AppBskyGraphGetFollowers.QueryParams,
     opts?: AppBskyGraphGetFollowers.CallOptions,
@@ -1402,6 +1419,67 @@ export class GraphNS {
   }
 }
 
+export class BlockRecord {
+  _service: AtpServiceClient
+
+  constructor(service: AtpServiceClient) {
+    this._service = service
+  }
+
+  async list(
+    params: Omit<ComAtprotoRepoListRecords.QueryParams, 'collection'>,
+  ): Promise<{
+    cursor?: string
+    records: { uri: string; value: AppBskyGraphBlock.Record }[]
+  }> {
+    const res = await this._service.xrpc.call('com.atproto.repo.listRecords', {
+      collection: 'app.bsky.graph.block',
+      ...params,
+    })
+    return res.data
+  }
+
+  async get(
+    params: Omit<ComAtprotoRepoGetRecord.QueryParams, 'collection'>,
+  ): Promise<{ uri: string; cid: string; value: AppBskyGraphBlock.Record }> {
+    const res = await this._service.xrpc.call('com.atproto.repo.getRecord', {
+      collection: 'app.bsky.graph.block',
+      ...params,
+    })
+    return res.data
+  }
+
+  async create(
+    params: Omit<
+      ComAtprotoRepoCreateRecord.InputSchema,
+      'collection' | 'record'
+    >,
+    record: AppBskyGraphBlock.Record,
+    headers?: Record<string, string>,
+  ): Promise<{ uri: string; cid: string }> {
+    record.$type = 'app.bsky.graph.block'
+    const res = await this._service.xrpc.call(
+      'com.atproto.repo.createRecord',
+      undefined,
+      { collection: 'app.bsky.graph.block', ...params, record },
+      { encoding: 'application/json', headers },
+    )
+    return res.data
+  }
+
+  async delete(
+    params: Omit<ComAtprotoRepoDeleteRecord.InputSchema, 'collection'>,
+    headers?: Record<string, string>,
+  ): Promise<void> {
+    await this._service.xrpc.call(
+      'com.atproto.repo.deleteRecord',
+      undefined,
+      { collection: 'app.bsky.graph.block', ...params },
+      { headers },
+    )
+  }
+}
+
 export class FollowRecord {
   _service: AtpServiceClient