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

Refactor ProcessMentionsService to remove save_records parameter (#38277)

Browse Source
This commit is contained in:
Claire 2026-03-23 10:12:30 +01:00 committed by GitHub
parent 931da0c327
commit 21576e29ab
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/post_status_service.rb
View File

@ -77,7 +77,7 @@ class PostStatusService < BaseService
def process_status! def process_status!
@status = @account.statuses.new(status_attributes) @status = @account.statuses.new(status_attributes)
process_mentions_service.call(@status, save_records: false) process_mentions_service.call(@status)
safeguard_mentions!(@status) safeguard_mentions!(@status)
safeguard_private_mention_quote!(@status) safeguard_private_mention_quote!(@status)
attach_quote!(@status) attach_quote!(@status)

10
app/services/process_mentions_service.rb
View File

@ -6,10 +6,8 @@ class ProcessMentionsService < BaseService
# Scan status for mentions and fetch remote mentioned users, # Scan status for mentions and fetch remote mentioned users,
# and create local mention pointers # and create local mention pointers
# @param [Status] status # @param [Status] status
# @param [Boolean] save_records Whether to save records in database def call(status)
def call(status, save_records: true)
@status = status @status = status
@save_records = save_records
return unless @status.local? return unless @status.local?
@ -64,7 +62,7 @@ class ProcessMentionsService < BaseService
"@#{mentioned_account.acct}" "@#{mentioned_account.acct}"
end end
@status.save! if @save_records @status.save! if @status.persisted?
end end
def assign_mentions! def assign_mentions!
@ -79,8 +77,10 @@ class ProcessMentionsService < BaseService
dropped_mentions.each(&:destroy) dropped_mentions.each(&:destroy)
end end
return unless @status.persisted?
@current_mentions.each do |mention| @current_mentions.each do |mention|
mention.save if (mention.new_record? || mention.silent_changed?) && @save_records mention.save if mention.new_record? || mention.silent_changed?
end end
# If previous mentions are no longer contained in the text, convert them # If previous mentions are no longer contained in the text, convert them

2
spec/services/post_status_service_spec.rb
View File

@ -175,7 +175,7 @@ RSpec.describe PostStatusService do
status = subject.call(account, text: 'test status update') status = subject.call(account, text: 'test status update')
expect(ProcessMentionsService).to have_received(:new) expect(ProcessMentionsService).to have_received(:new)
expect(mention_service).to have_received(:call).with(status, save_records: false) expect(mention_service).to have_received(:call).with(status)
end end
it 'safeguards mentions' do it 'safeguards mentions' do

4
spec/services/process_mentions_service_spec.rb
View File

@ -54,10 +54,10 @@ RSpec.describe ProcessMentionsService do
context 'when mentioning a user several times when not saving records' do context 'when mentioning a user several times when not saving records' do
let!(:remote_user) { Fabricate(:account, username: 'remote_user', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') } let!(:remote_user) { Fabricate(:account, username: 'remote_user', protocol: :activitypub, domain: 'example.com', inbox_url: 'http://example.com/inbox') }
let(:status) { Fabricate(:status, account: account, text: "Hello @#{remote_user.acct} @#{remote_user.acct} @#{remote_user.acct}", visibility: :public) } let(:status) { Fabricate.build(:status, account: account, text: "Hello @#{remote_user.acct} @#{remote_user.acct} @#{remote_user.acct}", visibility: :public) }
it 'creates exactly one mention' do it 'creates exactly one mention' do
subject.call(status, save_records: false) subject.call(status)
expect(status.mentions.size).to eq 1 expect(status.mentions.size).to eq 1
end end