From 5c2fceaddd82bb9a78103c2df25ad3f953d14d71 Mon Sep 17 00:00:00 2001 From: Falko Zurell Date: Tue, 5 Dec 2023 11:34:09 +0100 Subject: [PATCH 1/3] patch for v4.2.2 Signed-off-by: Falko Zurell --- .../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 {
- +
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) From b4872f2bdf4ff4bb4fc2e905f4a59d7e2c39b88e Mon Sep 17 00:00:00 2001 From: Falko Zurell Date: Tue, 5 Dec 2023 11:53:10 +0100 Subject: [PATCH 2/3] fixing ruby gem issues 0.3.2 - May 02, 2023 (10 KB) yanked Signed-off-by: Falko Zurell --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index a003cd18d..d83b2f861 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -377,7 +377,7 @@ GEM ipaddress (0.8.3) jmespath (1.6.2) json (2.6.3) - json-canonicalization (0.3.2) + json-canonicalization (0.3.1) json-jwt (1.15.3) activesupport (>= 4.2) aes_key_wrap @@ -385,7 +385,7 @@ GEM httpclient json-ld (3.2.5) htmlentities (~> 4.3) - json-canonicalization (~> 0.3, >= 0.3.2) + json-canonicalization (~> 0.3, >= 0.3.1) link_header (~> 0.0, >= 0.0.8) multi_json (~> 1.15) rack (>= 2.2, < 4) -- 2.39.3 (Apple Git-145) From de4d16ead13e52a504b352d315d901d677e20eb9 Mon Sep 17 00:00:00 2001 From: Falko Zurell Date: Tue, 5 Dec 2023 12:00:15 +0100 Subject: [PATCH 3/3] upgrade version Signed-off-by: Falko Zurell --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d83b2f861..efaccb137 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -377,7 +377,7 @@ GEM ipaddress (0.8.3) jmespath (1.6.2) json (2.6.3) - json-canonicalization (0.3.1) + json-canonicalization (1.0.0) json-jwt (1.15.3) activesupport (>= 4.2) aes_key_wrap @@ -385,7 +385,7 @@ GEM httpclient json-ld (3.2.5) htmlentities (~> 4.3) - json-canonicalization (~> 0.3, >= 0.3.1) + json-canonicalization (~> 1.0, >= 0.3.1) link_header (~> 0.0, >= 0.0.8) multi_json (~> 1.15) rack (>= 2.2, < 4) -- 2.39.3 (Apple Git-145)