Object: Use ap_id column.
This commit is contained in:
parent
202678216a
commit
09f30430e1
|
@ -70,8 +70,8 @@ defmodule Pleroma.Activity do
|
||||||
join(query, join_type, [activity], o in Object,
|
join(query, join_type, [activity], o in Object,
|
||||||
on:
|
on:
|
||||||
fragment(
|
fragment(
|
||||||
"(?->>'id') = COALESCE(?->'object'->>'id', ?->>'object')",
|
"? = COALESCE(?->'object'->>'id', ?->>'object')",
|
||||||
o.data,
|
o.ap_id,
|
||||||
activity.data,
|
activity.data,
|
||||||
activity.data
|
activity.data
|
||||||
),
|
),
|
||||||
|
|
|
@ -67,7 +67,7 @@ defmodule Pleroma.Object do
|
||||||
def get_by_ap_id(nil), do: nil
|
def get_by_ap_id(nil), do: nil
|
||||||
|
|
||||||
def get_by_ap_id(ap_id) do
|
def get_by_ap_id(ap_id) do
|
||||||
Repo.one(from(object in Object, where: fragment("(?)->>'id' = ?", object.data, ^ap_id)))
|
Repo.one(from(object in Object, where: object.ap_id == ^ap_id))
|
||||||
end
|
end
|
||||||
|
|
||||||
defp warn_on_no_object_preloaded(ap_id) do
|
defp warn_on_no_object_preloaded(ap_id) do
|
||||||
|
|
Loading…
Reference in New Issue