diff options
| author | Lain Iwakura <lain@soykaf.club> | 2017-11-14 17:56:38 +0100 |
|---|---|---|
| committer | Lain Iwakura <lain@soykaf.club> | 2017-11-14 17:56:38 +0100 |
| commit | ca5440b93df514659eacde4ce562e459643dedc3 (patch) | |
| tree | 31ab1d8fad8d6ecf7897eda673c4d76646532409 | |
| parent | dae8916544d0a9cee5d998b10bc5cf36f144b727 (diff) | |
Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.
| -rw-r--r-- | .env.production.sample | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/compose/components/compose_form.js | 2 | ||||
| -rw-r--r-- | app/serializers/initial_state_serializer.rb | 4 | ||||
| -rw-r--r-- | app/serializers/rest/instance_serializer.rb | 4 | ||||
| -rw-r--r-- | app/validators/status_length_validator.rb | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/.env.production.sample b/.env.production.sample index 414404476..27de27de4 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -136,4 +136,4 @@ STREAMING_CLUSTER_NUM=1 # GID=1000 # Maximum allowed character count -# MAX_CHARS=500 +# MAX_TOOT_CHARS=500 diff --git a/app/javascript/mastodon/features/compose/components/compose_form.js b/app/javascript/mastodon/features/compose/components/compose_form.js index b7a7447c4..1d0126dbe 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.js +++ b/app/javascript/mastodon/features/compose/components/compose_form.js @@ -20,7 +20,7 @@ import { length } from 'stringz'; import { countableText } from '../util/counter'; import initialState from '../../../initial_state'; -const maxChars = initialState.max_chars; +const maxChars = initialState.max_toot_chars; const messages = defineMessages({ placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' }, diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 4550b344e..b4bdb326b 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -3,11 +3,11 @@ class InitialStateSerializer < ActiveModel::Serializer attributes :meta, :compose, :accounts, :media_attachments, :settings, :push_subscription, - :max_chars + :max_toot_chars has_many :custom_emojis, serializer: REST::CustomEmojiSerializer - def max_chars + def max_toot_chars StatusLengthValidator::MAX_CHARS end diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb index 52c161cb4..abbacc374 100644 --- a/app/serializers/rest/instance_serializer.rb +++ b/app/serializers/rest/instance_serializer.rb @@ -4,7 +4,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer include RoutingHelper attributes :uri, :title, :description, :email, - :version, :urls, :stats, :thumbnail, :max_chars + :version, :urls, :stats, :thumbnail, :max_toot_chars def uri Rails.configuration.x.local_domain @@ -30,7 +30,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer full_asset_url(instance_presenter.thumbnail.file.url) if instance_presenter.thumbnail end - def max_chars + def max_toot_chars StatusLengthValidator::MAX_CHARS end diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb index 888de5a40..79d17742a 100644 --- a/app/validators/status_length_validator.rb +++ b/app/validators/status_length_validator.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true class StatusLengthValidator < ActiveModel::Validator - MAX_CHARS = (ENV['MAX_CHARS'] || 500).to_i + MAX_CHARS = (ENV['MAX_TOOT_CHARS'] || 500).to_i def validate(status) return unless status.local? && !status.reblog? |