nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Will this fix the issue?

This commit is contained in:
Eugen Rochko 2016-10-18 01:11:00 +02:00
parent 6611e3a2ef
commit fdd30af595
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/components/components/status.jsx
View File

@ -45,8 +45,6 @@ const Status = React.createClass({
var { status, ...other } = this.props; var { status, ...other } = this.props;
console.log(status, this.props);
if (status.get('reblog') !== null) { if (status.get('reblog') !== null) {
let displayName = status.getIn(['account', 'display_name']); let displayName = status.getIn(['account', 'display_name']);

11
app/assets/javascripts/components/selectors/index.jsx
View File

@ -29,15 +29,20 @@ const getAccountTimelineIds = (state, id) => state.getIn(['timelines', 'accounts
const assembleStatus = (id, statuses, accounts) => { const assembleStatus = (id, statuses, accounts) => {
let status = statuses.get(id, null); let status = statuses.get(id, null);
let reblog = null;
if (status === null) { if (status === null) {
return null; return null;
} }
let reblog = statuses.get(status.get('reblog'), null); if (status.get('reblog', null) !== null) {
reblog = statuses.get(status.get('reblog'), null);
if (reblog !== null) { if (reblog !== null) {
reblog = reblog.set('account', accounts.get(reblog.get('account'))); reblog = reblog.set('account', accounts.get(reblog.get('account')));
} else {
return null;
}
} }
return status.set('reblog', reblog).set('account', accounts.get(status.get('account'))); return status.set('reblog', reblog).set('account', accounts.get(status.get('account')));