Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

✨ Let admins see post thread even when the author blocks them #1678

Merged
merged 3 commits into from
Oct 3, 2023
Merged

✨ Let admins see post thread even when the author blocks them #1678

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4c7b14
:sparkles: Let admins see post thread even when the author blocks them
foysalit Sep 26, 2023
3c6b787
Merge branch 'main' of github.com:bluesky-social/atproto into handle-…
foysalit Sep 26, 2023
b06a497
:recycle: Refactor requester check
foysalit Sep 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/bsky/src/api/app/bsky/feed/getPostThread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ export default function (server: Server, ctx: AppContext) {
presentation,
)
server.app.bsky.feed.getPostThread({
auth: ctx.authOptionalVerifier,
auth: ctx.authOptionalAccessOrRoleVerifier,
handler: async ({ params, auth, res }) => {
const viewer = auth.credentials.did
const viewer = 'did' in auth.credentials ? auth.credentials.did : null
const db = ctx.db.getReplica('thread')
const feedService = ctx.services.feed(db)
const actorService = ctx.services.actor(db)
Expand Down
38 changes: 27 additions & 11 deletions packages/pds/src/api/app/bsky/feed/getPostThread.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,41 @@ import {
getRepoRev,
handleReadAfterWrite,
} from '../util/read-after-write'
import { authPassthru } from '../../../../../api/com/atproto/admin/util'
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed a build error that might be related to this—is it possible there's one too many ../?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm.. no idea how this happened though since it was auto-imported by vscode lol.


export default function (server: Server, ctx: AppContext) {
server.app.bsky.feed.getPostThread({
auth: ctx.accessVerifier,
handler: async ({ params, auth }) => {
const requester = auth.credentials.did
auth: ctx.accessOrRoleVerifier,
handler: async ({ req, params, auth }) => {
const requester =
auth.credentials.type === 'access' ? auth.credentials.did : null
try {
const res = await ctx.appviewAgent.api.app.bsky.feed.getPostThread(
params,
await ctx.serviceAuthHeaders(requester),
)
return await handleReadAfterWrite(
ctx,
requester,
res,
getPostThreadMunge,
requester
? await ctx.serviceAuthHeaders(requester)
: authPassthru(req),
)

if (requester) {
return await handleReadAfterWrite(
ctx,
requester,
res,
getPostThreadMunge,
)
}

return {
encoding: 'application/json',
body: res.data,
}
} catch (err) {
if (err instanceof AppBskyFeedGetPostThread.NotFoundError) {
// TODO: is this right? checking for requester and error type is safe enough?
if (
err instanceof AppBskyFeedGetPostThread.NotFoundError &&
requester
) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I believe that should be fine 👍 Maybe there's a way to split the two cases-up more rather than have the requester checks sprinkled throughout. For example, maybe the case could be offloaded up front since it's relatively simple on its own:

      const requester =
        auth.credentials.type === 'access' ? auth.credentials.did : null

      if (!requester) {
        const res = await ctx.appviewAgent.api.app.bsky.feed.getPostThread(
          params,
          authPassthru(req),
        )
        return {
          encoding: 'application/json',
          body: res.data,
        }
      }

      // ...
      // rest of code continues as originally written
      // ...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah yes, looks much better. just wasn't sure if the whole handleReadAfterWrite is needed for mods too so didn't spend any time thinking about the implementation. cleaned it up as suggested, thanks!

const local = await readAfterWriteNotFound(
ctx,
params,
Expand Down