@atproto/bsky 0.0.9 → 0.0.10

package/dist/lexicon/index.d.ts

@@ -79,6 +79,7 @@ import * as AppBskyFeedGetPosts from './types/app/bsky/feed/getPosts';
 import * as AppBskyFeedGetRepostedBy from './types/app/bsky/feed/getRepostedBy';
 import * as AppBskyFeedGetSuggestedFeeds from './types/app/bsky/feed/getSuggestedFeeds';
 import * as AppBskyFeedGetTimeline from './types/app/bsky/feed/getTimeline';
+import * as AppBskyFeedSearchPosts from './types/app/bsky/feed/searchPosts';
 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';
@@ -96,10 +97,11 @@ import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notificatio
 import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications';
 import * as AppBskyNotificationRegisterPush from './types/app/bsky/notification/registerPush';
 import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen';
-import * as AppBskyUnspeccedApplyLabels from './types/app/bsky/unspecced/applyLabels';
 import * as AppBskyUnspeccedGetPopular from './types/app/bsky/unspecced/getPopular';
 import * as AppBskyUnspeccedGetPopularFeedGenerators from './types/app/bsky/unspecced/getPopularFeedGenerators';
 import * as AppBskyUnspeccedGetTimelineSkeleton from './types/app/bsky/unspecced/getTimelineSkeleton';
+import * as AppBskyUnspeccedSearchActorsSkeleton from './types/app/bsky/unspecced/searchActorsSkeleton';
+import * as AppBskyUnspeccedSearchPostsSkeleton from './types/app/bsky/unspecced/searchPostsSkeleton';
 export declare const COM_ATPROTO_ADMIN: {
     DefsTakedown: string;
     DefsFlag: string;
@@ -276,6 +278,7 @@ export declare class FeedNS {
     getRepostedBy<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyFeedGetRepostedBy.Handler<ExtractAuth<AV>>, AppBskyFeedGetRepostedBy.HandlerReqCtx<ExtractAuth<AV>>>): void;
     getSuggestedFeeds<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyFeedGetSuggestedFeeds.Handler<ExtractAuth<AV>>, AppBskyFeedGetSuggestedFeeds.HandlerReqCtx<ExtractAuth<AV>>>): void;
     getTimeline<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyFeedGetTimeline.Handler<ExtractAuth<AV>>, AppBskyFeedGetTimeline.HandlerReqCtx<ExtractAuth<AV>>>): void;
+    searchPosts<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyFeedSearchPosts.Handler<ExtractAuth<AV>>, AppBskyFeedSearchPosts.HandlerReqCtx<ExtractAuth<AV>>>): void;
 }
 export declare class GraphNS {
     _server: Server;
@@ -309,10 +312,11 @@ export declare class RichtextNS {
 export declare class UnspeccedNS {
     _server: Server;
     constructor(server: Server);
-    applyLabels<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedApplyLabels.Handler<ExtractAuth<AV>>, AppBskyUnspeccedApplyLabels.HandlerReqCtx<ExtractAuth<AV>>>): void;
     getPopular<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedGetPopular.Handler<ExtractAuth<AV>>, AppBskyUnspeccedGetPopular.HandlerReqCtx<ExtractAuth<AV>>>): void;
     getPopularFeedGenerators<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedGetPopularFeedGenerators.Handler<ExtractAuth<AV>>, AppBskyUnspeccedGetPopularFeedGenerators.HandlerReqCtx<ExtractAuth<AV>>>): void;
     getTimelineSkeleton<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedGetTimelineSkeleton.Handler<ExtractAuth<AV>>, AppBskyUnspeccedGetTimelineSkeleton.HandlerReqCtx<ExtractAuth<AV>>>): void;
+    searchActorsSkeleton<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedSearchActorsSkeleton.Handler<ExtractAuth<AV>>, AppBskyUnspeccedSearchActorsSkeleton.HandlerReqCtx<ExtractAuth<AV>>>): void;
+    searchPostsSkeleton<AV extends AuthVerifier>(cfg: ConfigOf<AV, AppBskyUnspeccedSearchPostsSkeleton.Handler<ExtractAuth<AV>>, AppBskyUnspeccedSearchPostsSkeleton.HandlerReqCtx<ExtractAuth<AV>>>): void;
 }
 declare type SharedRateLimitOpts<T> = {
     name: string;

package/dist/lexicon/lexicons.d.ts

@@ -1003,6 +1003,10 @@ export declare const schemaDict: {
                     properties: {
                         term: {
                             type: string;
+                            description: string;
+                        };
+                        q: {
+                            type: string;
                         };
                         invitedBy: {
                             type: string;
@@ -3727,6 +3731,11 @@ export declare const schemaDict: {
                     properties: {
                         term: {
                             type: string;
+                            description: string;
+                        };
+                        q: {
+                            type: string;
+                            description: string;
                         };
                         limit: {
                             type: string;
@@ -3773,6 +3782,11 @@ export declare const schemaDict: {
                     properties: {
                         term: {
                             type: string;
+                            description: string;
+                        };
+                        q: {
+                            type: string;
+                            description: string;
                         };
                         limit: {
                             type: string;
@@ -5362,6 +5376,62 @@ export declare const schemaDict: {
             };
         };
     };
+    AppBskyFeedSearchPosts: {
+        lexicon: number;
+        id: string;
+        defs: {
+            main: {
+                type: string;
+                description: string;
+                parameters: {
+                    type: string;
+                    required: string[];
+                    properties: {
+                        q: {
+                            type: string;
+                            description: string;
+                        };
+                        limit: {
+                            type: string;
+                            minimum: number;
+                            maximum: number;
+                            default: number;
+                        };
+                        cursor: {
+                            type: string;
+                            description: string;
+                        };
+                    };
+                };
+                output: {
+                    encoding: string;
+                    schema: {
+                        type: string;
+                        required: string[];
+                        properties: {
+                            cursor: {
+                                type: string;
+                            };
+                            hitsTotal: {
+                                type: string;
+                                description: string;
+                            };
+                            posts: {
+                                type: string;
+                                items: {
+                                    type: string;
+                                    ref: string;
+                                };
+                            };
+                        };
+                    };
+                };
+                errors: {
+                    name: string;
+                }[];
+            };
+        };
+    };
     AppBskyFeedThreadgate: {
         lexicon: number;
         id: string;
@@ -6447,20 +6517,67 @@ export declare const schemaDict: {
             };
         };
     };
-    AppBskyUnspeccedApplyLabels: {
+    AppBskyUnspeccedDefs: {
+        lexicon: number;
+        id: string;
+        defs: {
+            skeletonSearchPost: {
+                type: string;
+                required: string[];
+                properties: {
+                    uri: {
+                        type: string;
+                        format: string;
+                    };
+                };
+            };
+            skeletonSearchActor: {
+                type: string;
+                required: string[];
+                properties: {
+                    did: {
+                        type: string;
+                        format: string;
+                    };
+                };
+            };
+        };
+    };
+    AppBskyUnspeccedGetPopular: {
         lexicon: number;
         id: string;
         defs: {
             main: {
                 type: string;
                 description: string;
-                input: {
+                parameters: {
+                    type: string;
+                    properties: {
+                        includeNsfw: {
+                            type: string;
+                            default: boolean;
+                        };
+                        limit: {
+                            type: string;
+                            minimum: number;
+                            maximum: number;
+                            default: number;
+                        };
+                        cursor: {
+                            type: string;
+                        };
+                    };
+                };
+                output: {
                     encoding: string;
                     schema: {
                         type: string;
                         required: string[];
                         properties: {
-                            labels: {
+                            cursor: {
+                                type: string;
+                            };
+                            feed: {
                                 type: string;
                                 items: {
                                     type: string;
@@ -6473,7 +6590,7 @@ export declare const schemaDict: {
             };
         };
     };
-    AppBskyUnspeccedGetPopular: {
+    AppBskyUnspeccedGetPopularFeedGenerators: {
         lexicon: number;
         id: string;
         defs: {
@@ -6483,10 +6600,52 @@ export declare const schemaDict: {
                 parameters: {
                     type: string;
                     properties: {
-                        includeNsfw: {
+                        limit: {
                             type: string;
-                            default: boolean;
+                            minimum: number;
+                            maximum: number;
+                            default: number;
                         };
+                        cursor: {
+                            type: string;
+                        };
+                        query: {
+                            type: string;
+                        };
+                    };
+                };
+                output: {
+                    encoding: string;
+                    schema: {
+                        type: string;
+                        required: string[];
+                        properties: {
+                            cursor: {
+                                type: string;
+                            };
+                            feeds: {
+                                type: string;
+                                items: {
+                                    type: string;
+                                    ref: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        };
+    };
+    AppBskyUnspeccedGetTimelineSkeleton: {
+        lexicon: number;
+        id: string;
+        defs: {
+            main: {
+                type: string;
+                description: string;
+                parameters: {
+                    type: string;
+                    properties: {
                         limit: {
                             type: string;
                             minimum: number;
@@ -6517,10 +6676,13 @@ export declare const schemaDict: {
                         };
                     };
                 };
+                errors: {
+                    name: string;
+                }[];
             };
         };
     };
-    AppBskyUnspeccedGetPopularFeedGenerators: {
+    AppBskyUnspeccedSearchActorsSkeleton: {
         lexicon: number;
         id: string;
         defs: {
@@ -6529,7 +6691,16 @@ export declare const schemaDict: {
                 description: string;
                 parameters: {
                     type: string;
+                    required: string[];
                     properties: {
+                        q: {
+                            type: string;
+                            description: string;
+                        };
+                        typeahead: {
+                            type: string;
+                            description: string;
+                        };
                         limit: {
                             type: string;
                             minimum: number;
@@ -6538,9 +6709,7 @@ export declare const schemaDict: {
                         };
                         cursor: {
                             type: string;
-                        };
-                        query: {
-                            type: string;
+                            description: string;
                         };
                     };
                 };
@@ -6553,7 +6722,11 @@ export declare const schemaDict: {
                             cursor: {
                                 type: string;
                             };
-                            feeds: {
+                            hitsTotal: {
+                                type: string;
+                                description: string;
+                            };
+                            actors: {
                                 type: string;
                                 items: {
                                     type: string;
@@ -6563,10 +6736,13 @@ export declare const schemaDict: {
                         };
                     };
                 };
+                errors: {
+                    name: string;
+                }[];
             };
         };
     };
-    AppBskyUnspeccedGetTimelineSkeleton: {
+    AppBskyUnspeccedSearchPostsSkeleton: {
         lexicon: number;
         id: string;
         defs: {
@@ -6575,7 +6751,12 @@ export declare const schemaDict: {
                 description: string;
                 parameters: {
                     type: string;
+                    required: string[];
                     properties: {
+                        q: {
+                            type: string;
+                            description: string;
+                        };
                         limit: {
                             type: string;
                             minimum: number;
@@ -6584,6 +6765,7 @@ export declare const schemaDict: {
                         };
                         cursor: {
                             type: string;
+                            description: string;
                         };
                     };
                 };
@@ -6596,7 +6778,11 @@ export declare const schemaDict: {
                             cursor: {
                                 type: string;
                             };
-                            feed: {
+                            hitsTotal: {
+                                type: string;
+                                description: string;
+                            };
+                            posts: {
                                 type: string;
                                 items: {
                                     type: string;
@@ -6712,6 +6898,7 @@ export declare const ids: {
     AppBskyFeedLike: string;
     AppBskyFeedPost: string;
     AppBskyFeedRepost: string;
+    AppBskyFeedSearchPosts: string;
     AppBskyFeedThreadgate: string;
     AppBskyGraphBlock: string;
     AppBskyGraphDefs: string;
@@ -6737,8 +6924,10 @@ export declare const ids: {
     AppBskyNotificationRegisterPush: string;
     AppBskyNotificationUpdateSeen: string;
     AppBskyRichtextFacet: string;
-    AppBskyUnspeccedApplyLabels: string;
+    AppBskyUnspeccedDefs: string;
     AppBskyUnspeccedGetPopular: string;
     AppBskyUnspeccedGetPopularFeedGenerators: string;
     AppBskyUnspeccedGetTimelineSkeleton: string;
+    AppBskyUnspeccedSearchActorsSkeleton: string;
+    AppBskyUnspeccedSearchPostsSkeleton: string;
 };

package/dist/lexicon/types/app/bsky/actor/searchActors.d.ts

@@ -3,6 +3,7 @@ import { HandlerAuth } from '@atproto/xrpc-server';
 import * as AppBskyActorDefs from './defs';
 export interface QueryParams {
     term?: string;
+    q?: string;
     limit: number;
     cursor?: string;
 }

package/dist/lexicon/types/app/bsky/actor/searchActorsTypeahead.d.ts

@@ -3,6 +3,7 @@ import { HandlerAuth } from '@atproto/xrpc-server';
 import * as AppBskyActorDefs from './defs';
 export interface QueryParams {
     term?: string;
+    q?: string;
     limit: number;
 }
 export declare type InputSchema = undefined;

package/dist/lexicon/types/app/bsky/{unspecced/applyLabels.d.ts → feed/searchPosts.d.ts}

@@ -1,21 +1,32 @@
 import express from 'express';
 import { HandlerAuth } from '@atproto/xrpc-server';
-import * as ComAtprotoLabelDefs from '../../../com/atproto/label/defs';
+import * as AppBskyFeedDefs from './defs';
 export interface QueryParams {
+    q: string;
+    limit: number;
+    cursor?: string;
 }
-export interface InputSchema {
-    labels: ComAtprotoLabelDefs.Label[];
+export declare type InputSchema = undefined;
+export interface OutputSchema {
+    cursor?: string;
+    hitsTotal?: number;
+    posts: AppBskyFeedDefs.PostView[];
     [k: string]: unknown;
 }
-export interface HandlerInput {
+export declare type HandlerInput = undefined;
+export interface HandlerSuccess {
     encoding: 'application/json';
-    body: InputSchema;
+    body: OutputSchema;
+    headers?: {
+        [key: string]: string;
+    };
 }
 export interface HandlerError {
     status: number;
     message?: string;
+    error?: 'BadQueryString';
 }
-export declare type HandlerOutput = HandlerError | void;
+export declare type HandlerOutput = HandlerError | HandlerSuccess;
 export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
     auth: HA;
     params: QueryParams;

package/dist/lexicon/types/app/bsky/unspecced/defs.d.ts

@@ -0,0 +1,13 @@
+import { ValidationResult } from '@atproto/lexicon';
+export interface SkeletonSearchPost {
+    uri: string;
+    [k: string]: unknown;
+}
+export declare function isSkeletonSearchPost(v: unknown): v is SkeletonSearchPost;
+export declare function validateSkeletonSearchPost(v: unknown): ValidationResult;
+export interface SkeletonSearchActor {
+    did: string;
+    [k: string]: unknown;
+}
+export declare function isSkeletonSearchActor(v: unknown): v is SkeletonSearchActor;
+export declare function validateSkeletonSearchActor(v: unknown): ValidationResult;

package/dist/lexicon/types/app/bsky/unspecced/searchActorsSkeleton.d.ts

@@ -0,0 +1,38 @@
+import express from 'express';
+import { HandlerAuth } from '@atproto/xrpc-server';
+import * as AppBskyUnspeccedDefs from './defs';
+export interface QueryParams {
+    q: string;
+    typeahead?: boolean;
+    limit: number;
+    cursor?: string;
+}
+export declare type InputSchema = undefined;
+export interface OutputSchema {
+    cursor?: string;
+    hitsTotal?: number;
+    actors: AppBskyUnspeccedDefs.SkeletonSearchActor[];
+    [k: string]: unknown;
+}
+export declare type HandlerInput = undefined;
+export interface HandlerSuccess {
+    encoding: 'application/json';
+    body: OutputSchema;
+    headers?: {
+        [key: string]: string;
+    };
+}
+export interface HandlerError {
+    status: number;
+    message?: string;
+    error?: 'BadQueryString';
+}
+export declare type HandlerOutput = HandlerError | HandlerSuccess;
+export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
+    auth: HA;
+    params: QueryParams;
+    input: HandlerInput;
+    req: express.Request;
+    res: express.Response;
+};
+export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/app/bsky/unspecced/searchPostsSkeleton.d.ts

@@ -0,0 +1,37 @@
+import express from 'express';
+import { HandlerAuth } from '@atproto/xrpc-server';
+import * as AppBskyUnspeccedDefs from './defs';
+export interface QueryParams {
+    q: string;
+    limit: number;
+    cursor?: string;
+}
+export declare type InputSchema = undefined;
+export interface OutputSchema {
+    cursor?: string;
+    hitsTotal?: number;
+    posts: AppBskyUnspeccedDefs.SkeletonSearchPost[];
+    [k: string]: unknown;
+}
+export declare type HandlerInput = undefined;
+export interface HandlerSuccess {
+    encoding: 'application/json';
+    body: OutputSchema;
+    headers?: {
+        [key: string]: string;
+    };
+}
+export interface HandlerError {
+    status: number;
+    message?: string;
+    error?: 'BadQueryString';
+}
+export declare type HandlerOutput = HandlerError | HandlerSuccess;
+export declare type HandlerReqCtx<HA extends HandlerAuth = never> = {
+    auth: HA;
+    params: QueryParams;
+    input: HandlerInput;
+    req: express.Request;
+    res: express.Response;
+};
+export declare type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/dist/lexicon/types/com/atproto/admin/searchRepos.d.ts

@@ -3,6 +3,7 @@ import { HandlerAuth } from '@atproto/xrpc-server';
 import * as ComAtprotoAdminDefs from './defs';
 export interface QueryParams {
     term?: string;
+    q?: string;
     invitedBy?: string;
     limit: number;
     cursor?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "license": "MIT",
   "description": "Reference implementation of app.bsky App View (Bluesky API)",
   "keywords": [
@@ -27,7 +27,6 @@
     "http-errors": "^2.0.0",
     "http-terminator": "^3.2.0",
     "ioredis": "^5.3.2",
-    "iso-datestring-validator": "^2.2.2",
     "kysely": "^0.22.0",
     "multiformats": "^9.9.0",
     "p-queue": "^6.6.2",
@@ -37,7 +36,7 @@
     "sharp": "^0.31.2",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.6.18",
+    "@atproto/api": "^0.6.19",
     "@atproto/common": "^0.3.0",
     "@atproto/crypto": "^0.2.2",
     "@atproto/syntax": "^0.1.1",
@@ -55,10 +54,10 @@
     "@types/qs": "^6.9.7",
     "@types/sharp": "^0.31.0",
     "axios": "^0.27.2",
-    "@atproto/api": "^0.6.18",
-    "@atproto/dev-env": "^0.2.9",
+    "@atproto/api": "^0.6.19",
+    "@atproto/dev-env": "^0.2.10",
     "@atproto/lex-cli": "^0.2.1",
-    "@atproto/pds": "^0.1.18",
+    "@atproto/pds": "^0.1.19",
     "@atproto/xrpc": "^0.3.1"
   },
   "scripts": {

package/src/api/app/bsky/actor/searchActors.ts

@@ -11,8 +11,14 @@ export default function (server: Server, ctx: AppContext) {
   server.app.bsky.actor.searchActors({
     auth: ctx.authOptionalVerifier,
     handler: async ({ auth, params }) => {
-      const { cursor, limit, term: rawTerm } = params
+      let { cursor, limit, term: rawTerm, q: rawQ } = params
       const requester = auth.credentials.did
+
+      // prefer new 'q' query param over deprecated 'term'
+      if (rawQ) {
+        rawTerm = rawQ
+      }
+
       const term = cleanTerm(rawTerm || '')
 
       const db = ctx.db.getReplica('search')

package/src/api/app/bsky/actor/searchActorsTypeahead.ts

@@ -9,8 +9,14 @@ export default function (server: Server, ctx: AppContext) {
   server.app.bsky.actor.searchActorsTypeahead({
     auth: ctx.authOptionalVerifier,
     handler: async ({ params, auth }) => {
-      const { limit, term: rawTerm } = params
+      let { limit, term: rawTerm, q: rawQ } = params
       const requester = auth.credentials.did
+
+      // prefer new 'q' query param over deprecated 'term'
+      if (rawQ) {
+        rawTerm = rawQ
+      }
+
       const term = cleanTerm(rawTerm || '')
 
       const db = ctx.db.getReplica('search')

package/src/api/com/atproto/admin/searchRepos.ts

@@ -12,6 +12,11 @@ export default function (server: Server, ctx: AppContext) {
       if (invitedBy) {
         throw new InvalidRequestError('The invitedBy parameter is unsupported')
       }
+      // prefer new 'q' query param over deprecated 'term'
+      const { q } = params
+      if (q) {
+        params.term = q
+      }
 
       const { results, cursor } = await ctx.services
         .actor(db)

package/src/auto-moderator/index.ts

@@ -280,28 +280,12 @@ export class AutoModerator {
   async storeLabels(uri: AtUri, cid: CID, labels: string[]): Promise<void> {
     if (labels.length < 1) return
     const labelSrvc = this.services.label(this.ctx.db)
-    const formatted = await labelSrvc.formatAndCreate(
+    await labelSrvc.formatAndCreate(
       this.ctx.cfg.labelerDid,
       uri.toString(),
       cid.toString(),
       { create: labels },
     )
-    if (this.pushAgent) {
-      const agent = this.pushAgent
-      try {
-        await agent.api.app.bsky.unspecced.applyLabels({ labels: formatted })
-      } catch (err) {
-        log.error(
-          {
-            err,
-            uri: uri.toString(),
-            labels,
-            receiver: agent.service.toString(),
-          },
-          'failed to push labels',
-        )
-      }
-    }
   }
 
   async processAll() {