diff options
author | lambda <pleromagit@rogerbraun.net> | 2019-02-11 08:07:39 +0000 |
---|---|---|
committer | lambda <pleromagit@rogerbraun.net> | 2019-02-11 08:07:39 +0000 |
commit | d53e36bf1e004177277cb5917bb290d512278aa9 (patch) | |
tree | 96ae3dd7387dc70db67cd79fb99ee6081cad23ce /lib/pleroma/object.ex | |
parent | 06c4935c11fc58f5ede18706bc46dcc502e64052 (diff) | |
download | pleroma-d53e36bf1e004177277cb5917bb290d512278aa9.tar.gz |
Revert "Merge branch 'object-creation' into 'develop'"
This reverts merge request !802
Diffstat (limited to 'lib/pleroma/object.ex')
-rw-r--r-- | lib/pleroma/object.ex | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex index dabb49536..5f1fc801b 100644 --- a/lib/pleroma/object.ex +++ b/lib/pleroma/object.ex @@ -20,29 +20,9 @@ defmodule Pleroma.Object do timestamps() end - def insert_or_get(cng) do - {_, data} = fetch_field(cng, :data) - id = data["id"] || data[:id] - key = "object:#{id}" - - fetcher = fn _ -> - with nil <- get_by_ap_id(id), - {:ok, object} <- Repo.insert(cng) do - {:commit, object} - else - %Object{} = object -> {:commit, object} - e -> {:ignore, e} - end - end - - with {state, object} when state in [:commit, :ok] <- Cachex.fetch(:object_cache, key, fetcher) do - {:ok, object} - end - end - def create(data) do Object.change(%Object{}, %{data: data}) - |> insert_or_get() + |> Repo.insert() end def change(struct, params \\ %{}) do |