gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-09-05 17:31:12 +00:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity

Fix Edit as well as “Delete & Redraft” on a poll not inserting empty option (#35892)

Browse Source
This commit is contained in:
Claire 2025-08-25 14:25:35 +02:00 committed by GitHub
parent 2560242972
commit d8c07be021
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/javascript/mastodon/actions/compose.js
View File

@ -97,12 +97,17 @@ export const ensureComposeIsVisible = (getState) => {
}; };
export function setComposeToStatus(status, text, spoiler_text) { export function setComposeToStatus(status, text, spoiler_text) {
return{ return (dispatch, getState) => {
type: COMPOSE_SET_STATUS, const maxOptions = getState().server.getIn(['server', 'configuration', 'polls', 'max_options']);
status,
text, dispatch({
spoiler_text, type: COMPOSE_SET_STATUS,
}; status,
text,
spoiler_text,
maxOptions,
});
}
} }
export function changeCompose(text) { export function changeCompose(text) {

13
app/javascript/mastodon/actions/statuses.js
View File

@ -89,10 +89,15 @@ export function fetchStatusFail(id, error, skipLoading) {
} }
export function redraft(status, raw_text) { export function redraft(status, raw_text) {
return { return (dispatch, getState) => {
type: REDRAFT, const maxOptions = getState().server.getIn(['server', 'configuration', 'polls', 'max_options']);
status,
raw_text, dispatch({
type: REDRAFT,
status,
raw_text,
maxOptions,
});
}; };
} }

14
app/javascript/mastodon/reducers/compose.js
View File

@ -526,8 +526,13 @@ export const composeReducer = (state = initialState, action) => {
} }
if (action.status.get('poll')) { if (action.status.get('poll')) {
let options = ImmutableList(action.status.get('poll').options.map(x => x.title));
if (options.size < action.maxOptions) {
options = options.push('');
}
map.set('poll', ImmutableMap({ map.set('poll', ImmutableMap({
options: ImmutableList(action.status.get('poll').options.map(x => x.title)), options: options,
multiple: action.status.get('poll').multiple, multiple: action.status.get('poll').multiple,
expires_in: expiresInFromExpiresAt(action.status.get('poll').expires_at), expires_in: expiresInFromExpiresAt(action.status.get('poll').expires_at),
})); }));
@ -558,8 +563,13 @@ export const composeReducer = (state = initialState, action) => {
} }
if (action.status.get('poll')) { if (action.status.get('poll')) {
let options = ImmutableList(action.status.get('poll').options.map(x => x.title));
if (options.size < action.maxOptions) {
options = options.push('');
}
map.set('poll', ImmutableMap({ map.set('poll', ImmutableMap({
options: ImmutableList(action.status.get('poll').options.map(x => x.title)), options: options,
multiple: action.status.get('poll').multiple, multiple: action.status.get('poll').multiple,
expires_in: expiresInFromExpiresAt(action.status.get('poll').expires_at), expires_in: expiresInFromExpiresAt(action.status.get('poll').expires_at),
})); }));