diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-13 22:32:19 +0200 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2019-10-10 20:13:59 +0200 |
| commit | b3dd0d276d52042828e11bf325015f5d7f4624ca (patch) | |
| tree | 6847eb32314144259d4764517c72b49de9302096 /app | |
| parent | bc0399d54dde2ad058a8382fc3edbe5506a92985 (diff) | |
Increase poll option length limit to 100 chars, number of options to 5
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..bdccf9ce7 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={100} 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 < 5 && ( <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..8259a62e5 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 = 5 + MAX_OPTION_CHARS = 100 MAX_EXPIRATION = 1.month.freeze MIN_EXPIRATION = 5.minutes.freeze |