pzingg/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#3213] Made Object.object_data_hashtags/1 handle both AS2 and plain text hashtags.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-12-30 15:22:49 +03:00
parent e0b5edb6d5
commit 8d1a0c1afd
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/object.ex
View file

@ -405,16 +405,18 @@ defp embedded_hashtags(%Object{data: data}) do
defp embedded_hashtags(_), do: [] defp embedded_hashtags(_), do: []
defp object_data_hashtags(%{"tag" => tags}) when is_list(tags) do defp object_data_hashtags(%{"tag" => tags}) when is_list(tags) do
# Note: Old format with copy of hashtags as strings is ignored, using AS2
tags tags
|> Enum.filter(fn |> Enum.filter(fn
%{"type" => "Hashtag"} = data -> Map.has_key?(data, "name") %{"type" => "Hashtag"} = data -> Map.has_key?(data, "name")
plain_text when is_bitstring(plain_text) -> true
_ -> false _ -> false
end) end)
|> Enum.map(fn |> Enum.map(fn
%{"name" => "#" <> hashtag} -> String.downcase(hashtag) %{"name" => "#" <> hashtag} -> String.downcase(hashtag)
%{"name" => hashtag} -> String.downcase(hashtag) %{"name" => hashtag} -> String.downcase(hashtag)
hashtag when is_bitstring(hashtag) -> String.downcase(hashtag)
end) end)
|> Enum.uniq()
end end
defp object_data_hashtags(_), do: [] defp object_data_hashtags(_), do: []