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 null error in status component when determining showMedia state #10838

Merged
merged 3 commits into from
May 26, 2019

Conversation

Gargron
Copy link
Member

@Gargron Gargron commented May 26, 2019

Also update the showMedia value if the status passed to the component changes. Regression from #10647

Edit: Found another bug, the code for showMedia in the status component doesn't use the reblogged status properly, so reblogs of things with sensitive media get their media displayed. But it's 5:30am now, I can't fix it right now

@Gargron Gargron added the bug Something isn't working label May 26, 2019
Also update the showMedia value if the status passed to the
component changes
@Gargron Gargron added the work in progress Not to be merged, currently being worked on label May 26, 2019
@ClearlyClaire
Copy link
Contributor

ClearlyClaire commented May 26, 2019

The changes so far look fine to me, but I'm puzzled about the sensitive thing with reblogs. I mean, I'm looking at the previous code and it passed this.props.status.get('sensitive') as the sensitive prop to MediaGallery, so it should have been broken already 🤔

EDIT: Ah nevermind, I missed a status = status.get('reblog');

@ClearlyClaire
Copy link
Contributor

I pushed two commits that should fix the issue and clean up the code a bit.

@ClearlyClaire ClearlyClaire removed the work in progress Not to be merged, currently being worked on label May 26, 2019
@Gargron Gargron merged commit 988342a into master May 26, 2019
@Gargron Gargron deleted the fix-null-error branch May 26, 2019 11:48
hiyuki2578 pushed a commit to ProjectMyosotis/mastodon that referenced this pull request Oct 2, 2019
…astodon#10838)

* Fix null error in status component when determining showMedia state

Also update the showMedia value if the status passed to the
component changes

* Refactor media visibility computation into a defaultMediaVisibility function

* Fix default media visibility with reblogs
rtucker pushed a commit to vulpineclub/mastodon that referenced this pull request Jan 7, 2021
…astodon#10838)

* Fix null error in status component when determining showMedia state

Also update the showMedia value if the status passed to the
component changes

* Refactor media visibility computation into a defaultMediaVisibility function

* Fix default media visibility with reblogs
messenjahofchrist pushed a commit to Origin-Creative/mastodon that referenced this pull request Jul 30, 2021
…astodon#10838)

* Fix null error in status component when determining showMedia state

Also update the showMedia value if the status passed to the
component changes

* Refactor media visibility computation into a defaultMediaVisibility function

* Fix default media visibility with reblogs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants