about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/components/reducers/timelines.jsx2
-rw-r--r--app/assets/javascripts/components/selectors/index.jsx2
2 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx
index ba4ac921d..b6a14a649 100644
--- a/app/assets/javascripts/components/reducers/timelines.jsx
+++ b/app/assets/javascripts/components/reducers/timelines.jsx
@@ -48,7 +48,7 @@ function normalizeStatus(state, status) {
   status = status.set('account', account.get('id'));
 
   // Separate reblog, repeat for reblog
-  let reblog = status.get('reblog');
+  let reblog = status.get('reblog', null);
 
   if (reblog !== null) {
     status = status.set('reblog', reblog.get('id'));
diff --git a/app/assets/javascripts/components/selectors/index.jsx b/app/assets/javascripts/components/selectors/index.jsx
index 3469722a4..cce792606 100644
--- a/app/assets/javascripts/components/selectors/index.jsx
+++ b/app/assets/javascripts/components/selectors/index.jsx
@@ -45,6 +45,8 @@ const assembleStatus = (id, statuses, accounts) => {
     }
   }
 
+  console.log(reblog);
+
   return status.set('reblog', reblog).set('account', accounts.get(status.get('account')));
 };