Browse Source

Feature: 1024-character posts in server and client

cybrespace-3.3
kɜ:ʳ cybredragon 2 years ago
parent
commit
b75a99e16b
  1. 15
      app/javascript/mastodon/features/compose/components/compose_form.js
  2. 6
      app/serializers/rest/instance_serializer.rb
  3. 2
      app/validators/status_length_validator.rb

15
app/javascript/mastodon/features/compose/components/compose_form.js

@ -96,7 +96,15 @@ class ComposeForm extends ImmutablePureComponent {
this.props.onChange(this.autosuggestTextarea.textarea.value);
}
<<<<<<< HEAD
if (!this.canSubmit()) {
=======
// Submit disabled:
const { isSubmitting, isChangingUpload, isUploading, anyMedia } = this.props;
const fulltext = [this.props.spoilerText, countableText(this.props.text)].join('');
if (isSubmitting || isUploading || isChangingUpload || length(fulltext) > 1024 || (fulltext.length !== 0 && fulltext.trim().length === 0 && !anyMedia)) {
>>>>>>> Feature: 1024-character posts in server and client
return;
}
@ -188,6 +196,11 @@ class ComposeForm extends ImmutablePureComponent {
render () {
const { intl, onPaste, showSearch } = this.props;
const disabled = this.props.isSubmitting;
<<<<<<< HEAD
=======
const text = [this.props.spoilerText, countableText(this.props.text)].join('');
const disabledButton = disabled || this.props.isUploading || this.props.isChangingUpload || length(text) > 1024 || (text.length !== 0 && text.trim().length === 0 && !anyMedia);
>>>>>>> Feature: 1024-character posts in server and client
let publishText = '';
if (this.props.privacy === 'private' || this.props.privacy === 'direct') {
@ -249,7 +262,7 @@ class ComposeForm extends ImmutablePureComponent {
<PrivacyDropdownContainer />
<SpoilerButtonContainer />
</div>
<div className='character-counter__wrapper'><CharacterCounter max={500} text={this.getFulltextForCharacterCounting()} /></div>
<div className='character-counter__wrapper'><CharacterCounter max={1024} text={this.getFulltextForCharacterCounting()} /></div>
</div>
<div className='compose-form__publish'>

6
app/serializers/rest/instance_serializer.rb

@ -5,7 +5,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
attributes :uri, :title, :short_description, :description, :email,
:version, :urls, :stats, :thumbnail,
:languages, :registrations, :approval_required, :invites_enabled
:languages, :registrations, :approval_required, :invites_enabled, :max_toot_chars
has_one :contact_account, serializer: REST::AccountSerializer
@ -39,6 +39,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url) : full_pack_url('media/images/preview.jpg')
end
def max_toot_chars
StatusLengthValidator::MAX_CHARS
end
def stats
{
user_count: instance_presenter.user_count,

2
app/validators/status_length_validator.rb

@ -1,7 +1,7 @@
# frozen_string_literal: true
class StatusLengthValidator < ActiveModel::Validator
MAX_CHARS = 500
MAX_CHARS = 1024
def validate(status)
return unless status.local? && !status.reblog?

Loading…
Cancel
Save