logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: b62c31306e5e9670b8b285ea5885a15f59ec089b
parent: f8b9b0810d1f1abbea53bc5930a0a0fe6dc8e538
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue, 18 Oct 2016 01:44:26 +0200

This should fix it

Diffstat:

Mapp/assets/javascripts/components/components/status.jsx4+---
Mapp/assets/javascripts/components/selectors/index.jsx2--
2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/assets/javascripts/components/components/status.jsx b/app/assets/javascripts/components/components/status.jsx @@ -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) { diff --git a/app/assets/javascripts/components/selectors/index.jsx b/app/assets/javascripts/components/selectors/index.jsx @@ -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'))); };