Merge remote-tracking branch 'origin/appview-v2' into appview-v2-testing

bluesky-social · Jan 30, 2024 · 33b37d4 · 33b37d4
2 parents 0329ec9 + abf4d44
commit 33b37d4
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 34 deletions.
diff --git a/packages/bsky/src/api/app/bsky/actor/getProfile.ts b/packages/bsky/src/api/app/bsky/actor/getProfile.ts
@@ -14,11 +14,12 @@ export default function (server: Server, ctx: AppContext) {
     handler: async ({ auth, params, res }) => {
       const { viewer, canViewTakedowns } = ctx.authVerifier.parseCreds(auth)
 
-      const [result, repoRev] = await Promise.all([
-        getProfile({ ...params, viewer, canViewTakedowns }, ctx),
-        ctx.hydrator.actor.getRepoRevSafe(viewer),
-      ])
+      const result = await getProfile(
+        { ...params, viewer, canViewTakedowns },
+        ctx,
+      )
 
+      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
       setRepoRev(res, repoRev)
 
       return {

diff --git a/packages/bsky/src/api/app/bsky/actor/getProfiles.ts b/packages/bsky/src/api/app/bsky/actor/getProfiles.ts
@@ -14,11 +14,9 @@ export default function (server: Server, ctx: AppContext) {
     handler: async ({ auth, params, res }) => {
       const viewer = auth.credentials.iss
 
-      const [result, repoRev] = await Promise.all([
-        getProfile({ ...params, viewer }, ctx),
-        ctx.hydrator.actor.getRepoRevSafe(viewer),
-      ])
+      const result = await getProfile({ ...params, viewer }, ctx)
 
+      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
       setRepoRev(res, repoRev)
 
       return {

diff --git a/packages/bsky/src/api/app/bsky/feed/getActorLikes.ts b/packages/bsky/src/api/app/bsky/feed/getActorLikes.ts
@@ -24,11 +24,9 @@ export default function (server: Server, ctx: AppContext) {
     handler: async ({ params, auth, res }) => {
       const viewer = auth.credentials.iss
 
-      const [result, repoRev] = await Promise.all([
-        getActorLikes({ ...params, viewer }, ctx),
-        ctx.hydrator.actor.getRepoRevSafe(viewer),
-      ])
+      const result = await getActorLikes({ ...params, viewer }, ctx)
 
+      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
       setRepoRev(res, repoRev)
 
       return {

diff --git a/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts b/packages/bsky/src/api/app/bsky/feed/getAuthorFeed.ts
@@ -29,11 +29,9 @@ export default function (server: Server, ctx: AppContext) {
     handler: async ({ params, auth, res }) => {
       const { viewer } = ctx.authVerifier.parseCreds(auth)
 
-      const [result, repoRev] = await Promise.all([
-        getAuthorFeed({ ...params, viewer }, ctx),
-        ctx.hydrator.actor.getRepoRevSafe(viewer),
-      ])
+      const result = await getAuthorFeed({ ...params, viewer }, ctx)
 
+      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
       setRepoRev(res, repoRev)
 
       return {

diff --git a/packages/bsky/src/api/app/bsky/feed/getListFeed.ts b/packages/bsky/src/api/app/bsky/feed/getListFeed.ts
@@ -22,11 +22,9 @@ export default function (server: Server, ctx: AppContext) {
     handler: async ({ params, auth, res }) => {
       const viewer = auth.credentials.iss
 
-      const [result, repoRev] = await Promise.all([
-        getListFeed({ ...params, viewer }, ctx),
-        ctx.hydrator.actor.getRepoRevSafe(viewer),
-      ])
+      const result = await getListFeed({ ...params, viewer }, ctx)
 
+      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
       setRepoRev(res, repoRev)
 
       return {

diff --git a/packages/bsky/src/api/app/bsky/feed/getPostThread.ts b/packages/bsky/src/api/app/bsky/feed/getPostThread.ts
@@ -27,18 +27,18 @@ export default function (server: Server, ctx: AppContext) {
     handler: async ({ params, auth, res }) => {
       const { viewer } = ctx.authVerifier.parseCreds(auth)
 
-      const [result, repoRev] = await Promise.allSettled([
-        getPostThread({ ...params, viewer }, ctx),
-        ctx.hydrator.actor.getRepoRevSafe(viewer),
-      ])
-
-      if (repoRev.status === 'fulfilled') {
-        setRepoRev(res, repoRev.value)
-      }
-      if (result.status === 'rejected') {
-        throw result.reason
+      let result
+      try {
+        result = await getPostThread({ ...params, viewer }, ctx)
+      } catch (err) {
+        const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
+        setRepoRev(res, repoRev)
+        throw err
       }
 
+      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
+      setRepoRev(res, repoRev)
+
       return {
         encoding: 'application/json',
         body: result.value,

diff --git a/packages/bsky/src/api/app/bsky/feed/getTimeline.ts b/packages/bsky/src/api/app/bsky/feed/getTimeline.ts
@@ -22,11 +22,9 @@ export default function (server: Server, ctx: AppContext) {
     handler: async ({ params, auth, res }) => {
       const viewer = auth.credentials.iss
 
-      const [result, repoRev] = await Promise.all([
-        getTimeline({ ...params, viewer }, ctx),
-        ctx.hydrator.actor.getRepoRevSafe(viewer),
-      ])
+      const result = await getTimeline({ ...params, viewer }, ctx)
 
+      const repoRev = await ctx.hydrator.actor.getRepoRevSafe(viewer)
       setRepoRev(res, repoRev)
 
       return {