diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-08 14:37:15 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-08-08 14:37:15 +0000 |
| commit | dc63aaf84f07a6f8042f43617d8ec356fed85cec (patch) | |
| tree | 5d12a05bce5dc1a23736fd37e7ca8c64580acd34 /lib/pleroma/activity/ir/topics.ex | |
| parent | b221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (diff) | |
| parent | 0910777d41f8b4b3096c35c5fc97fc357e5d8c8c (diff) | |
| download | pleroma-2.4.0.tar.gz | |
Merge branch 'release/2.4.0' into 'stable'v2.4.0
Release/2.4.0
See merge request pleroma/pleroma!3493
Diffstat (limited to 'lib/pleroma/activity/ir/topics.ex')
| -rw-r--r-- | lib/pleroma/activity/ir/topics.ex | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/pleroma/activity/ir/topics.ex b/lib/pleroma/activity/ir/topics.ex index d94395fc1..7a603a615 100644 --- a/lib/pleroma/activity/ir/topics.ex +++ b/lib/pleroma/activity/ir/topics.ex @@ -48,14 +48,12 @@ defmodule Pleroma.Activity.Ir.Topics do tags end - defp hashtags_to_topics(%{data: %{"tag" => tags}}) do - tags - |> Enum.filter(&is_bitstring(&1)) - |> Enum.map(fn tag -> "hashtag:" <> tag end) + defp hashtags_to_topics(object) do + object + |> Object.hashtags() + |> Enum.map(fn hashtag -> "hashtag:" <> hashtag end) end - defp hashtags_to_topics(_), do: [] - defp remote_topics(%{local: true}), do: [] defp remote_topics(%{actor: actor}) when is_binary(actor), |