tommy/mobilizon
1
0
Fork 0
forked from potsda.mn/mobilizon
Code Pull requests Activity

Fix duplicate tags when editing an event with tags in description

Browse source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2019-11-19 15:36:25 +01:00
parent eab36f40ec
commit 321a04babe
No known key found for this signature in database
GPG key ID: A061B9DDE0CA0773
1 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/service/activity_pub/converter/utils.ex
View file

@ -15,7 +15,7 @@ defmodule Mobilizon.Service.ActivityPub.Converter.Utils do
def fetch_tags(tags) when is_list(tags) do def fetch_tags(tags) when is_list(tags) do
Logger.debug("fetching tags") Logger.debug("fetching tags")
Enum.reduce(tags, [], &fetch_tag/2) tags |> Enum.flat_map(&fetch_tag/1) |> Enum.uniq() |> Enum.map(&existing_tag_or_data/1)
end end
@spec fetch_mentions([map()]) :: [map()] @spec fetch_mentions([map()]) :: [map()]
@ -64,23 +64,20 @@ defmodule Mobilizon.Service.ActivityPub.Converter.Utils do
} }
end end
defp fetch_tag(tag, acc) when is_map(tag) do defp fetch_tag(tag) when is_map(tag) do
case tag["type"] do case tag["type"] do
"Hashtag" -> "Hashtag" ->
acc ++ [existing_tag_or_data(tag["name"])] [tag_without_hash(tag["name"])]
_err -> _err ->
acc []
end end
end end
defp fetch_tag(tag, acc) when is_bitstring(tag) do defp fetch_tag(tag) when is_bitstring(tag), do: [tag_without_hash(tag)]
acc ++ [existing_tag_or_data(tag)]
end
defp existing_tag_or_data("#" <> tag_title) do defp tag_without_hash("#" <> tag_title), do: tag_title
existing_tag_or_data(tag_title) defp tag_without_hash(tag_title), do: tag_title
end
defp existing_tag_or_data(tag_title) do defp existing_tag_or_data(tag_title) do
case Events.get_tag_by_title(tag_title) do case Events.get_tag_by_title(tag_title) do