Adjust wording for account suspension (#2153)

adjust wording for account suspension
bluesky-social · Feb 8, 2024 · 94a59e5 · 94a59e5
1 parent e610da9
commit 94a59e5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 40 deletions.
diff --git a/packages/bsky/src/api/app/bsky/actor/getProfile.ts b/packages/bsky/src/api/app/bsky/actor/getProfile.ts
@@ -69,17 +69,10 @@ const presentation = (input: {
     !params.canViewTakedowns &&
     ctx.views.actorIsTakendown(skeleton.did, hydration)
   ) {
-    if (ctx.views.actorIsSuspended(skeleton.did, hydration)) {
-      throw new InvalidRequestError(
-        'Account has been temporarily suspended',
-        'AccountTakedown',
-      )
-    } else {
-      throw new InvalidRequestError(
-        'Account has been taken down',
-        'AccountTakedown',
-      )
-    }
+    throw new InvalidRequestError(
+      'Account has been suspended',
+      'AccountTakedown',
+    )
   }
   return profile
 }

diff --git a/packages/bsky/src/views/index.ts b/packages/bsky/src/views/index.ts
@@ -60,13 +60,6 @@ export class Views {
     return !!state.actors?.get(did)?.takedownRef
   }
 
-  actorIsSuspended(did: string, state: HydrationState): boolean {
-    return !!state.actors
-      ?.get(did)
-      ?.takedownRef?.toLowerCase()
-      .includes('suspend')
-  }
-
   viewerBlockExists(did: string, state: HydrationState): boolean {
     const actor = state.profileViewers?.get(did)
     if (!actor) return false

diff --git a/packages/bsky/tests/views/profile.test.ts b/packages/bsky/tests/views/profile.test.ts
@@ -191,28 +191,7 @@ describe('pds profile views', () => {
       { headers: await network.serviceHeaders(bob) },
     )
 
-    await expect(promise).rejects.toThrow('Account has been taken down')
-
-    // Cleanup
-    await network.bsky.ctx.dataplane.untakedownActor({
-      did: alice,
-    })
-  })
-
-  // @TODO reimplement suspension?
-  it.skip('blocked by actor suspension', async () => {
-    await network.bsky.ctx.dataplane.takedownActor({
-      did: alice,
-    })
-    await network.processAll()
-    const promise = agent.api.app.bsky.actor.getProfile(
-      { actor: alice },
-      { headers: await network.serviceHeaders(bob) },
-    )
-
-    await expect(promise).rejects.toThrow(
-      'Account has been temporarily suspended',
-    )
+    await expect(promise).rejects.toThrow('Account has been suspended')
 
     // Cleanup
     await network.bsky.ctx.dataplane.untakedownActor({