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

object: rework Object.normalize() a bit to support transparent fetching

Browse source
This commit is contained in:
William Pitcock 2018-12-04 03:17:25 +00:00
commit fed9b5404c
2 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/object.ex
View file

@ -1,6 +1,7 @@
defmodule Pleroma.Object do
use Ecto.Schema
alias Pleroma.{Repo, Object, Activity}
alias Pleroma.Object.Fetcher
import Ecto.{Query, Changeset}
schema "objects" do
@ -27,9 +28,12 @@ defmodule Pleroma.Object do
Repo.one(from(object in Object, where: fragment("(?)->>'id' = ?", object.data, ^ap_id)))
end
def normalize(obj) when is_map(obj), do: normalize(obj["id"])
def normalize(ap_id) when is_binary(ap_id), do: get_cached_by_ap_id(ap_id)
def normalize(_), do: nil
def normalize(_, fetch_remote \\ true)
def normalize(obj, fetch_remote) when is_map(obj), do: normalize(obj["id"], fetch_remote)
def normalize(ap_id, true) when is_binary(ap_id), do: Fetcher.fetch_object_from_id!(ap_id)
def normalize(ap_id, false) when is_binary(ap_id), do: get_cached_by_ap_id(ap_id)
def normalize(obj, _), do: nil
if Mix.env() == :test do
def get_cached_by_ap_id(ap_id) do