added documentation into .env.production.sample

moved max pin count into constant

diff --git a/.env.production.sample b/.env.production.sample
index efb5661fdd3dc0e9576155bd0476c64137cfa9c8..57779f73c57b07e483660de1d6bff0196806faf8 100644 (file)
--- 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 01796f77b703f5521a88a9f1010e4f7cfb015ba6..c88a9e5d35aa6d8f3c463eb28aa1a2121904621e 100644 (file)
--- 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