tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix poll options not rendering text after vote/refresh

Browse Source 
Port fd128b9c7aa5c71adbfc2e223212514c0baee675 to glitch-soc
This commit is contained in:
Eugen Rochko 2019-03-06 05:35:52 +01:00 committed by Thibaut Girka
parent 94f1a751bf
commit 94a0149ff3
4 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/javascript/flavours/glitch/actions/importer/index.js
View File

@ -82,3 +82,9 @@ export function importFetchedStatuses(statuses) {
dispatch(importStatuses(normalStatuses)); dispatch(importStatuses(normalStatuses));
}; };
} }
export function importFetchedPoll(poll) {
return dispatch => {
dispatch(importPolls([normalizePoll(poll)]));
};
}

11
app/javascript/flavours/glitch/actions/polls.js
View File

@ -1,4 +1,5 @@
import api from '../api'; import api from '../api';
import { importFetchedPoll } from './importer';
export const POLL_VOTE_REQUEST = 'POLL_VOTE_REQUEST'; export const POLL_VOTE_REQUEST = 'POLL_VOTE_REQUEST';
export const POLL_VOTE_SUCCESS = 'POLL_VOTE_SUCCESS'; export const POLL_VOTE_SUCCESS = 'POLL_VOTE_SUCCESS';
@ -12,7 +13,10 @@ export const vote = (pollId, choices) => (dispatch, getState) => {
dispatch(voteRequest()); dispatch(voteRequest());
api(getState).post(`/api/v1/polls/${pollId}/votes`, { choices }) api(getState).post(`/api/v1/polls/${pollId}/votes`, { choices })
.then(({ data }) => dispatch(voteSuccess(data))) .then(({ data }) => {
dispatch(importFetchedPoll(data));
dispatch(voteSuccess(data));
})
.catch(err => dispatch(voteFail(err))); .catch(err => dispatch(voteFail(err)));
}; };
@ -20,7 +24,10 @@ export const fetchPoll = pollId => (dispatch, getState) => {
dispatch(fetchPollRequest()); dispatch(fetchPollRequest());
api(getState).get(`/api/v1/polls/${pollId}`) api(getState).get(`/api/v1/polls/${pollId}`)
.then(({ data }) => dispatch(fetchPollSuccess(data))) .then(({ data }) => {
dispatch(importFetchedPoll(data));
dispatch(fetchPollSuccess(data));
})
.catch(err => dispatch(fetchPollFail(err))); .catch(err => dispatch(fetchPollFail(err)));
}; };

4
app/javascript/flavours/glitch/components/poll.js
View File

@ -7,6 +7,8 @@ import classNames from 'classnames';
import { vote, fetchPoll } from 'mastodon/actions/polls'; import { vote, fetchPoll } from 'mastodon/actions/polls';
import Motion from 'mastodon/features/ui/util/optional_motion'; import Motion from 'mastodon/features/ui/util/optional_motion';
import spring from 'react-motion/lib/spring'; import spring from 'react-motion/lib/spring';
import escapeTextContentForBrowser from 'escape-html';
import emojify from 'mastodon/features/emoji/emoji';
const messages = defineMessages({ const messages = defineMessages({
moments: { id: 'time_remaining.moments', defaultMessage: 'Moments remaining' }, moments: { id: 'time_remaining.moments', defaultMessage: 'Moments remaining' },
@ -120,7 +122,7 @@ class Poll extends ImmutablePureComponent {
{!showResults && <span className={classNames('poll__input', { checkbox: poll.get('multiple'), active })} />} {!showResults && <span className={classNames('poll__input', { checkbox: poll.get('multiple'), active })} />}
{showResults && <span className='poll__number'>{Math.round(percent)}%</span>} {showResults && <span className='poll__number'>{Math.round(percent)}%</span>}
<span dangerouslySetInnerHTML={{ __html: option.get('title_emojified') }} /> <span dangerouslySetInnerHTML={{ __html: option.get('title_emojified', emojify(escapeTextContentForBrowser(option.get('title')))) }} />
</label> </label>
</li> </li>
); );

4
app/javascript/flavours/glitch/reducers/polls.js
View File

@ -1,4 +1,3 @@
import { POLL_VOTE_SUCCESS, POLL_FETCH_SUCCESS } from 'mastodon/actions/polls';
import { POLLS_IMPORT } from 'mastodon/actions/importer'; import { POLLS_IMPORT } from 'mastodon/actions/importer';
import { Map as ImmutableMap, fromJS } from 'immutable'; import { Map as ImmutableMap, fromJS } from 'immutable';
@ -10,9 +9,6 @@ export default function polls(state = initialState, action) {
switch(action.type) { switch(action.type) {
case POLLS_IMPORT: case POLLS_IMPORT:
return importPolls(state, action.polls); return importPolls(state, action.polls);
case POLL_VOTE_SUCCESS:
case POLL_FETCH_SUCCESS:
return importPolls(state, [action.poll]);
default: default:
return state; return state;
} }