gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 17

Fix processing of mentions for post edits with an existing corresponding silent mention (#33227)

Browse source
This commit is contained in:
Claire 2024-12-11 13:59:29 +01:00 • committed by GitHub
parent da279df8ae
commit bcb3b627b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 33 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
app/services/activitypub/process_status_update_service.rb
View file

@ -190,40 +190,30 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
end
def update_mentions!
previous_mentions = @status.active_mentions.includes(:account).to_a
current_mentions = []
unresolved_mentions = []
@raw_mentions.each do |href|
currently_mentioned_account_ids = @raw_mentions.filter_map do |href|
next if href.blank?
account = ActivityPub::TagManager.instance.uri_to_resource(href, Account)
account ||= ActivityPub::FetchRemoteAccountService.new.call(href, request_id: @request_id)
next if account.nil?
mention = previous_mentions.find { |x| x.account_id == account.id }
mention ||= account.mentions.new(status: @status)
current_mentions << mention
account&.id
rescue Mastodon::UnexpectedResponseError, *Mastodon::HTTP_CONNECTION_ERRORS
# Since previous mentions are about already-known accounts,
# they don't try to resolve again and won't fall into this case.
# In other words, this failure case is only for new mentions and won't
# affect `removed_mentions` so they can safely be retried asynchronously
unresolved_mentions << href
nil
end
current_mentions.each do |mention|
mention.save if mention.new_record?
end
@status.mentions.upsert_all(currently_mentioned_account_ids.map { |id| { account_id: id, silent: false } }, unique_by: %w(status_id account_id))
# If previous mentions are no longer contained in the text, convert them
# to silent mentions, since withdrawing access from someone who already
# received a notification might be more confusing
removed_mentions = previous_mentions - current_mentions
Mention.where(id: removed_mentions.map(&:id)).update_all(silent: true) unless removed_mentions.empty?
@status.mentions.where.not(account_id: currently_mentioned_account_ids).update_all(silent: true)
# Queue unresolved mentions for later
unresolved_mentions.uniq.each do |uri|

8
app/services/process_mentions_service.rb
View file

@ -13,7 +13,7 @@ class ProcessMentionsService < BaseService
return unless @status.local?
@previous_mentions = @status.active_mentions.includes(:account).to_a
@previous_mentions = @status.mentions.includes(:account).to_a
@current_mentions = []
Status.transaction do
@ -57,6 +57,8 @@ class ProcessMentionsService < BaseService
mention ||= @current_mentions.find { |x| x.account_id == mentioned_account.id }
mention ||= @status.mentions.new(account: mentioned_account)
mention.silent = false
@current_mentions << mention
"@#{mentioned_account.acct}"
@ -78,7 +80,7 @@ class ProcessMentionsService < BaseService
end
@current_mentions.each do |mention|
mention.save if mention.new_record? && @save_records
mention.save if (mention.new_record? || mention.silent_changed?) && @save_records
end
# If previous mentions are no longer contained in the text, convert them
@ -86,7 +88,7 @@ class ProcessMentionsService < BaseService
# received a notification might be more confusing
removed_mentions = @previous_mentions - @current_mentions
Mention.where(id: removed_mentions.map(&:id)).update_all(silent: true) unless removed_mentions.empty?
Mention.where(id: removed_mentions.map(&:id), silent: false).update_all(silent: true) unless removed_mentions.empty?
end
def mention_undeliverable?(mentioned_account)