hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#3213] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-12-28 00:08:09 +03:00
commit 14fae94c0e
4 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pleroma/object.ex
View file

@ -384,7 +384,19 @@ defmodule Pleroma.Object do
def tags(_), do: []
def hashtags(object), do: embedded_hashtags(object)
def hashtags(%Object{} = object) do
cond do
Config.object_embedded_hashtags?() ->
embedded_hashtags(object)
object.id == "pleroma:fake_object_id" ->
[]
true ->
hashtag_records = Repo.preload(object, :hashtags).hashtags
Enum.map(hashtag_records, & &1.name)
end
end
defp embedded_hashtags(%Object{data: data}) do
object_data_hashtags(data)