Archos/mastodon-app
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

custom-char-limit #1

Open
Archos wants to merge 3 commits from custom-char-limit into master
pull from: custom-char-limit
merge into: Archos:master
Conversation 0 Commits 3 Files Changed 1 +11 -3
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e749c86233 - Show all commits

14
char-limit.patch
View File

@@ -1,17 +1,25 @@
diff --git a/app/validators/status_length_validator.rb b/app/validators/status_length_validator.rb
index 1234567..abcdefg 100644
--- a/app/validators/status_length_validator.rb --- a/app/validators/status_length_validator.rb
+++ b/app/validators/status_length_validator.rb +++ b/app/validators/status_length_validator.rb
@@ -3,7 +3,7 @@ @@ -2,7 +2,7 @@
class StatusLengthValidator < ActiveModel::Validator class StatusLengthValidator < ActiveModel::Validator
- MAX_CHARS = 500 - MAX_CHARS = 500
+ MAX_CHARS = 2500 + MAX_CHARS = 2500
URL_PLACEHOLDER_CHARS = 23 URL_PLACEHOLDER_CHARS = 23
URL_PLACEHOLDER = 'x' * 23 URL_PLACEHOLDER = 'x' * 23
diff --git a/app/javascript/mastodon/features/compose/containers/compose_form_container.js b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
index 1234567..abcdefg 100644
--- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js --- a/app/javascript/mastodon/features/compose/containers/compose_form_container.js
+++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js +++ b/app/javascript/mastodon/features/compose/containers/compose_form_container.js
@@ -50,7 +50,7 @@ @@ -71,7 +71,7 @@ const mapStateToProps = state => ({
anyMedia: state.getIn(['compose', 'media_attachments']).size > 0,
isInReply: state.getIn(['compose', 'in_reply_to']) !== null,
lang: state.getIn(['compose', 'language']),
- maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500), - maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 500),
+ maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 2500), + maxChars: state.getIn(['server', 'server', 'configuration', 'statuses', 'max_characters'], 2500),
}); });
export default connect(mapStateToProps, mapDispatchToProps)(ComposeForm); const mapDispatchToProps = dispatch => ({