diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-07-26 17:30:16 +0000 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-07-26 17:30:16 +0000 |
| commit | 5c27502afa6d773e4bcb528dd443a12577d48bf2 (patch) | |
| tree | 7c94cd1448941c2d16500a979b5e91746859ca70 | |
| parent | 0d17c2bf2e5245245935778588fd642a024aa8d4 (diff) | |
bump poll sizes to 33 options x 202 chars
| -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 43430ac08..e656b35d3 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={111} + maxlength={202} value={title} onChange={this.handleOptionTitleChange} suggestions={this.props.suggestions} @@ -142,7 +142,7 @@ class PollForm extends ImmutablePureComponent { </ul> <div className='poll__footer'> - {options.size < 6 && ( + {options.size < 33 && ( <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 10e0b8413..898c0c67b 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 = 6 - MAX_OPTION_CHARS = 111 + MAX_OPTIONS = 33 + MAX_OPTION_CHARS = 202 MAX_EXPIRATION = 6.months.freeze MIN_EXPIRATION = 1.minute.freeze |