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.

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

Fix undefined block #4378

Conversation

oracularhades
Copy link
Contributor

This fixes #4322

Screen.Recordingundefined-block-fix.mp4

Copy link
Member

@estrattonbailey estrattonbailey left a comment

Choose a reason for hiding this comment

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

Thanks for this! Needs a small tweak, otherwise should be good pending other team feedback.

@@ -196,6 +196,12 @@ let FeedItemInner = ({
},
]

let blockedParentAuthor: AppBskyActorDefs.ProfileViewBasic = {
did: '',
displayName: '[user blocked you]',
Copy link
Member

Choose a reason for hiding this comment

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

If I block this user instead of them blocking me, this text might be confusing. Should probably do something more generic like [blocked user] and then checking for all forms of blocks on the viewer state when displaying it:

  blockedBy?: boolean
  blocking?: string
  blockingByList?: AppBskyGraphDefs.ListViewBasic

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm home in 30m and will adjust this then :)

@oracularhades
Copy link
Contributor Author

@estrattonbailey Thanks for letting me know! I didn't know blockedby was both me blocking them, and them blocking me. I thought me blocking them was handled by blocking. Fixed now!

Screenshot 2024-06-06 at 12 47 22 PM

@estrattonbailey estrattonbailey changed the base branch from main to fix-undefined-block June 11, 2024 01:20
Copy link
Member

@estrattonbailey estrattonbailey left a comment

Choose a reason for hiding this comment

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

Looking good! Sorry for the delay. Gonna merge this into a branch and tweak it based on team thoughts and then we'll get it in. Thanks again!

@estrattonbailey estrattonbailey merged commit 39e91fe into bluesky-social:fix-undefined-block Jun 11, 2024
estrattonbailey added a commit that referenced this pull request Jun 11, 2024
* Fix undefined block (#4378)

* Fix undefined block

* Changing text and handling all blocks.

* Tweaks

* Hide follow button in hover card if user blocked

---------

Co-authored-by: Josh <hi@oracularhades.com>
gaearon added a commit that referenced this pull request Jun 18, 2024
* Fix undefined block (#4378)

* Fix undefined block

* Changing text and handling all blocks.

* Tweaks

* Update copy, make non-interactive

* Remove console

* Clarify logic

* Pass through parent blocked state for 3p blocks

* Better translation

---------

Co-authored-by: Josh <hi@oracularhades.com>
Co-authored-by: Dan Abramov <dan.abramov@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Reply to undefined when parent is blocked
2 participants