]> cat aescling's git repositories - mastodon.git/commitdiff
This should fix it
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 17 Oct 2016 23:44:26 +0000 (01:44 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 17 Oct 2016 23:44:31 +0000 (01:44 +0200)
app/assets/javascripts/components/components/status.jsx
app/assets/javascripts/components/selectors/index.jsx

index 6e4c9651d8d78ca5970cf877ae1fa890a1f760bf..8855c6c12fd3fb82d478a520d2be5aaa6e529efb 100644 (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) {
index 6980b9ec3cadcb974e4fc827c10dd9806aaf45b4..91f900f9048df1885c64cba7fdc82f62aef33c37 100644 (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')));
 };