Add option to keep id for follows.

[akkoma] / lib / pleroma / object.ex

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 168843bd97a34e601594cc413e5c7f9172b9493a..715a35591815394f5bfd25b1856b3252f9c98cce 100644 (file)
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -1,7 +1,7 @@
 defmodule Pleroma.Object do
   use Ecto.Schema
   alias Pleroma.{Repo, Object}
-  import Ecto.Query
+  import Ecto.{Query, Changeset}
 
   schema "objects" do
     field :data, :map
@@ -9,6 +9,13 @@ defmodule Pleroma.Object do
     timestamps()
   end
 
+  def change(struct, params \\ %{}) do
+    changeset = struct
+    |> cast(params, [:data])
+    |> validate_required([:data])
+    |> unique_constraint(:ap_id, name: :objects_unique_apid_index)
+  end
+
   def get_by_ap_id(ap_id) do
     Repo.one(from object in Object,
       where: fragment("? @> ?", object.data, ^%{id: ap_id}))
@@ -19,7 +26,14 @@ defmodule Pleroma.Object do
       get_by_ap_id(ap_id)
     else
       key = "object:#{ap_id}"
-      Cachex.get!(:user_cache, key, fallback: fn(_) -> get_by_ap_id(ap_id) end)
+      Cachex.get!(:user_cache, key, fallback: fn(_) ->
+        object = get_by_ap_id(ap_id)
+        if object do
+          {:commit, object}
+        else
+          {:ignore, object}
+        end
+      end)
     end
   end