From 5616200ed415fabb8d31eb5257eec7525481b819 Mon Sep 17 00:00:00 2001 From: Zac Date: Sun, 28 Apr 2019 20:10:30 -0400 Subject: [PATCH] added documentation into .env.production.sample moved max pin count into constant --- .env.production.sample | 3 +++ app/validators/status_pin_validator.rb | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.env.production.sample b/.env.production.sample index efb5661fdd..57779f73c5 100644 --- a/.env.production.sample +++ b/.env.production.sample @@ -156,6 +156,9 @@ STREAMING_CLUSTER_NUM=1 # Maximum allowed character count # MAX_TOOT_CHARS=500 +# Maximum number of pinned posts +# MAX_PINNED_TOOTS=5 + # LDAP authentication (optional) # LDAP_ENABLED=true # LDAP_HOST=localhost diff --git a/app/validators/status_pin_validator.rb b/app/validators/status_pin_validator.rb index 01796f77b7..c88a9e5d35 100644 --- a/app/validators/status_pin_validator.rb +++ b/app/validators/status_pin_validator.rb @@ -1,10 +1,12 @@ # frozen_string_literal: true class StatusPinValidator < ActiveModel::Validator + MAX_PINNED = (ENV['MAX_PINNED_TOOTS'].to_i - 1 || 4) + 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.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.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