diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-12-15 12:20:56 -0600 |
| commit | 82b2e224a26765caf743b24844912faa2de9873a (patch) | |
| tree | 1ee49dd3dbcef7867ad93f875262951612815851 /app/validators | |
| parent | 6abb0950c6f694607cdc6a0c564751400d52ad5a (diff) | |
| parent | e0a573a2cef924fdfec2cd7ec96a712fe2de1511 (diff) | |
Merge branch 'gs-master' into prevent-local-only-federation
Conflicts: db/schema.rb
Diffstat (limited to 'app/validators')
| -rw-r--r-- | app/validators/status_pin_validator.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/validators/status_pin_validator.rb b/app/validators/status_pin_validator.rb index 9760e1138..64da04120 100644 --- a/app/validators/status_pin_validator.rb +++ b/app/validators/status_pin_validator.rb @@ -2,9 +2,9 @@ class StatusPinValidator < ActiveModel::Validator def validate(pin) - pin.errors.add(:status, I18n.t('statuses.pin_errors.reblog')) if pin.status.reblog? - pin.errors.add(:status, I18n.t('statuses.pin_errors.ownership')) if pin.account_id != pin.status.account_id - pin.errors.add(:status, I18n.t('statuses.pin_errors.private')) unless %w(public unlisted).include?(pin.status.visibility) - pin.errors.add(:status, I18n.t('statuses.pin_errors.limit')) if pin.account.status_pins.count > 4 + 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 end end |