ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This should fix it

rebase/4.0.0rc2
Eugen Rochko 2016-10-18 01:44:26 +02:00
parent f8b9b0810d
commit b62c31306e
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,9 +44,7 @@ const Status = React.createClass({
let media = '';
let { status, ...other } = this.props;
if (status.get('reblog', null) !== null) {
console.log(status.get('id'), status.get('reblog'));
if (status.get('reblog', null) !== null && typeof status.get('reblog') === 'object') {
let displayName = status.getIn(['account', 'display_name']);
if (displayName.length === 0) {

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

@ -45,8 +45,6 @@ const assembleStatus = (id, statuses, accounts) => {
}
}
console.log('assembly for status', id, Immutable.Map.isMap(reblog) ? reblog.toJS() : reblog);
return status.set('reblog', reblog).set('account', accounts.get(status.get('account')));
};