limepotato/akkoma
1
0
Fork 0
Code Pull requests 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
parent 02288b5f1c
commit fed9b5404c
2 changed files with 19 additions and 6 deletions
Show stats 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

15
lib/pleroma/object/fetcher.ex
View file

@ -17,7 +17,7 @@ defmodule Pleroma.Object.Fetcher do
Logger.info("Fetching #{id} via AP")
with {:ok, data} <- fetch_and_contain_remote_object_from_id(id),
nil <- Object.normalize(data),
nil <- Object.normalize(data, false),
params <- %{
"type" => "Create",
"to" => data["to"],
@ -27,7 +27,7 @@ defmodule Pleroma.Object.Fetcher do
},
:ok <- Containment.contain_origin(id, params),
{:ok, activity} <- Transmogrifier.handle_incoming(params) do
{:ok, Object.normalize(activity.data["object"])}
{:ok, Object.normalize(activity.data["object"], false)}
else
{:error, {:reject, nil}} ->
{:reject, nil}
@ -39,13 +39,22 @@ defmodule Pleroma.Object.Fetcher do
Logger.info("Couldn't get object via AP, trying out OStatus fetching...")
case OStatus.fetch_activity_from_url(id) do
{:ok, [activity | _]} -> {:ok, Object.normalize(activity.data["object"])}
{:ok, [activity | _]} -> {:ok, Object.normalize(activity.data["object"], false)}
e -> e
end
end
end
end
def fetch_object_from_id!(id) do
with {:ok, object} <- fetch_object_from_id(id) do
object
else
_e ->
nil
end
end
def fetch_and_contain_remote_object_from_id(id) do
Logger.info("Fetching #{id} via AP")