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

Better handle 3rd party blocks in feeds #1677

Merged
merged 4 commits into from
Dec 19, 2023
Merged

Better handle 3rd party blocks in feeds #1677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
142f068
better handle 3rd party blocks inf eeds
dholms Sep 26, 2023
89974c1
Merge branch 'main' into 3rd-party-blocks-in-feeds
dholms Dec 15, 2023
1a23412
show anchor post in threads
dholms Dec 15, 2023
a795da0
test
dholms Dec 15, 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
7 changes: 4 additions & 3 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 @@ -128,9 +128,10 @@ const composeThread = (
// @TODO re-enable invalidReplyRoot check
// const badReply = !!info?.invalidReplyRoot || !!info?.violatesThreadGate
const badReply = !!info?.violatesThreadGate
const omitBadReply = !isAnchorPost && badReply
const violatesBlock = (post && blocks[post.uri]?.reply) ?? false
const omitBadReply = !isAnchorPost && (badReply || violatesBlock)

if (!post || blocks[post.uri]?.reply || omitBadReply) {
if (!post || omitBadReply) {
return {
$type: 'app.bsky.feed.defs#notFoundPost',
uri: threadData.post.postUri,
Expand All @@ -156,7 +157,7 @@ const composeThread = (
}

let parent
if (threadData.parent && !badReply) {
if (threadData.parent && !badReply && !violatesBlock) {
if (threadData.parent instanceof ParentNotFoundError) {
parent = {
$type: 'app.bsky.feed.defs#notFoundPost',
Expand Down
9 changes: 6 additions & 3 deletions packages/bsky/src/services/feed/views.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,8 @@ export class FeedViews {
lists,
viewer,
)
// skip over not found & blocked posts
if (!post || blocks[post.uri]?.reply) {
// skip over not found post
if (!post) {
continue
}
const feedPost = { post }
Expand All @@ -159,6 +159,7 @@ export class FeedViews {
) {
const replyParent = this.formatMaybePostView(
item.replyParent,
item.uri,
actors,
posts,
threadgates,
Expand All @@ -171,6 +172,7 @@ export class FeedViews {
)
const replyRoot = this.formatMaybePostView(
item.replyRoot,
item.uri,
actors,
posts,
threadgates,
Expand Down Expand Up @@ -291,6 +293,7 @@ export class FeedViews {

formatMaybePostView(
uri: string,
replyUri: string | null,
actors: ActorInfoMap,
posts: PostInfoMap,
threadgates: ThreadgateInfoMap,
Expand Down Expand Up @@ -320,7 +323,7 @@ export class FeedViews {
if (
post.author.viewer?.blockedBy ||
post.author.viewer?.blocking ||
blocks[uri]?.reply
(replyUri !== null && blocks[replyUri]?.reply)
Comment on lines -323 to +326
Copy link
Collaborator

Choose a reason for hiding this comment

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

Just want to make sure I understand the intended behavior here: replies to block-violating replies are blocked, is that right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

so a feed view post includes post views for it's replyParent & replyRoot

this basically says, the reply violates a block, then don't hydrated in the replyParent/Root

another downside of not naming this field replyTo 😅

) {
if (!opts?.usePostViewUnion) return
return this.blockedPost(post)
Expand Down
15 changes: 14 additions & 1 deletion packages/bsky/tests/views/blocks.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,18 @@ describe('pds views with blocking', () => {
expect(forSnapshot(thread)).toMatchSnapshot()
})

it('loads blocked reply as anchor with no parent', async () => {
const { data: thread } = await agent.api.app.bsky.feed.getPostThread(
{ depth: 1, uri: carolReplyToDan.ref.uriStr },
{ headers: await network.serviceHeaders(alice) },
)
if (!isThreadViewPost(thread.thread)) {
throw new Error('Expected thread view post')
}
expect(thread.thread.post.uri).toEqual(carolReplyToDan.ref.uriStr)
expect(thread.thread.parent).toBeUndefined()
})

it('blocks thread parent', async () => {
// Parent is a post by dan
const { data: thread } = await agent.api.app.bsky.feed.getPostThread(
Expand Down Expand Up @@ -498,7 +510,8 @@ describe('pds views with blocking', () => {
const replyBlockedPost = timeline.feed.find(
(item) => item.post.uri === replyBlockedUri,
)
expect(replyBlockedPost).toBeUndefined()
assert(replyBlockedPost)
expect(replyBlockedPost.reply?.parent).toBeUndefined()
const embedBlockedPost = timeline.feed.find(
(item) => item.post.uri === embedBlockedUri,
)
Expand Down
Loading