merge main

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

@@ -1,4 +1,4 @@
-name: build-and-push-pds-mirror
+name: build-and-push-pds-aws
 on:
   push:
     branches:
@@ -10,7 +10,7 @@ env:
   IMAGE_NAME: pds
 
 jobs:
-  pds-container-mirror:
+  pds-container-aws:
     runs-on: ubuntu-latest
     permissions:
       contents: read
@@ -30,7 +30,6 @@ jobs:
           registry: ${{ env.REGISTRY }}
           username: ${{ env.USERNAME}}
           password: ${{ env.PASSWORD }}
-          ecr: false # Disable ECR mode since we're using standard Docker auth.
 
       - name: Extract Docker metadata
         id: meta

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

@@ -1,4 +1,4 @@
-name: build-and-push-pds
+name: build-and-push-pds-ghcr
 on:
   push:
     branches:
@@ -12,7 +12,7 @@ env:
   IMAGE_NAME: ${{ github.repository }}
 
 jobs:
-  pds-container:
+  pds-container-ghcr:
     runs-on: ubuntu-latest
     permissions:
       contents: read

lexicons/app/bsky/unspecced/getPopular.json

@@ -0,0 +1,31 @@
+{
+  "lexicon": 1,
+  "id": "app.bsky.unspecced.getPopular",
+  "defs": {
+    "main": {
+      "type": "query",
+      "description": "An unspecced view of globally popular items",
+      "parameters": {
+        "type": "params",
+        "properties": {
+          "limit": {"type": "integer", "minimum": 1, "maximum": 100, "default": 50},
+          "cursor": {"type": "string"}
+        }
+      },
+      "output": {
+        "encoding": "application/json",
+        "schema": {
+          "type": "object",
+          "required": ["feed"],
+          "properties": {
+            "cursor": {"type": "string"},
+            "feed": {
+              "type": "array",
+              "items": {"type": "ref", "ref": "app.bsky.feed.defs#feedViewPost"}
+            }
+          }
+        }
+      }
+    }
+  }
+}

packages/api/src/client/index.ts

@@ -84,6 +84,7 @@ import * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notificatio
 import * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications'
 import * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen'
 import * as AppBskyRichtextFacet from './types/app/bsky/richtext/facet'
+import * as AppBskyUnspeccedGetPopular from './types/app/bsky/unspecced/getPopular'
 
 export * as ComAtprotoAdminDefs from './types/com/atproto/admin/defs'
 export * as ComAtprotoAdminGetModerationAction from './types/com/atproto/admin/getModerationAction'
@@ -163,6 +164,7 @@ export * as AppBskyNotificationGetUnreadCount from './types/app/bsky/notificatio
 export * as AppBskyNotificationListNotifications from './types/app/bsky/notification/listNotifications'
 export * as AppBskyNotificationUpdateSeen from './types/app/bsky/notification/updateSeen'
 export * as AppBskyRichtextFacet from './types/app/bsky/richtext/facet'
+export * as AppBskyUnspeccedGetPopular from './types/app/bsky/unspecced/getPopular'
 
 export const COM_ATPROTO_ADMIN = {
   DefsTakedown: 'com.atproto.admin.defs#takedown',
@@ -766,6 +768,7 @@ export class BskyNS {
   graph: GraphNS
   notification: NotificationNS
   richtext: RichtextNS
+  unspecced: UnspeccedNS
 
   constructor(service: AtpServiceClient) {
     this._service = service
@@ -775,6 +778,7 @@ export class BskyNS {
     this.graph = new GraphNS(service)
     this.notification = new NotificationNS(service)
     this.richtext = new RichtextNS(service)
+    this.unspecced = new UnspeccedNS(service)
   }
 }
 
@@ -1349,3 +1353,22 @@ export class RichtextNS {
     this._service = service
   }
 }
+
+export class UnspeccedNS {
+  _service: AtpServiceClient
+
+  constructor(service: AtpServiceClient) {
+    this._service = service
+  }
+
+  getPopular(
+    params?: AppBskyUnspeccedGetPopular.QueryParams,
+    opts?: AppBskyUnspeccedGetPopular.CallOptions,
+  ): Promise<AppBskyUnspeccedGetPopular.Response> {
+    return this._service.xrpc
+      .call('app.bsky.unspecced.getPopular', params, undefined, opts)
+      .catch((e) => {
+        throw AppBskyUnspeccedGetPopular.toKnownErr(e)
+      })
+  }
+}

packages/api/src/client/lexicons.ts

@@ -4011,6 +4011,49 @@ export const schemaDict = {
       },
     },
   },
+  AppBskyUnspeccedGetPopular: {
+    lexicon: 1,
+    id: 'app.bsky.unspecced.getPopular',
+    defs: {
+      main: {
+        type: 'query',
+        description: 'An unspecced view of globally popular items',
+        parameters: {
+          type: 'params',
+          properties: {
+            limit: {
+              type: 'integer',
+              minimum: 1,
+              maximum: 100,
+              default: 50,
+            },
+            cursor: {
+              type: 'string',
+            },
+          },
+        },
+        output: {
+          encoding: 'application/json',
+          schema: {
+            type: 'object',
+            required: ['feed'],
+            properties: {
+              cursor: {
+                type: 'string',
+              },
+              feed: {
+                type: 'array',
+                items: {
+                  type: 'ref',
+                  ref: 'lex:app.bsky.feed.defs#feedViewPost',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
 }
 export const schemas: LexiconDoc[] = Object.values(schemaDict) as LexiconDoc[]
 export const lexicons: Lexicons = new Lexicons(schemas)
@@ -4098,4 +4141,5 @@ export const ids = {
     'app.bsky.notification.listNotifications',
   AppBskyNotificationUpdateSeen: 'app.bsky.notification.updateSeen',
   AppBskyRichtextFacet: 'app.bsky.richtext.facet',
+  AppBskyUnspeccedGetPopular: 'app.bsky.unspecced.getPopular',
 }

packages/api/src/client/types/app/bsky/unspecced/getPopular.ts

@@ -0,0 +1,37 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import { Headers, XRPCError } from '@atproto/xrpc'
+import { ValidationResult } from '@atproto/lexicon'
+import { isObj, hasProp } from '../../../../util'
+import { lexicons } from '../../../../lexicons'
+import * as AppBskyFeedDefs from '../feed/defs'
+
+export interface QueryParams {
+  limit?: number
+  cursor?: string
+}
+
+export type InputSchema = undefined
+
+export interface OutputSchema {
+  cursor?: string
+  feed: AppBskyFeedDefs.FeedViewPost[]
+  [k: string]: unknown
+}
+
+export interface CallOptions {
+  headers?: Headers
+}
+
+export interface Response {
+  success: boolean
+  headers: Headers
+  data: OutputSchema
+}
+
+export function toKnownErr(e: any) {
+  if (e instanceof XRPCError) {
+  }
+  return e
+}

packages/dev-env/package.json

@@ -22,6 +22,7 @@
     "@atproto/uri": "*",
     "@did-plc/lib": "^0.0.1",
     "@did-plc/server": "^0.0.1",
+    "better-sqlite3": "^7.6.2",
     "chalk": "^5.0.1",
     "dotenv": "^16.0.1",
     "get-port": "^6.1.2",