parent
a9a43de6d1
commit
b7cf11d5a9
|
@ -8,7 +8,7 @@ export const REPORT_SUBMIT_FAIL = 'REPORT_SUBMIT_FAIL';
|
||||||
export const initReport = (account, status) => dispatch =>
|
export const initReport = (account, status) => dispatch =>
|
||||||
dispatch(openModal('REPORT', {
|
dispatch(openModal('REPORT', {
|
||||||
accountId: account.get('id'),
|
accountId: account.get('id'),
|
||||||
statusId: status.get('id'),
|
statusId: status?.get('id'),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
export const submitReport = (params, onSuccess, onFail) => (dispatch, getState) => {
|
export const submitReport = (params, onSuccess, onFail) => (dispatch, getState) => {
|
||||||
|
|
|
@ -17,7 +17,6 @@ import status_lists from './status_lists';
|
||||||
import mutes from './mutes';
|
import mutes from './mutes';
|
||||||
import blocks from './blocks';
|
import blocks from './blocks';
|
||||||
import boosts from './boosts';
|
import boosts from './boosts';
|
||||||
// import reports from './reports';
|
|
||||||
import rules from './rules';
|
import rules from './rules';
|
||||||
import contexts from './contexts';
|
import contexts from './contexts';
|
||||||
import compose from './compose';
|
import compose from './compose';
|
||||||
|
@ -62,7 +61,6 @@ const reducers = {
|
||||||
mutes,
|
mutes,
|
||||||
blocks,
|
blocks,
|
||||||
boosts,
|
boosts,
|
||||||
// reports,
|
|
||||||
rules,
|
rules,
|
||||||
contexts,
|
contexts,
|
||||||
compose,
|
compose,
|
||||||
|
|
|
@ -1,64 +0,0 @@
|
||||||
import {
|
|
||||||
REPORT_INIT,
|
|
||||||
REPORT_SUBMIT_REQUEST,
|
|
||||||
REPORT_SUBMIT_SUCCESS,
|
|
||||||
REPORT_SUBMIT_FAIL,
|
|
||||||
REPORT_CANCEL,
|
|
||||||
REPORT_STATUS_TOGGLE,
|
|
||||||
REPORT_COMMENT_CHANGE,
|
|
||||||
REPORT_FORWARD_CHANGE,
|
|
||||||
} from '../actions/reports';
|
|
||||||
import { Map as ImmutableMap, Set as ImmutableSet } from 'immutable';
|
|
||||||
|
|
||||||
const initialState = ImmutableMap({
|
|
||||||
new: ImmutableMap({
|
|
||||||
isSubmitting: false,
|
|
||||||
account_id: null,
|
|
||||||
status_ids: ImmutableSet(),
|
|
||||||
comment: '',
|
|
||||||
forward: false,
|
|
||||||
}),
|
|
||||||
});
|
|
||||||
|
|
||||||
export default function reports(state = initialState, action) {
|
|
||||||
switch(action.type) {
|
|
||||||
case REPORT_INIT:
|
|
||||||
return state.withMutations(map => {
|
|
||||||
map.setIn(['new', 'isSubmitting'], false);
|
|
||||||
map.setIn(['new', 'account_id'], action.account.get('id'));
|
|
||||||
|
|
||||||
if (state.getIn(['new', 'account_id']) !== action.account.get('id')) {
|
|
||||||
map.setIn(['new', 'status_ids'], action.status ? ImmutableSet([action.status.getIn(['reblog', 'id'], action.status.get('id'))]) : ImmutableSet());
|
|
||||||
map.setIn(['new', 'comment'], '');
|
|
||||||
} else if (action.status) {
|
|
||||||
map.updateIn(['new', 'status_ids'], ImmutableSet(), set => set.add(action.status.getIn(['reblog', 'id'], action.status.get('id'))));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
case REPORT_STATUS_TOGGLE:
|
|
||||||
return state.updateIn(['new', 'status_ids'], ImmutableSet(), set => {
|
|
||||||
if (action.checked) {
|
|
||||||
return set.add(action.statusId);
|
|
||||||
}
|
|
||||||
|
|
||||||
return set.remove(action.statusId);
|
|
||||||
});
|
|
||||||
case REPORT_COMMENT_CHANGE:
|
|
||||||
return state.setIn(['new', 'comment'], action.comment);
|
|
||||||
case REPORT_FORWARD_CHANGE:
|
|
||||||
return state.setIn(['new', 'forward'], action.forward);
|
|
||||||
case REPORT_SUBMIT_REQUEST:
|
|
||||||
return state.setIn(['new', 'isSubmitting'], true);
|
|
||||||
case REPORT_SUBMIT_FAIL:
|
|
||||||
return state.setIn(['new', 'isSubmitting'], false);
|
|
||||||
case REPORT_CANCEL:
|
|
||||||
case REPORT_SUBMIT_SUCCESS:
|
|
||||||
return state.withMutations(map => {
|
|
||||||
map.setIn(['new', 'account_id'], null);
|
|
||||||
map.setIn(['new', 'status_ids'], ImmutableSet());
|
|
||||||
map.setIn(['new', 'comment'], '');
|
|
||||||
map.setIn(['new', 'isSubmitting'], false);
|
|
||||||
});
|
|
||||||
default:
|
|
||||||
return state;
|
|
||||||
}
|
|
||||||
};
|
|
Reference in New Issue