luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-22 05:08:03 +00:00
Code Issues Projects Releases Wiki Activity

Prevent potential issue with public/hashtag statuses arriving after

Browse source 
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.
This commit is contained in:
Eugen Rochko 2017-02-02 00:45:57 +01:00
parent ede04cdb24
commit 17ae7d132c
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/components/reducers/statuses.jsx
View file

@ -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) => {