patch for v4.2.2

Signed-off-by: Falko Zurell <falko.zurell@here.com>
This commit is contained in:
Falko Zurell 2023-12-05 11:37:15 +01:00
parent 4be80cbe06
commit 5b3c3ab5bb

View file

@ -0,0 +1,49 @@
From 5c2fceaddd82bb9a78103c2df25ad3f953d14d71 Mon Sep 17 00:00:00 2001
From: Falko Zurell <falko.zurell@here.com>
Date: Tue, 5 Dec 2023 11:34:09 +0100
Subject: [PATCH] patch for v4.2.2
Signed-off-by: Falko Zurell <falko.zurell@here.com>
---
.../mastodon/features/compose/components/compose_form.jsx | 4 ++--
app/validators/status_length_validator.rb | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/javascript/mastodon/features/compose/components/compose_form.jsx b/app/javascript/mastodon/features/compose/components/compose_form.jsx
index 9222b2dc8..962310a28 100644
--- a/app/javascript/mastodon/features/compose/components/compose_form.jsx
+++ b/app/javascript/mastodon/features/compose/components/compose_form.jsx
@@ -100,7 +100,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) > 5000 || (isOnlyWhitespace && !anyMedia));
};
handleSubmit = (e) => {
@@ -297,7 +297,7 @@ class ComposeForm extends ImmutablePureComponent {
</div>
<div className='character-counter__wrapper'>
- <CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} />
+ <CharacterCounter max={5000} text={this.getFulltextForCharacterCounting()} />
</div>
</div>
</div>
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index dc841ded3..9cb1ec94b 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 = 5000
URL_PLACEHOLDER_CHARS = 23
URL_PLACEHOLDER = 'x' * 23
--
2.39.3 (Apple Git-145)