diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-03-10 09:57:21 +0000 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-05-21 03:16:21 -0500 |
| commit | b57383e025db2f6b0e3733960f4622ffe26c3f65 (patch) | |
| tree | 1887f86077863ed88b358c1734bacff37a5292c7 /app | |
| parent | 0bdb555f578b4a53dd1ec9c522220af688cde41c (diff) | |
increase polls to 6 opts x 111 chars
Diffstat (limited to 'app')
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/poll_form.js | 4 | ||||
| -rw-r--r-- | app/validators/poll_validator.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/javascript/mastodon/features/compose/components/poll_form.js b/app/javascript/mastodon/features/compose/components/poll_form.js index 211601d52..43430ac08 100644 --- a/app/javascript/mastodon/features/compose/components/poll_form.js +++ b/app/javascript/mastodon/features/compose/components/poll_form.js @@ -77,7 +77,7 @@ class Option extends React.PureComponent { <AutosuggestInput placeholder={intl.formatMessage(messages.option_placeholder, { number: index + 1 })} - maxLength={25} + maxlength={111} value={title} onChange={this.handleOptionTitleChange} suggestions={this.props.suggestions} @@ -142,7 +142,7 @@ class PollForm extends ImmutablePureComponent { </ul> <div className='poll__footer'> - {options.size < 4 && ( + {options.size < 6 && ( <button className='button button-secondary' onClick={this.handleAddOption}><Icon id='plus' /> <FormattedMessage {...messages.add_option} /></button> )} diff --git a/app/validators/poll_validator.rb b/app/validators/poll_validator.rb index 9d7321cad..9efe5d567 100644 --- a/app/validators/poll_validator.rb +++ b/app/validators/poll_validator.rb @@ -1,8 +1,8 @@ # frozen_string_literal: true class PollValidator < ActiveModel::Validator - MAX_OPTIONS = 4 - MAX_OPTION_CHARS = 25 + MAX_OPTIONS = 6 + MAX_OPTION_CHARS = 111 MAX_EXPIRATION = 1.month.freeze MIN_EXPIRATION = 5.minutes.freeze |