From bcbdfc19fd67d3f92c0c4d48c19788337d33f6dc Mon Sep 17 00:00:00 2001 From: Dalite Fur Date: Thu, 9 Nov 2023 21:45:08 +0100 Subject: [PATCH] max post chars and profile fields --- .../mastodon/features/compose/components/compose_form.jsx | 4 ++-- app/models/account.rb | 4 ++-- app/validators/status_length_validator.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx index b15fe2909..458ee8410 100644 --- a/app/javascript/mastodon/features/compose/components/compose_form.jsx +++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx @@ -104,7 +104,7 @@ class ComposeForm extends ImmutablePureComponent { const fulltext = this.getFulltextForCharacterCounting(); const isOnlyWhitespace = fulltext.length !== 0 && fulltext.trim().length === 0; - return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 500 || (isOnlyWhitespace && !anyMedia)); + return !(isSubmitting || isUploading || isChangingUpload || length(fulltext) > 1000 || (isOnlyWhitespace && !anyMedia)); }; handleSubmit = (e) => { @@ -297,7 +297,7 @@ class ComposeForm extends ImmutablePureComponent {
- +
diff --git a/app/models/account.rb b/app/models/account.rb index a25ebc4aa..75f1c2575 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -101,7 +101,7 @@ class Account < ApplicationRecord validates_with UnreservedUsernameValidator, if: -> { local? && will_save_change_to_username? && actor_type != 'Application' } validates :display_name, length: { maximum: 30 }, if: -> { local? && will_save_change_to_display_name? } validates :note, note_length: { maximum: 500 }, if: -> { local? && will_save_change_to_note? } - validates :fields, length: { maximum: 4 }, if: -> { local? && will_save_change_to_fields? } + validates :fields, length: { maximum: 8 }, if: -> { local? && will_save_change_to_fields? } validates :uri, absence: true, if: :local?, on: :create validates :inbox_url, absence: true, if: :local?, on: :create validates :shared_inbox_url, absence: true, if: :local?, on: :create @@ -344,7 +344,7 @@ class Account < ApplicationRecord self[:fields] = fields end - DEFAULT_FIELDS_SIZE = 4 + DEFAULT_FIELDS_SIZE = 8 def build_fields return if fields.size >= DEFAULT_FIELDS_SIZE diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb index dc841ded3..0eda4e3d9 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 = 500 + MAX_CHARS = 1000 URL_PLACEHOLDER_CHARS = 23 URL_PLACEHOLDER = 'x' * 23