stevenoh0908/mastodon-sakyey
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix processing of object updates with duplicate hashtags (#37756)

Browse Source
This commit is contained in:
Claire
2026-02-06 11:09:42 +01:00
parent 27c1e13aa8
commit 31316aa082
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/activitypub/process_status_update_service.rb
View File

@@ -208,7 +208,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
Tag.find_or_create_by_names([tag]).filter(&:valid?) Tag.find_or_create_by_names([tag]).filter(&:valid?)
rescue ActiveRecord::RecordInvalid rescue ActiveRecord::RecordInvalid
[] []
end end.uniq
return unless @status.distributable? return unless @status.distributable?

4
spec/services/activitypub/process_status_update_service_spec.rb
View File

@@ -259,6 +259,8 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
{ type: 'Hashtag', name: 'foo' }, { type: 'Hashtag', name: 'foo' },
{ type: 'Hashtag', name: 'bar' }, { type: 'Hashtag', name: 'bar' },
{ type: 'Hashtag', name: '#2024' }, { type: 'Hashtag', name: '#2024' },
{ type: 'Hashtag', name: 'Foo Bar' },
{ type: 'Hashtag', name: 'FooBar' },
], ],
} }
end end
@@ -270,7 +272,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
it 'updates tags and featured tags' do it 'updates tags and featured tags' do
expect { subject.call(status, json, json) } expect { subject.call(status, json, json) }
.to change { status.tags.reload.pluck(:name) }.from(contain_exactly('test', 'foo')).to(contain_exactly('foo', 'bar')) .to change { status.tags.reload.pluck(:name) }.from(contain_exactly('test', 'foo')).to(contain_exactly('foo', 'bar', 'foobar'))
.and change { status.account.featured_tags.find_by(name: 'test').statuses_count }.by(-1) .and change { status.account.featured_tags.find_by(name: 'test').statuses_count }.by(-1)
.and change { status.account.featured_tags.find_by(name: 'bar').statuses_count }.by(1) .and change { status.account.featured_tags.find_by(name: 'bar').statuses_count }.by(1)
.and change { status.account.featured_tags.find_by(name: 'bar').last_status_at }.from(nil).to(be_present) .and change { status.account.featured_tags.find_by(name: 'bar').last_status_at }.from(nil).to(be_present)