From 14d86eb0d076cbadc5944d817ddb731d95312ccf Mon Sep 17 00:00:00 2001
From: "Renato \"Lond\" Cerqueira" <renato@lond.com.br>
Date: Thu, 12 Apr 2018 20:36:02 +0200
Subject: [PATCH] Allow more than the max pins if account is not local (#7105)
Sidekiq sometimes throws errors for users that have more pinned items
than the allowed by the local instance. It should only validate the
number of pins for local accounts.
---
app/validators/status_pin_validator.rb | 2 +-
spec/models/status_pin_spec.rb | 31 ++++++++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/app/validators/status_pin_validator.rb b/app/validators/status_pin_validator.rb
index 64da04120..2c7bce674 100644
--- a/app/validators/status_pin_validator.rb
+++ b/app/validators/status_pin_validator.rb
@@ -5,6 +5,6 @@ class StatusPinValidator < ActiveModel::Validator
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 > 4
+ pin.errors.add(:base, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count > 4 && pin.account.local?
end
end
diff --git a/spec/models/status_pin_spec.rb b/spec/models/status_pin_spec.rb
index 6f54f80f9..944baf639 100644
--- a/spec/models/status_pin_spec.rb
+++ b/spec/models/status_pin_spec.rb
@@ -37,5 +37,36 @@ RSpec.describe StatusPin, type: :model do
expect(StatusPin.new(account: account, status: status).save).to be false
end
+
+ max_pins = 5
+ it 'does not allow pins above the max' do
+ account = Fabricate(:account)
+ status = []
+
+ (max_pins + 1).times do |i|
+ status[i] = Fabricate(:status, account: account)
+ end
+
+ max_pins.times do |i|
+ expect(StatusPin.new(account: account, status: status[i]).save).to be true
+ end
+
+ expect(StatusPin.new(account: account, status: status[max_pins]).save).to be false
+ end
+
+ it 'allows pins above the max for remote accounts' do
+ account = Fabricate(:account, domain: 'remote', username: 'bob', url: 'https://remote/')
+ status = []
+
+ (max_pins + 1).times do |i|
+ status[i] = Fabricate(:status, account: account)
+ end
+
+ max_pins.times do |i|
+ expect(StatusPin.new(account: account, status: status[i]).save).to be true
+ end
+
+ expect(StatusPin.new(account: account, status: status[max_pins]).save).to be true
+ end
end
end
--
GitLab