Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-13 15:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/stable-4.3' into glitch-soc/merge-4.3

Browse Source
This commit is contained in:
Claire
2025-09-05 12:18:08 +02:00
parent 0eeb0f00ba 055be70c59
commit fd733d0603
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -504,7 +504,7 @@ export default function compose(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)); let options = action.status.getIn(['poll', 'options']).map(x => x.get('title'));
if (options.size < action.maxOptions) { if (options.size < action.maxOptions) {
options = options.push(''); options = options.push('');
} }
@@ -538,7 +538,7 @@ export default function compose(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)); let options = action.status.getIn(['poll', 'options']).map(x => x.get('title'));
if (options.size < action.maxOptions) { if (options.size < action.maxOptions) {
options = options.push(''); options = options.push('');
} }