Fix crash on public hashtag pages when streaming fails (mastodon#10061)

ClearlyClaire · hiyuki2578 · commit 3bd9bc4b7acf · 2019-10-02T10:03:58.000+09:00
diff --git a/app/javascript/mastodon/features/status/components/detailed_status.js b/app/javascript/mastodon/features/status/components/detailed_status.js
@@ -87,7 +87,7 @@ export default class DetailedStatus extends ImmutablePureComponent {
   }
 
   render () {
-    const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;
+    const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;
     const outerStyle = { boxSizing: 'border-box' };
     const { compact } = this.props;
 

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ export default class DetailedStatus extends ImmutablePureComponent {`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`render () {`
`90`		`- const status = this.props.status.get('reblog') ? this.props.status.get('reblog') : this.props.status;`
	`90`	`+ const status = (this.props.status && this.props.status.get('reblog')) ? this.props.status.get('reblog') : this.props.status;`
`91`	`91`	`const outerStyle = { boxSizing: 'border-box' };`
`92`	`92`	`const { compact } = this.props;`
`93`	`93`