tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'v2.0.0' into gs-master

Browse Source
This commit is contained in:
David Yip
2017-10-18 11:52:04 -05:00
parent 4421f6598f 09d81defcd
commit 42e8c8eb0e
96 changed files with 1592 additions and 229 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/javascript/mastodon/reducers/timelines.js
View File

@@ -75,15 +75,9 @@ const updateTimeline = (state, timeline, status, references) => {
}));
};
const deleteStatus = (state, id, accountId, references, reblogOf) => {
const deleteStatus = (state, id, accountId, references) => {
state.keySeq().forEach(timeline => {
state = state.updateIn([timeline, 'items'], list => {
if (reblogOf && !list.includes(reblogOf)) {
return list.map(item => item === id ? reblogOf : item);
} else {
return list.filterNot(item => item === id);
}
});
state = state.updateIn([timeline, 'items'], list => list.filterNot(item => item === id));
});
// Remove reblogs of deleted status