From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 1 Feb 2017 23:45:57 +0000 (+0100)
Subject: Prevent potential issue with public/hashtag statuses arriving after
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=17ae7d132cba105a857958e5b98c95f68f364e28;p=mastodon.git

Prevent potential issue with public/hashtag statuses arriving after
they have been loaded and favourited/reblogged from another source

Since the status JSON returned from public/hashtag streams does not
contain favourited/reblogged attributes, merging them should not
override existing ones.
---

diff --git a/app/assets/javascripts/components/reducers/statuses.jsx b/app/assets/javascripts/components/reducers/statuses.jsx
index 084b6304c..6323e0fbe 100644
--- a/app/assets/javascripts/components/reducers/statuses.jsx
+++ b/app/assets/javascripts/components/reducers/statuses.jsx
@@ -46,7 +46,7 @@ const normalizeStatus = (state, status) => {
     status.reblog = status.reblog.id;
   }
 
-  return state.set(status.id, Immutable.fromJS(status));
+  return state.update(status.id, Immutable.Map(), map => map.mergeDeep(Immutable.fromJS(status)));
 };
 
 const normalizeStatuses = (state, statuses) => {