Fix #4918 - Limit pinned toots to 5 (#4923)

diff --git a/app/validators/status_pin_validator.rb b/app/validators/status_pin_validator.rb
index f557df6af666d41bf1456c13e0d6090425b3715d..9760e1138c18ba656fd5451220162a2b64d09904 100644 (file)
--- a/app/validators/status_pin_validator.rb
+++ b/app/validators/status_pin_validator.rb
@@ -5,5 +5,6 @@ class StatusPinValidator < ActiveModel::Validator
     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
   end
 end

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e31f883ac600fc31076623d2d2e5c3308250a905..0cd57a64f84eb43fe3087f1299ac650e68a98b08 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -448,6 +448,7 @@ en:
     open_in_web: Open in web
     over_character_limit: character limit of %{max} exceeded
     pin_errors:
+      limit: Too many toots pinned
       ownership: Someone else's toot cannot be pinned
       private: Non-public toot cannot be pinned
       reblog: A boost cannot be pinned