* Fix poll options not rendering text after vote/refresh * Fix poll options not showing up on public pages * Fix code style issue
		
			
				
	
	
		
			90 lines
		
	
	
	
		
			2.2 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
			
		
		
	
	
			90 lines
		
	
	
	
		
			2.2 KiB
		
	
	
	
		
			JavaScript
		
	
	
	
	
	
| import { normalizeAccount, normalizeStatus, normalizePoll } from './normalizer';
 | |
| 
 | |
| export const ACCOUNT_IMPORT  = 'ACCOUNT_IMPORT';
 | |
| export const ACCOUNTS_IMPORT = 'ACCOUNTS_IMPORT';
 | |
| export const STATUS_IMPORT   = 'STATUS_IMPORT';
 | |
| export const STATUSES_IMPORT = 'STATUSES_IMPORT';
 | |
| export const POLLS_IMPORT    = 'POLLS_IMPORT';
 | |
| 
 | |
| function pushUnique(array, object) {
 | |
|   if (array.every(element => element.id !== object.id)) {
 | |
|     array.push(object);
 | |
|   }
 | |
| }
 | |
| 
 | |
| export function importAccount(account) {
 | |
|   return { type: ACCOUNT_IMPORT, account };
 | |
| }
 | |
| 
 | |
| export function importAccounts(accounts) {
 | |
|   return { type: ACCOUNTS_IMPORT, accounts };
 | |
| }
 | |
| 
 | |
| export function importStatus(status) {
 | |
|   return { type: STATUS_IMPORT, status };
 | |
| }
 | |
| 
 | |
| export function importStatuses(statuses) {
 | |
|   return { type: STATUSES_IMPORT, statuses };
 | |
| }
 | |
| 
 | |
| export function importPolls(polls) {
 | |
|   return { type: POLLS_IMPORT, polls };
 | |
| }
 | |
| 
 | |
| export function importFetchedAccount(account) {
 | |
|   return importFetchedAccounts([account]);
 | |
| }
 | |
| 
 | |
| export function importFetchedAccounts(accounts) {
 | |
|   const normalAccounts = [];
 | |
| 
 | |
|   function processAccount(account) {
 | |
|     pushUnique(normalAccounts, normalizeAccount(account));
 | |
| 
 | |
|     if (account.moved) {
 | |
|       processAccount(account.moved);
 | |
|     }
 | |
|   }
 | |
| 
 | |
|   accounts.forEach(processAccount);
 | |
| 
 | |
|   return importAccounts(normalAccounts);
 | |
| }
 | |
| 
 | |
| export function importFetchedStatus(status) {
 | |
|   return importFetchedStatuses([status]);
 | |
| }
 | |
| 
 | |
| export function importFetchedStatuses(statuses) {
 | |
|   return (dispatch, getState) => {
 | |
|     const accounts = [];
 | |
|     const normalStatuses = [];
 | |
|     const polls = [];
 | |
| 
 | |
|     function processStatus(status) {
 | |
|       pushUnique(normalStatuses, normalizeStatus(status, getState().getIn(['statuses', status.id])));
 | |
|       pushUnique(accounts, status.account);
 | |
| 
 | |
|       if (status.reblog && status.reblog.id) {
 | |
|         processStatus(status.reblog);
 | |
|       }
 | |
| 
 | |
|       if (status.poll && status.poll.id) {
 | |
|         pushUnique(polls, normalizePoll(status.poll));
 | |
|       }
 | |
|     }
 | |
| 
 | |
|     statuses.forEach(processStatus);
 | |
| 
 | |
|     dispatch(importPolls(polls));
 | |
|     dispatch(importFetchedAccounts(accounts));
 | |
|     dispatch(importStatuses(normalStatuses));
 | |
|   };
 | |
| }
 | |
| 
 | |
| export function importFetchedPoll(poll) {
 | |
|   return dispatch => {
 | |
|     dispatch(importPolls([normalizePoll(poll)]));
 | |
|   };
 | |
| }
 |