tykayn/mastodon
1
0
Fork 0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
Code Issues Projects Releases Wiki Activity

Add ancestors/descendants during normalization in timeline reducer

Browse Source 
This way replies will appear in the detailed view live if they are from
statuses that would be delivered to the user normally
This commit is contained in:
Eugen Rochko 2016-09-18 12:51:09 +02:00
parent dfd5deacf4
commit ab7291b8fe
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/assets/javascripts/components/reducers/timelines.jsx
View File

@ -28,7 +28,23 @@ function statusToMaps(state, status) {
state = statusToMaps(state, reblog); state = statusToMaps(state, reblog);
} }
// Replies
if (status.get('in_reply_to_id')) {
state = state.updateIn(['descendants', status.get('in_reply_to_id')], set => {
if (!Immutable.OrderedSet.isOrderedSet(set)) {
return Immutable.OrderedSet([status.get('id')]);
} else {
return set.add(status.get('id'));
}
});
}
return state.withMutations(map => { return state.withMutations(map => {
if (status.get('in_reply_to_id')) {
map.updateIn(['descendants', status.get('in_reply_to_id')], Immutable.OrderedSet(), set => set.add(status.get('id')));
map.updateIn(['ancestors', status.get('id')], Immutable.OrderedSet(), set => set.add(status.get('in_reply_to_id')));
}
map.setIn(['accounts', account.get('id')], account); map.setIn(['accounts', account.get('id')], account);
map.setIn(['statuses', status.get('id')], status); map.setIn(['statuses', status.get('id')], status);
}); });
@ -68,12 +84,12 @@ function contextToMaps(state, status, ancestors, descendants) {
let ancestorsIds = ancestors.map(ancestor => { let ancestorsIds = ancestors.map(ancestor => {
state = statusToMaps(state, ancestor); state = statusToMaps(state, ancestor);
return ancestor.get('id'); return ancestor.get('id');
}); }).toOrderedSet();
let descendantsIds = descendants.map(descendant => { let descendantsIds = descendants.map(descendant => {
state = statusToMaps(state, descendant); state = statusToMaps(state, descendant);
return descendant.get('id'); return descendant.get('id');
}); }).toOrderedSet();
return state.withMutations(map => { return state.withMutations(map => {
map.setIn(['ancestors', status.get('id')], ancestorsIds); map.setIn(['ancestors', status.get('id')], ancestorsIds);