gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Fix #147 - Unreblogging will leave original status in feeds

gh/stable
Eugen Rochko 2017-01-07 15:44:22 +01:00
parent 7ddec6e7c3
commit 5c7add2176
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/components/actions/timelines.jsx
View File

@ -39,12 +39,14 @@ export function deleteFromTimelines(id) {
return (dispatch, getState) => { return (dispatch, getState) => {
const accountId = getState().getIn(['statuses', id, 'account']); const accountId = getState().getIn(['statuses', id, 'account']);
const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => [status.get('id'), status.get('account')]); const references = getState().get('statuses').filter(status => status.get('reblog') === id).map(status => [status.get('id'), status.get('account')]);
const reblogOf = getState().getIn(['statuses', id, 'reblog'], null);
dispatch({ dispatch({
type: TIMELINE_DELETE, type: TIMELINE_DELETE,
id, id,
accountId, accountId,
references references,
reblogOf
}); });
}; };
}; };

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

@ -145,7 +145,12 @@ const updateTimeline = (state, timeline, status, references) => {
return state; return state;
}; };
const deleteStatus = (state, id, accountId, references) => { const deleteStatus = (state, id, accountId, references, reblogOf) => {
if (reblogOf) {
// If we are deleting a reblog, just replace reblog with its original
return state.updateIn(['home', 'items'], list => list.map(item => item === id ? reblogOf : item));
}
// Remove references from timelines // Remove references from timelines
['home', 'mentions', 'public', 'tag'].forEach(function (timeline) { ['home', 'mentions', 'public', 'tag'].forEach(function (timeline) {
state = state.updateIn([timeline, 'items'], list => list.filterNot(item => item === id)); state = state.updateIn([timeline, 'items'], list => list.filterNot(item => item === id));
@ -220,7 +225,7 @@ export default function timelines(state = initialState, action) {
case TIMELINE_UPDATE: case TIMELINE_UPDATE:
return updateTimeline(state, action.timeline, Immutable.fromJS(action.status), action.references); return updateTimeline(state, action.timeline, Immutable.fromJS(action.status), action.references);
case TIMELINE_DELETE: case TIMELINE_DELETE:
return deleteStatus(state, action.id, action.accountId, action.references); return deleteStatus(state, action.id, action.accountId, action.references, action.reblogOf);
case CONTEXT_FETCH_SUCCESS: case CONTEXT_FETCH_SUCCESS:
return normalizeContext(state, action.id, Immutable.fromJS(action.ancestors), Immutable.fromJS(action.descendants)); return normalizeContext(state, action.id, Immutable.fromJS(action.ancestors), Immutable.fromJS(action.descendants));
case ACCOUNT_TIMELINE_FETCH_SUCCESS: case ACCOUNT_TIMELINE_FETCH_SUCCESS:

7
app/services/remove_status_service.rb
View File

@ -53,7 +53,12 @@ class RemoveStatusService < BaseService
end end
def unpush(type, receiver, status) def unpush(type, receiver, status)
redis.zremrangebyscore(FeedManager.instance.key(type, receiver.id), status.id, status.id) if status.reblog?
redis.zadd(FeedManager.instance.key(type, receiver.id), status.reblog_of_id, status.reblog_of_id)
else
redis.zremrangebyscore(FeedManager.instance.key(type, receiver.id), status.id, status.id)
end
FeedManager.instance.broadcast(receiver.id, type: 'delete', id: status.id) FeedManager.instance.broadcast(receiver.id, type: 'delete', id: status.id)
end end