zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 12 Releases Wiki Activity

Fix handling of duplicate mentions in incoming status `Update` (#33911)

This commit is contained in:
Claire 2025-02-12 16:34:56 +01:00
parent 679e7555ee
commit 08d2250ad2
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -225,7 +225,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService
nil nil
end end
@status.mentions.upsert_all(currently_mentioned_account_ids.map { |id| { account_id: id, silent: false } }, unique_by: %w(status_id account_id)) @status.mentions.upsert_all(currently_mentioned_account_ids.uniq.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 # If previous mentions are no longer contained in the text, convert them
# to silent mentions, since withdrawing access from someone who already # to silent mentions, since withdrawing access from someone who already

14
spec/lib/activitypub/activity/create_spec.rb
View File

@ -37,10 +37,16 @@ RSpec.describe ActivityPub::Activity::Create do
content: '@bob lorem ipsum', content: '@bob lorem ipsum',
published: 1.hour.ago.utc.iso8601, published: 1.hour.ago.utc.iso8601,
updated: 1.hour.ago.utc.iso8601, updated: 1.hour.ago.utc.iso8601,
tag: { tag: [
type: 'Mention', {
href: ActivityPub::TagManager.instance.uri_for(follower), type: 'Mention',
}, href: ActivityPub::TagManager.instance.uri_for(follower),
},
{
type: 'Mention',
href: ActivityPub::TagManager.instance.uri_for(follower),
},
],
} }
end end

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

@ -18,6 +18,7 @@ RSpec.describe ActivityPub::ProcessStatusUpdateService do
tag: [ tag: [
{ type: 'Hashtag', name: 'hoge' }, { type: 'Hashtag', name: 'hoge' },
{ type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) }, { type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
{ type: 'Mention', href: ActivityPub::TagManager.instance.uri_for(alice) },
{ type: 'Mention', href: bogus_mention }, { type: 'Mention', href: bogus_mention },
], ],
} }