commit: 8d11a28be60dbd665e9dac41690adecba6dbb415
parent e5dae13fd3e23c770b52e55715c87207be4db8f5
Author: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Mon, 25 Jan 2021 20:12:09 +0300
[#3213] Switched to using embedded hashtags in Object.hashtags/1
(to avoid extra joins / preload in timeline queries).
Diffstat:
2 files changed, 5 insertions(+), 14 deletions(-)
diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex
@@ -98,7 +98,6 @@ defmodule Pleroma.Config do
def improved_hashtag_timeline_path, do: [:instance, :improved_hashtag_timeline]
def improved_hashtag_timeline, do: get(improved_hashtag_timeline_path())
- def object_embedded_hashtags?, do: !improved_hashtag_timeline()
def oauth_consumer_strategies, do: get([:auth, :oauth_consumer_strategies], [])
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
@@ -388,24 +388,16 @@ defmodule Pleroma.Object do
def tags(_), do: []
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
+ # Note: always using embedded hashtags regardless whether they are migrated to hashtags table
+ # (embedded hashtags stay in sync anyways, and we avoid extra joins and preload hassle)
+ embedded_hashtags(object)
end
- defp embedded_hashtags(%Object{data: data}) do
+ def embedded_hashtags(%Object{data: data}) do
object_data_hashtags(data)
end
- defp embedded_hashtags(_), do: []
+ def embedded_hashtags(_), do: []
def object_data_hashtags(%{"tag" => tags}) when is_list(tags) do
tags