diff options
| author | lain <lain@soykaf.club> | 2023-06-11 13:04:59 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2023-06-11 13:04:59 +0000 |
| commit | d93b47cf2ccf0666f70c4816acb45194e84a3865 (patch) | |
| tree | 7c68de33feb4975988b78b5e62881c22817addf3 /lib | |
| parent | 16313af7eb1c3b92210e0c0762e74c051bdde5f2 (diff) | |
| parent | 6611c6ce4ef3fe76bc9a5eb53677d3b6cde22793 (diff) | |
| download | pleroma-d93b47cf2ccf0666f70c4816acb45194e84a3865.tar.gz pleroma-d93b47cf2ccf0666f70c4816acb45194e84a3865.zip | |
Merge branch 'pleroma-double_mentions' into 'develop'
ForceMentionsInContent: fix double mentions for Mastodon/Misskey posts
See merge request pleroma/pleroma!3903
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex b/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex index 70224561c..5532093cb 100644 --- a/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex +++ b/lib/pleroma/web/activity_pub/mrf/force_mentions_in_content.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2022 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2023 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContent do @@ -95,11 +95,13 @@ defmodule Pleroma.Web.ActivityPub.MRF.ForceMentionsInContent do |> Enum.reject(&is_nil/1) |> sort_replied_user(replied_to_user) - explicitly_mentioned_uris = extract_mention_uris_from_content(content) + explicitly_mentioned_uris = + extract_mention_uris_from_content(content) + |> MapSet.new() added_mentions = - Enum.reduce(mention_users, "", fn %User{ap_id: uri} = user, acc -> - unless uri in explicitly_mentioned_uris do + Enum.reduce(mention_users, "", fn %User{ap_id: ap_id, uri: uri} = user, acc -> + if MapSet.disjoint?(MapSet.new([ap_id, uri]), explicitly_mentioned_uris) do acc <> Formatter.mention_from_user(user, %{mentions_format: :compact}) <> " " else acc |