]> cat aescling's git repositories - mastodon.git/commitdiff
changed pinned status count operator
authorZac <thezacattacks@gmail.com>
Mon, 29 Apr 2019 18:35:00 +0000 (14:35 -0400)
committerThibG <thib@sitedethib.com>
Mon, 29 Apr 2019 18:52:53 +0000 (20:52 +0200)
changed default pinned count to 5 to preserve default behavior

app/validators/status_pin_validator.rb

index c88a9e5d35aa6d8f3c463eb28aa1a2121904621e..16353066c16337a0543af24656e73cb6ff99b94d 100644 (file)
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 class StatusPinValidator < ActiveModel::Validator
-  MAX_PINNED = (ENV['MAX_PINNED_TOOTS'].to_i - 1 || 4)
+  MAX_PINNED = (ENV['MAX_PINNED_TOOTS'] || 5).to_i
   
   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 > MAX_PINNED  && 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