Merge branch 'bluesky-social:main' into main

sudoWright · Jan 5, 2024 · f2fb61f · f2fb61f
2 parents 78beb00 + 1207363
commit f2fb61f
Show file tree

Hide file tree

Showing 132 changed files with 3,479 additions and 698 deletions.
diff --git a/.env.example b/.env.example
@@ -8,7 +8,7 @@ FEEDGEN_LISTENHOST="localhost"
 FEEDGEN_SQLITE_LOCATION=":memory:"
 
 # Don't change unless you're working in a different environment than the primary Bluesky network
-FEEDGEN_SUBSCRIPTION_ENDPOINT="wss://bsky.social"
+FEEDGEN_SUBSCRIPTION_ENDPOINT="wss://bsky.network"
 
 # Set this to the hostname that you intend to run the service at
 FEEDGEN_HOSTNAME="example.com"

diff --git a/package.json b/package.json
@@ -12,12 +12,12 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@atproto/api": "^0.3.7",
-    "@atproto/did-resolver": "^0.1.0",
-    "@atproto/lexicon": "^0.1.0",
-    "@atproto/repo": "^0.1.0",
-    "@atproto/uri": "^0.0.2",
-    "@atproto/xrpc-server": "^0.2.0",
+    "@atproto/api": "^0.6.20",
+    "@atproto/identity": "^0.2.1",
+    "@atproto/lexicon": "^0.2.2",
+    "@atproto/repo": "^0.3.2",
+    "@atproto/syntax": "^0.1.2",
+    "@atproto/xrpc-server": "^0.3.2",
     "better-sqlite3": "^8.3.0",
     "dotenv": "^16.0.3",
     "express": "^4.18.2",

diff --git a/scripts/publishFeedGen.ts b/scripts/publishFeedGen.ts
@@ -45,14 +45,6 @@ const run = async () => {
   const agent = new AtpAgent({ service: 'https://bsky.social' })
   await agent.login({ identifier: handle, password })
 
-  try {
-    await agent.api.app.bsky.feed.describeFeedGenerator()
-  } catch (err) {
-    throw new Error(
-      'The bluesky server is not ready to accept published custom feeds yet',
-    )
-  }
-
   let avatarRef: BlobRef | undefined
   if (avatar) {
     let encoding: string

diff --git a/src/auth.ts b/src/auth.ts
@@ -1,6 +1,6 @@
 import express from 'express'
 import { verifyJwt, AuthRequiredError } from '@atproto/xrpc-server'
-import { DidResolver } from '@atproto/did-resolver'
+import { DidResolver } from '@atproto/identity'
 
 export const validateAuth = async (
   req: express.Request,

diff --git a/src/config.ts b/src/config.ts
@@ -1,5 +1,5 @@
 import { Database } from './db'
-import { DidResolver } from '@atproto/did-resolver'
+import { DidResolver } from '@atproto/identity'
 
 export type AppContext = {
   db: Database

diff --git a/src/index.ts b/src/index.ts
@@ -12,7 +12,7 @@ const run = async () => {
     sqliteLocation: maybeStr(process.env.FEEDGEN_SQLITE_LOCATION) ?? ':memory:',
     subscriptionEndpoint:
       maybeStr(process.env.FEEDGEN_SUBSCRIPTION_ENDPOINT) ??
-      'wss://bsky.social',
+      'wss://bsky.network',
     publisherDid:
       maybeStr(process.env.FEEDGEN_PUBLISHER_DID) ?? 'did:example:alice',
     subscriptionReconnectDelay: