monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'lambadalambda/feature/configurable-status-size' into glitchsoc/feature/configurable-status-size

This commit is contained in:
David Yip 2017-11-17 14:28:16 -06:00
parent b006bb82af ca5440b93d
commit dc16d73bf5
5 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.production.sample
View File

@ -134,3 +134,6 @@ STREAMING_CLUSTER_NUM=1
# If you use Docker, you may want to assign UID/GID manually. # If you use Docker, you may want to assign UID/GID manually.
# UID=1000 # UID=1000
# GID=1000 # GID=1000
# Maximum allowed character count
# MAX_TOOT_CHARS=500

7
app/javascript/mastodon/features/compose/components/compose_form.js
View File

@ -19,6 +19,9 @@ import ImmutablePureComponent from 'react-immutable-pure-component';
import { length } from 'stringz'; import { length } from 'stringz';
import { countableText } from '../util/counter'; import { countableText } from '../util/counter';
import ComposeAttachOptions from '../../../../glitch/components/compose/attach_options/index'; import ComposeAttachOptions from '../../../../glitch/components/compose/attach_options/index';
import initialState from '../../../initial_state';
const maxChars = initialState.max_toot_chars;
const messages = defineMessages({ const messages = defineMessages({
placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' }, placeholder: { id: 'compose_form.placeholder', defaultMessage: 'What is on your mind?' },
@ -205,7 +208,7 @@ export default class ComposeForm extends ImmutablePureComponent {
} }
} }
const submitDisabled = disabled || this.props.is_uploading || length(text) > 500 || (text.length !== 0 && text.trim().length === 0); const submitDisabled = disabled || this.props.is_uploading || length(text) > maxChars || (text.length !== 0 && text.trim().length === 0);
return ( return (
<div className='compose-form'> <div className='compose-form'>
@ -255,7 +258,7 @@ export default class ComposeForm extends ImmutablePureComponent {
</div> </div>
<div className='compose-form__publish'> <div className='compose-form__publish'>
<div className='character-counter__wrapper'><CharacterCounter max={500} text={text} /></div> <div className='character-counter__wrapper'><CharacterCounter max={maxChars} text={text} /></div>
<div className='compose-form__publish-button-wrapper'> <div className='compose-form__publish-button-wrapper'>
{ {
showSideArm ? showSideArm ?

7
app/serializers/initial_state_serializer.rb
View File

@ -2,10 +2,15 @@
class InitialStateSerializer < ActiveModel::Serializer class InitialStateSerializer < ActiveModel::Serializer
attributes :meta, :compose, :accounts, attributes :meta, :compose, :accounts,
:media_attachments, :settings, :push_subscription :media_attachments, :settings, :push_subscription,
:max_toot_chars
has_many :custom_emojis, serializer: REST::CustomEmojiSerializer has_many :custom_emojis, serializer: REST::CustomEmojiSerializer
def max_toot_chars
StatusLengthValidator::MAX_CHARS
end
def custom_emojis def custom_emojis
CustomEmoji.local.where(disabled: false) CustomEmoji.local.where(disabled: false)
end end

6
app/serializers/rest/instance_serializer.rb
View File

@ -4,7 +4,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
include RoutingHelper include RoutingHelper
attributes :uri, :title, :description, :email, attributes :uri, :title, :description, :email,
:version, :urls, :stats, :thumbnail :version, :urls, :stats, :thumbnail, :max_toot_chars
def uri def uri
Rails.configuration.x.local_domain Rails.configuration.x.local_domain
@ -30,6 +30,10 @@ class REST::InstanceSerializer < ActiveModel::Serializer
full_asset_url(instance_presenter.thumbnail.file.url) if instance_presenter.thumbnail full_asset_url(instance_presenter.thumbnail.file.url) if instance_presenter.thumbnail
end end
def max_toot_chars
StatusLengthValidator::MAX_CHARS
end
def stats def stats
{ {
user_count: instance_presenter.user_count, user_count: instance_presenter.user_count,

2
app/validators/status_length_validator.rb
View File

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class StatusLengthValidator < ActiveModel::Validator class StatusLengthValidator < ActiveModel::Validator
MAX_CHARS = 512 MAX_CHARS = (ENV['MAX_TOOT_CHARS'] || 500).to_i
def validate(status) def validate(status)
return unless status.local? && !status.reblog? return unless status.local? && !status.reblog?