Fix #635 - Include the initially-reported status in report UI even if it's not among the user's most recent statuses
		
			
				
	
	
		
			57 lines
		
	
	
	
		
			1.8 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			57 lines
		
	
	
	
		
			1.8 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
| import {
 | |
|   REPORT_INIT,
 | |
|   REPORT_SUBMIT_REQUEST,
 | |
|   REPORT_SUBMIT_SUCCESS,
 | |
|   REPORT_SUBMIT_FAIL,
 | |
|   REPORT_CANCEL,
 | |
|   REPORT_STATUS_TOGGLE
 | |
| } from '../actions/reports';
 | |
| import Immutable from 'immutable';
 | |
| 
 | |
| const initialState = Immutable.Map({
 | |
|   new: Immutable.Map({
 | |
|     isSubmitting: false,
 | |
|     account_id: null,
 | |
|     status_ids: Immutable.Set(),
 | |
|     comment: ''
 | |
|   })
 | |
| });
 | |
| 
 | |
| 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 ? Immutable.Set([action.status.getIn(['reblog', 'id'], action.status.get('id'))]) : Immutable.Set());
 | |
|         map.setIn(['new', 'comment'], '');
 | |
|       } else {
 | |
|         map.updateIn(['new', 'status_ids'], Immutable.Set(), set => set.add(action.status.getIn(['reblog', 'id'], action.status.get('id'))));
 | |
|       }
 | |
|     });
 | |
|   case REPORT_STATUS_TOGGLE:
 | |
|     return state.updateIn(['new', 'status_ids'], Immutable.Set(), set => {
 | |
|       if (action.checked) {
 | |
|         return set.add(action.statusId);
 | |
|       }
 | |
| 
 | |
|       return set.remove(action.statusId);
 | |
|     });
 | |
|   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'], Immutable.Set());
 | |
|       map.setIn(['new', 'comment'], '');
 | |
|       map.setIn(['new', 'isSubmitting'], false);
 | |
|     });
 | |
|   default:
 | |
|     return state;
 | |
|   }
 | |
| };
 |