diff --git a/app/assets/javascripts/components/reducers/timelines.jsx b/app/assets/javascripts/components/reducers/timelines.jsx index ba4ac921d2f72c28a59aba52ba36912955261da3..b6a14a649163a87e3bf76496328d7d6b79793bc1 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 3469722a44b22311037acd136cd289a86eac2658..cce792606bf1762442478ffd200f272130731dbc 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'))); };