X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fobject.ex;h=5f1fc801b592d70da0534fdb9defd34e99880758;hb=833161b5d21f85e2276cd0cee3e148ecbe6e1f05;hp=96079cf229a7e24af2d2ebb97f098ac06610840f;hpb=f8388be9c69981958e9a96dce68fc39bdedb5cd3;p=akkoma

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 96079cf22..5f1fc801b 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -4,8 +4,15 @@
 
 defmodule Pleroma.Object do
   use Ecto.Schema
-  alias Pleroma.{Repo, Object, User, Activity, ObjectTombstone}
-  import Ecto.{Query, Changeset}
+
+  alias Pleroma.Repo
+  alias Pleroma.Object
+  alias Pleroma.User
+  alias Pleroma.Activity
+  alias Pleroma.ObjectTombstone
+
+  import Ecto.Query
+  import Ecto.Changeset
 
   schema "objects" do
     field(:data, :map)
@@ -13,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