Rename MAX_CHARS to MAX_TOOT_CHARS to be more specific.

diff --git a/.env.production.sample b/.env.production.sample
index 41440447669bf1901a1c15e41b8a244378598710..27de27de493dfcbe62e0d1529327e5c29f5a56ee 100644 (file)
--- 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 b7a7447c48839e19c1c207461958d99181f809de..1d0126dbe3cb266a5f60478a6b9a757eccb728b8 100644 (file)
--- 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 4550b344e3c82cf7f3297b0a32b61a2220c21445..b4bdb326bfe0c0c280777e6d6982dd8371f9236a 100644 (file)
--- 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 52c161cb49a79cf043fab6f5f98bc5ce4c28878a..abbacc37476a74f6b36c6303b5fc065dff6b0335 100644 (file)
--- 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 888de5a40229562d6a8daa34fe46cbe781e1547d..79d17742a900197520118b0554ff54837f46fcae 100644 (file)
--- 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?