From be6ef1947e5847e57866a225207d9ac6b07b5b9c Mon Sep 17 00:00:00 2001 From: Zac Date: Mon, 29 Apr 2019 14:35:00 -0400 Subject: [PATCH] changed pinned status count operator changed default pinned count to 5 to preserve default behavior --- app/validators/status_pin_validator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/validators/status_pin_validator.rb b/app/validators/status_pin_validator.rb index c88a9e5d35..16353066c1 100644 --- a/app/validators/status_pin_validator.rb +++ b/app/validators/status_pin_validator.rb @@ -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