tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix item limit on collections (#38749)

Browse Source
This commit is contained in:
David Roetzel 2026-04-20 12:17:12 +02:00 committed by GitHub
parent d9149bfed9
commit c0b1fbe0a9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/collection.rb
View File

@ -98,7 +98,11 @@ class Collection < ApplicationRecord
errors.add(:tag_name, :unusable) unless tag.usable?
end
def pending_or_accepted_items
collection_items.select { |i| i.accepted? || i.pending? }
end
def items_do_not_exceed_limit
errors.add(:collection_items, :too_many, count: MAX_ITEMS) if collection_items.size > MAX_ITEMS
errors.add(:collection_items, :too_many, count: MAX_ITEMS) if pending_or_accepted_items.size > MAX_ITEMS
end
end

12
spec/models/collection_spec.rb
View File

@ -58,6 +58,18 @@ RSpec.describe Collection do
let(:collection_items) { Fabricate.build_times(described_class::MAX_ITEMS + 1, :collection_item, collection: nil) }
it { is_expected.to_not be_valid }
context 'when the limit is only exceeded due to `rejected` and `revoked` items' do
let(:collection_items) do
items = Fabricate.build_times(described_class::MAX_ITEMS - 2, :collection_item, collection: nil, state: :accepted)
items << Fabricate.build(:collection_item, collection: nil, state: :pending)
items << Fabricate.build(:collection_item, collection: nil, state: :rejected)
items << Fabricate.build(:collection_item, collection: nil, state: :revoked)
items
end
it { is_expected.to be_valid }
end
end
end