fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-13 14:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix processing incoming post edits with mentions to unresolvable accounts (#33129)

Browse source
This commit is contained in:
Claire 2024-12-02 10:24:34 +01:00 committed by GitHub
parent 4b80ff92bd
commit 5c06fe4902
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -192,6 +192,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
def update_mentions! def update_mentions!
previous_mentions = @status.active_mentions.includes(:account).to_a previous_mentions = @status.active_mentions.includes(:account).to_a
current_mentions = [] current_mentions = []
unresolved_mentions = []
@raw_mentions.each do |href| @raw_mentions.each do |href|
next if href.blank? next if href.blank?
@ -205,6 +206,12 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
mention ||= account.mentions.new(status: @status) mention ||= account.mentions.new(status: @status)
current_mentions << mention current_mentions << mention
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
end end
current_mentions.each do |mention| current_mentions.each do |mention|
@ -217,6 +224,11 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
removed_mentions = previous_mentions - current_mentions 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)).update_all(silent: true) unless removed_mentions.empty?
# Queue unresolved mentions for later
unresolved_mentions.uniq.each do |uri|
MentionResolveWorker.perform_in(rand(30...600).seconds, @status.id, uri, { 'request_id' => @request_id })
end
end end
def update_emojis! def update_emojis!