treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

added documentation into .env.production.sample 

moved max pin count into constant
remotes/1727458204337373841/tmp_refs/heads/signup-info-prompt
Zac 2019-04-28 20:10:30 -04:00 committed by ThibG
parent a36affb9d6
commit 5616200ed4
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.env.production.sample
View File

@ -156,6 +156,9 @@ STREAMING_CLUSTER_NUM=1
# Maximum allowed character count # Maximum allowed character count
# MAX_TOOT_CHARS=500 # MAX_TOOT_CHARS=500
# Maximum number of pinned posts
# MAX_PINNED_TOOTS=5
# LDAP authentication (optional) # LDAP authentication (optional)
# LDAP_ENABLED=true # LDAP_ENABLED=true
# LDAP_HOST=localhost # LDAP_HOST=localhost

4
app/validators/status_pin_validator.rb
View File

@ -1,10 +1,12 @@
# frozen_string_literal: true # frozen_string_literal: true
class StatusPinValidator < ActiveModel::Validator class StatusPinValidator < ActiveModel::Validator
MAX_PINNED = (ENV['MAX_PINNED_TOOTS'].to_i - 1 || 4)
def validate(pin) def validate(pin)
pin.errors.add(:base, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog? pin.errors.add(:base, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog?
pin.errors.add(:base, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id pin.errors.add(:base, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id
pin.errors.add(:base, I18n.t('statuses.pin_errors.private')) unless %w(public unlisted).include?(pin.status.visibility) pin.errors.add(:base, I18n.t('statuses.pin_errors.private')) unless %w(public unlisted).include?(pin.status.visibility)
pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count >= (ENV['MAX_PINNED_TOOTS'].to_i || 5) && pin.account.local? pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count > MAX_PINNED && pin.account.local?
end end
end end