@atproto/bsky 0.0.159 → 0.0.161

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.159",
+  "version": "0.0.161",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -49,14 +49,14 @@
     "undici": "^6.19.8",
     "@atproto-labs/fetch-node": "0.1.9",
     "@atproto-labs/xrpc-utils": "0.0.16",
-    "@atproto/api": "^0.15.15",
+    "@atproto/api": "^0.15.16",
     "@atproto/common": "^0.4.11",
     "@atproto/crypto": "^0.4.4",
     "@atproto/did": "^0.1.5",
     "@atproto/identity": "^0.4.8",
     "@atproto/lexicon": "^0.4.11",
-    "@atproto/repo": "^0.8.1",
-    "@atproto/sync": "^0.1.25",
+    "@atproto/repo": "^0.8.2",
+    "@atproto/sync": "^0.1.26",
     "@atproto/syntax": "^0.4.0",
     "@atproto/xrpc-server": "^0.8.0"
   },
@@ -73,9 +73,9 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/api": "^0.15.15",
+    "@atproto/api": "^0.15.16",
     "@atproto/lex-cli": "^0.8.2",
-    "@atproto/pds": "^0.4.148",
+    "@atproto/pds": "^0.4.150",
     "@atproto/xrpc": "^0.7.0"
   },
   "scripts": {

package/proto/bsky.proto

@@ -765,14 +765,14 @@ message NotificationChannelPush {
   bool enabled = 1;
 }
 
-enum NotificationFilter {
-  NOTIFICATION_FILTER_UNSPECIFIED = 0;
-  NOTIFICATION_FILTER_ALL = 1;
-  NOTIFICATION_FILTER_FOLLOWS = 2;
+enum NotificationInclude {
+  NOTIFICATION_INCLUDE_UNSPECIFIED = 0;
+  NOTIFICATION_INCLUDE_ALL = 1;
+  NOTIFICATION_INCLUDE_FOLLOWS = 2;
 }
 
 message FilterableNotificationPreference {
-  NotificationFilter filter = 1;
+  NotificationInclude include = 1;
   NotificationChannelList list = 2;
   NotificationChannelPush push = 3;
 }
@@ -782,14 +782,14 @@ message NotificationPreference {
   NotificationChannelPush push = 2;
 }
 
-enum ChatNotificationFilter {
-  CHAT_NOTIFICATION_FILTER_UNSPECIFIED = 0;
-  CHAT_NOTIFICATION_FILTER_ALL = 1;
-  CHAT_NOTIFICATION_FILTER_ACCEPTED = 2;
+enum ChatNotificationInclude {
+  CHAT_NOTIFICATION_INCLUDE_UNSPECIFIED = 0;
+  CHAT_NOTIFICATION_INCLUDE_ALL = 1;
+  CHAT_NOTIFICATION_INCLUDE_ACCEPTED = 2;
 }
 
 message ChatNotificationPreference {
-  ChatNotificationFilter filter = 1;
+  ChatNotificationInclude include = 1;
   NotificationChannelPush push = 2;
 }
 

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

@@ -6,10 +6,10 @@ import {
   Preferences,
 } from '../../../../lexicon/types/app/bsky/notification/defs'
 import {
-  ChatNotificationFilter,
+  ChatNotificationInclude,
   ChatNotificationPreference,
   FilterableNotificationPreference,
-  NotificationFilter,
+  NotificationInclude,
   NotificationPreference,
   NotificationPreferences,
 } from '../../../../proto/bsky_pb'
@@ -23,11 +23,11 @@ type DeepPartial<T> = T extends object
 const ensureChatPreference = (
   p?: DeepPartial<ChatPreference>,
 ): ChatPreference => {
-  const filters = ['all', 'accepted']
+  const includeValues = ['all', 'accepted']
   return {
-    filter:
-      typeof p?.filter === 'string' && filters.includes(p.filter)
-        ? p.filter
+    include:
+      typeof p?.include === 'string' && includeValues.includes(p.include)
+        ? p.include
         : 'all',
     push: p?.push ?? true,
   }
@@ -36,11 +36,11 @@ const ensureChatPreference = (
 const ensureFilterablePreference = (
   p?: DeepPartial<FilterablePreference>,
 ): FilterablePreference => {
-  const filters = ['all', 'follows']
+  const includeValues = ['all', 'follows']
   return {
-    filter:
-      typeof p?.filter === 'string' && filters.includes(p.filter)
-        ? p.filter
+    include:
+      typeof p?.include === 'string' && includeValues.includes(p.include)
+        ? p.include
         : 'all',
     list: p?.list ?? true,
     push: p?.push ?? true,
@@ -78,7 +78,8 @@ const protobufChatPreferenceToLex = (
   p?: DeepPartial<ChatNotificationPreference>,
 ): DeepPartial<ChatPreference> => {
   return {
-    filter: p?.filter === ChatNotificationFilter.ACCEPTED ? 'accepted' : 'all',
+    include:
+      p?.include === ChatNotificationInclude.ACCEPTED ? 'accepted' : 'all',
     push: p?.push?.enabled,
   }
 }
@@ -87,7 +88,7 @@ const protobufFilterablePreferenceToLex = (
   p?: DeepPartial<FilterableNotificationPreference>,
 ): DeepPartial<FilterablePreference> => {
   return {
-    filter: p?.filter === NotificationFilter.FOLLOWS ? 'follows' : 'all',
+    include: p?.include === NotificationInclude.FOLLOWS ? 'follows' : 'all',
     list: p?.list?.enabled,
     push: p?.push?.enabled,
   }

package/src/api/blob-resolver.ts

@@ -116,7 +116,7 @@ export function createMiddleware(ctx: AppContext): Middleware {
 
           // From this point on, triggering the next middleware (including any
           // error handler) can be problematic because content-type,
-          // content-enconding, etc. headers have already been set. Because of
+          // content-encoding, etc. headers have already been set. Because of
           // this, we make sure that res.headersSent is set to true, preventing
           // another error handler middleware from being called (from the catch
           // block bellow). Not flushing the headers here would require to

package/src/data-plane/server/routes/private-data.ts

@@ -8,10 +8,10 @@ import {
 } from '../../../lexicon/types/app/bsky/notification/defs'
 import { Service } from '../../../proto/bsky_connect'
 import {
-  ChatNotificationFilter,
+  ChatNotificationInclude,
   ChatNotificationPreference,
   FilterableNotificationPreference,
-  NotificationFilter,
+  NotificationInclude,
   NotificationPreference,
   NotificationPreferences,
 } from '../../../proto/bsky_pb'
@@ -68,10 +68,10 @@ const lexChatPreferenceToProtobuf = (
   p: ChatPreference,
 ): ChatNotificationPreference =>
   new ChatNotificationPreference({
-    filter:
-      p.filter === 'accepted'
-        ? ChatNotificationFilter.ACCEPTED
-        : ChatNotificationFilter.ALL,
+    include:
+      p.include === 'accepted'
+        ? ChatNotificationInclude.ACCEPTED
+        : ChatNotificationInclude.ALL,
     push: { enabled: p.push ?? true },
   })
 
@@ -79,10 +79,10 @@ const lexFilterablePreferenceToProtobuf = (
   p: FilterablePreference,
 ): FilterableNotificationPreference =>
   new FilterableNotificationPreference({
-    filter:
-      p.filter === 'follows'
-        ? NotificationFilter.FOLLOWS
-        : NotificationFilter.ALL,
+    include:
+      p.include === 'follows'
+        ? NotificationInclude.FOLLOWS
+        : NotificationInclude.ALL,
     list: { enabled: p.list ?? true },
     push: { enabled: p.push ?? true },
   })

package/src/lexicon/lexicons.ts

@@ -9734,9 +9734,9 @@ export const schemaDict = {
       },
       chatPreference: {
         type: 'object',
-        required: ['filter', 'push'],
+        required: ['include', 'push'],
         properties: {
-          filter: {
+          include: {
             type: 'string',
             knownValues: ['all', 'accepted'],
           },
@@ -9747,9 +9747,9 @@ export const schemaDict = {
       },
       filterablePreference: {
         type: 'object',
-        required: ['filter', 'list', 'push'],
+        required: ['include', 'list', 'push'],
         properties: {
-          filter: {
+          include: {
             type: 'string',
             knownValues: ['all', 'follows'],
           },

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

@@ -30,7 +30,7 @@ export function validateRecordDeleted<V>(v: V) {
 
 export interface ChatPreference {
   $type?: 'app.bsky.notification.defs#chatPreference'
-  filter: 'all' | 'accepted' | (string & {})
+  include: 'all' | 'accepted' | (string & {})
   push: boolean
 }
 
@@ -46,7 +46,7 @@ export function validateChatPreference<V>(v: V) {
 
 export interface FilterablePreference {
   $type?: 'app.bsky.notification.defs#filterablePreference'
-  filter: 'all' | 'follows' | (string & {})
+  include: 'all' | 'follows' | (string & {})
   list: boolean
   push: boolean
 }

package/src/proto/bsky_pb.ts

@@ -14,56 +14,60 @@ import type {
 import { Message, proto3, protoInt64, Timestamp } from '@bufbuild/protobuf'
 
 /**
- * @generated from enum bsky.NotificationFilter
+ * @generated from enum bsky.NotificationInclude
  */
-export enum NotificationFilter {
+export enum NotificationInclude {
   /**
-   * @generated from enum value: NOTIFICATION_FILTER_UNSPECIFIED = 0;
+   * @generated from enum value: NOTIFICATION_INCLUDE_UNSPECIFIED = 0;
    */
   UNSPECIFIED = 0,
 
   /**
-   * @generated from enum value: NOTIFICATION_FILTER_ALL = 1;
+   * @generated from enum value: NOTIFICATION_INCLUDE_ALL = 1;
    */
   ALL = 1,
 
   /**
-   * @generated from enum value: NOTIFICATION_FILTER_FOLLOWS = 2;
+   * @generated from enum value: NOTIFICATION_INCLUDE_FOLLOWS = 2;
    */
   FOLLOWS = 2,
 }
-// Retrieve enum metadata with: proto3.getEnumType(NotificationFilter)
-proto3.util.setEnumType(NotificationFilter, 'bsky.NotificationFilter', [
-  { no: 0, name: 'NOTIFICATION_FILTER_UNSPECIFIED' },
-  { no: 1, name: 'NOTIFICATION_FILTER_ALL' },
-  { no: 2, name: 'NOTIFICATION_FILTER_FOLLOWS' },
+// Retrieve enum metadata with: proto3.getEnumType(NotificationInclude)
+proto3.util.setEnumType(NotificationInclude, 'bsky.NotificationInclude', [
+  { no: 0, name: 'NOTIFICATION_INCLUDE_UNSPECIFIED' },
+  { no: 1, name: 'NOTIFICATION_INCLUDE_ALL' },
+  { no: 2, name: 'NOTIFICATION_INCLUDE_FOLLOWS' },
 ])
 
 /**
- * @generated from enum bsky.ChatNotificationFilter
+ * @generated from enum bsky.ChatNotificationInclude
  */
-export enum ChatNotificationFilter {
+export enum ChatNotificationInclude {
   /**
-   * @generated from enum value: CHAT_NOTIFICATION_FILTER_UNSPECIFIED = 0;
+   * @generated from enum value: CHAT_NOTIFICATION_INCLUDE_UNSPECIFIED = 0;
    */
   UNSPECIFIED = 0,
 
   /**
-   * @generated from enum value: CHAT_NOTIFICATION_FILTER_ALL = 1;
+   * @generated from enum value: CHAT_NOTIFICATION_INCLUDE_ALL = 1;
    */
   ALL = 1,
 
   /**
-   * @generated from enum value: CHAT_NOTIFICATION_FILTER_ACCEPTED = 2;
+   * @generated from enum value: CHAT_NOTIFICATION_INCLUDE_ACCEPTED = 2;
    */
   ACCEPTED = 2,
 }
-// Retrieve enum metadata with: proto3.getEnumType(ChatNotificationFilter)
-proto3.util.setEnumType(ChatNotificationFilter, 'bsky.ChatNotificationFilter', [
-  { no: 0, name: 'CHAT_NOTIFICATION_FILTER_UNSPECIFIED' },
-  { no: 1, name: 'CHAT_NOTIFICATION_FILTER_ALL' },
-  { no: 2, name: 'CHAT_NOTIFICATION_FILTER_ACCEPTED' },
-])
+// Retrieve enum metadata with: proto3.getEnumType(ChatNotificationInclude)
+proto3.util.setEnumType(
+  ChatNotificationInclude,
+  'bsky.ChatNotificationInclude',
+  [
+    { no: 0, name: 'CHAT_NOTIFICATION_INCLUDE_UNSPECIFIED' },
+    { no: 1, name: 'CHAT_NOTIFICATION_INCLUDE_ALL' },
+    { no: 2, name: 'CHAT_NOTIFICATION_INCLUDE_ACCEPTED' },
+  ],
+)
 
 /**
  * @generated from enum bsky.FeedType
@@ -8411,9 +8415,9 @@ export class NotificationChannelPush extends Message<NotificationChannelPush> {
  */
 export class FilterableNotificationPreference extends Message<FilterableNotificationPreference> {
   /**
-   * @generated from field: bsky.NotificationFilter filter = 1;
+   * @generated from field: bsky.NotificationInclude include = 1;
    */
-  filter = NotificationFilter.UNSPECIFIED
+  include = NotificationInclude.UNSPECIFIED
 
   /**
    * @generated from field: bsky.NotificationChannelList list = 2;
@@ -8435,9 +8439,9 @@ export class FilterableNotificationPreference extends Message<FilterableNotifica
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     {
       no: 1,
-      name: 'filter',
+      name: 'include',
       kind: 'enum',
-      T: proto3.getEnumType(NotificationFilter),
+      T: proto3.getEnumType(NotificationInclude),
     },
     { no: 2, name: 'list', kind: 'message', T: NotificationChannelList },
     { no: 3, name: 'push', kind: 'message', T: NotificationChannelPush },
@@ -8547,9 +8551,9 @@ export class NotificationPreference extends Message<NotificationPreference> {
  */
 export class ChatNotificationPreference extends Message<ChatNotificationPreference> {
   /**
-   * @generated from field: bsky.ChatNotificationFilter filter = 1;
+   * @generated from field: bsky.ChatNotificationInclude include = 1;
    */
-  filter = ChatNotificationFilter.UNSPECIFIED
+  include = ChatNotificationInclude.UNSPECIFIED
 
   /**
    * @generated from field: bsky.NotificationChannelPush push = 2;
@@ -8566,9 +8570,9 @@ export class ChatNotificationPreference extends Message<ChatNotificationPreferen
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     {
       no: 1,
-      name: 'filter',
+      name: 'include',
       kind: 'enum',
-      T: proto3.getEnumType(ChatNotificationFilter),
+      T: proto3.getEnumType(ChatNotificationInclude),
     },
     { no: 2, name: 'push', kind: 'message', T: NotificationChannelPush },
   ])

package/tests/views/notifications.test.ts

@@ -925,7 +925,7 @@ describe('notification views', () => {
 
     // Defaults
     const fp: FilterablePreference = {
-      filter: 'all',
+      include: 'all',
       list: true,
       push: true,
     }
@@ -934,7 +934,7 @@ describe('notification views', () => {
       push: true,
     }
     const cp: ChatPreference = {
-      filter: 'all',
+      include: 'all',
       push: true,
     }
 
@@ -1076,7 +1076,7 @@ describe('notification views', () => {
       const input0 = {
         chat: {
           push: false,
-          filter: 'accepted',
+          include: 'accepted',
         },
       }
       const expected0: Preferences = {
@@ -1100,7 +1100,7 @@ describe('notification views', () => {
         mention: {
           list: false,
           push: false,
-          filter: 'follows',
+          include: 'follows',
         },
       }
       const expected1: Preferences = {