projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'pleroma/develop' into moderators
[akkoma]
/
lib
/
pleroma
/
activity
/
ir
/
topics.ex
diff --git
a/lib/pleroma/activity/ir/topics.ex
b/lib/pleroma/activity/ir/topics.ex
index fe2e8cb5c900d7b84f0e92bc1ba42a74c85d685b..7a603a61524a46deb07ebb8f4b6a48036bc6eddc 100644
(file)
--- a/
lib/pleroma/activity/ir/topics.ex
+++ b/
lib/pleroma/activity/ir/topics.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Activity.Ir.Topics do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Activity.Ir.Topics do
@@
-8,7
+8,7
@@
defmodule Pleroma.Activity.Ir.Topics do
def get_activity_topics(activity) do
activity
def get_activity_topics(activity) do
activity
- |> Object.normalize()
+ |> Object.normalize(
fetch: false
)
|> generate_topics(activity)
|> List.flatten()
end
|> generate_topics(activity)
|> List.flatten()
end
@@
-48,14
+48,12
@@
defmodule Pleroma.Activity.Ir.Topics do
tags
end
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:" <> hash
tag end)
end
end
- defp hashtags_to_topics(_), do: []
-
defp remote_topics(%{local: true}), do: []
defp remote_topics(%{actor: actor}) when is_binary(actor),
defp remote_topics(%{local: true}), do: []
defp remote_topics(%{actor: actor}) when is_binary(actor),