diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 9bb88d3..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.DS_Store diff --git a/README.md b/README.md index 1292b22..eab88ca 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,3 @@ # mastodon-character-increase -mastodon char increase as documentated at https://write.as/sweetmeat/customize-mastodon-to-change-your-post-character-limit - -https://1010.gitlab.io/posts/customize-mastodon-character-limit/ - - -### Workflow: - -1. check out the mastodon original code -1. check out the Tag your want to patch for (e.q. `git checkout v.4.2.2`) -1. create a new branch from the tag: `git checkout -b v4.2.2-maxChar500` -1. modify the files that need to be modified (e.q. `git apply ../mastodon-character-increase/character-limit-patch.patch/v4.2-increase-character-limit-from-500-to-5000.patch` ) -1. commit the changes to your branch: `git commit` -1. create the diff patch file: `mastodon git:(v4.2.2-maxChar5000) git format-patch --stdout v4.2.2` -1. verify the patch and save into this repo: `mastodon git:(v4.2.2-maxChar5000) git format-patch --stdout v4.2.2 > ../mastodon-character-increase/character-limit-patch.patch/v4.2.2-increase-character-limit-from-500-to-5000.patch` - +mastodon char increase \ No newline at end of file diff --git a/character-limit-patch.patch/v4.2-increase-character-limit-from-500-to-5000.patch b/character-limit-patch.patch/v4.2-increase-character-limit-from-500-to-5000.patch index 96a8409..a10700d 100644 --- a/character-limit-patch.patch/v4.2-increase-character-limit-from-500-to-5000.patch +++ b/character-limit-patch.patch/v4.2-increase-character-limit-from-500-to-5000.patch @@ -1,9 +1,8 @@ -From c8a844ab03ca3b255d345408025595bfd9bd9178 Mon Sep 17 00:00:00 2001 -From: Falko Zurell -Date: Thu, 1 Feb 2024 17:47:31 +0100 -Subject: [PATCH] applying char increase patch to v4.2.5 +From 1bc2e7f11e06b04449178d65268234146ef452aa Mon Sep 17 00:00:00 2001 +From: Falko Zurell +Date: Thu, 21 Sep 2023 13:05:23 +0200 +Subject: [PATCH] 5000 Character Limit mod for Mastodon v4.2 -Signed-off-by: Falko Zurell --- .../mastodon/features/compose/components/compose_form.jsx | 4 ++-- app/validators/status_length_validator.rb | 2 +- diff --git a/character-limit-patch.patch/v4.2.1-increase-character-limit-from-500-to-5000.patch b/character-limit-patch.patch/v4.2.1-increase-character-limit-from-500-to-5000.patch deleted file mode 100644 index 9e9103f..0000000 --- a/character-limit-patch.patch/v4.2.1-increase-character-limit-from-500-to-5000.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1d7ac665608f78c497d346c0a2e5909d1e83e753 Mon Sep 17 00:00:00 2001 -From: Falko Zurell -Date: Tue, 10 Oct 2023 19:41:59 +0200 -Subject: [PATCH] apply 5000 char limit patch to 4.2.1 - ---- - .../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) - diff --git a/character-limit-patch.patch/v4.2.2-increase-character-limit-from-500-to-5000.patch b/character-limit-patch.patch/v4.2.2-increase-character-limit-from-500-to-5000.patch deleted file mode 100644 index 281e76d..0000000 --- a/character-limit-patch.patch/v4.2.2-increase-character-limit-from-500-to-5000.patch +++ /dev/null @@ -1,123 +0,0 @@ -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) - diff --git a/character-limit-patch.patch/v4.2.3-increase-character-limit-from-500-to-5000.patch b/character-limit-patch.patch/v4.2.3-increase-character-limit-from-500-to-5000.patch deleted file mode 100644 index 9e9103f..0000000 --- a/character-limit-patch.patch/v4.2.3-increase-character-limit-from-500-to-5000.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 1d7ac665608f78c497d346c0a2e5909d1e83e753 Mon Sep 17 00:00:00 2001 -From: Falko Zurell -Date: Tue, 10 Oct 2023 19:41:59 +0200 -Subject: [PATCH] apply 5000 char limit patch to 4.2.1 - ---- - .../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) - diff --git a/character-limit-patch.patch/v4.2.4-increase-character-limit-from-500-to-5000.patch b/character-limit-patch.patch/v4.2.4-increase-character-limit-from-500-to-5000.patch deleted file mode 100644 index 038319c..0000000 --- a/character-limit-patch.patch/v4.2.4-increase-character-limit-from-500-to-5000.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b3c2e2a6fbf5413ca5e4fae16265fa16afc60aa3 Mon Sep 17 00:00:00 2001 -From: Falko Zurell -Date: Thu, 25 Jan 2024 12:31:41 +0100 -Subject: [PATCH] applied patch for 5k char limit - -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) - diff --git a/character-limit-patch.patch/v4.2.5-increase-character-limit-from-500-to-5000.patch b/character-limit-patch.patch/v4.2.5-increase-character-limit-from-500-to-5000.patch deleted file mode 100644 index 96a8409..0000000 --- a/character-limit-patch.patch/v4.2.5-increase-character-limit-from-500-to-5000.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c8a844ab03ca3b255d345408025595bfd9bd9178 Mon Sep 17 00:00:00 2001 -From: Falko Zurell -Date: Thu, 1 Feb 2024 17:47:31 +0100 -Subject: [PATCH] applying char increase patch to v4.2.5 - -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) - diff --git a/character-limit-patch.patch/v4.2.6-increase-character-limit-from-500-to-5000.patch b/character-limit-patch.patch/v4.2.6-increase-character-limit-from-500-to-5000.patch deleted file mode 100644 index 892bdb6..0000000 --- a/character-limit-patch.patch/v4.2.6-increase-character-limit-from-500-to-5000.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 3ac129a66ae03d58654abfd2f2af2cab293ed809 Mon Sep 17 00:00:00 2001 -From: Falko Zurell -Date: Wed, 14 Feb 2024 16:54:44 +0100 -Subject: [PATCH] applied patch for v4.2.6 - ---- - .../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) - diff --git a/character-limit-patch.patch/v4.3-increase-character-limit-from-500-to-5000.patch b/character-limit-patch.patch/v4.3-increase-character-limit-from-500-to-5000.patch deleted file mode 100644 index 283c1ca..0000000 --- a/character-limit-patch.patch/v4.3-increase-character-limit-from-500-to-5000.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d04253848c2d53cc732e3cb0c6e31be91dd6107c Mon Sep 17 00:00:00 2001 -From: Falko Zurell -Date: Tue, 8 Oct 2024 15:27:02 +0200 -Subject: [PATCH] adjust post character limit to 5000 chars for 4.3.x - -Signed-off-by: Falko Zurell ---- - app/validators/status_length_validator.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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.5 (Apple Git-154) -