gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Unreblogging and unfavouriting from the UI

Browse source
This commit is contained in:
Eugen Rochko 2016-10-02 15:14:26 +02:00
parent 4909bbf415
commit 1fce687f8e
6 changed files with 119 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/components/reducers/notifications.jsx
View file

@ -1,6 +1,11 @@
import { COMPOSE_SUBMIT_FAIL, COMPOSE_UPLOAD_FAIL } from '../actions/compose';
import { FOLLOW_SUBMIT_FAIL } from '../actions/follow';
import { REBLOG_FAIL, FAVOURITE_FAIL } from '../actions/interactions';
import {
REBLOG_FAIL,
UNREBLOG_FAIL,
FAVOURITE_FAIL,
UNFAVOURITE_FAIL
} from '../actions/interactions';
import {
TIMELINE_REFRESH_FAIL,
TIMELINE_EXPAND_FAIL
@ -55,6 +60,8 @@ export default function notifications(state = initialState, action) {
case ACCOUNT_TIMELINE_EXPAND_FAIL:
case STATUS_FETCH_FAIL:
case STATUS_DELETE_FAIL:
case UNREBLOG_FAIL:
case UNFAVOURITE_FAIL:
return notificationFromError(state, action.error);
case NOTIFICATION_DISMISS:
return state.filterNot(item => item.get('key') === action.notification.key);

6
app/assets/javascripts/components/reducers/timelines.jsx
View file

@ -6,7 +6,9 @@ import {
} from '../actions/timelines';
import {
REBLOG_SUCCESS,
FAVOURITE_SUCCESS
UNREBLOG_SUCCESS,
FAVOURITE_SUCCESS,
UNFAVOURITE_SUCCESS
} from '../actions/interactions';
import {
ACCOUNT_SET_SELF,
@ -219,6 +221,8 @@ export default function timelines(state = initialState, action) {
return deleteStatus(state, action.id);
case REBLOG_SUCCESS:
case FAVOURITE_SUCCESS:
case UNREBLOG_SUCCESS:
case UNFAVOURITE_SUCCESS:
return normalizeStatus(state, Immutable.fromJS(action.response));
case ACCOUNT_SET_SELF:
return setSelf(state, Immutable.fromJS(action.account));