X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fobject.ex;h=30ba7b57a88f615557ea38884a9f40835e223784;hb=a6f65083aeed755d31134144b973d87575ae549e;hp=168843bd97a34e601594cc413e5c7f9172b9493a;hpb=f169de34544a12c174c454da59781a694b8c2387;p=akkoma

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 168843bd9..30ba7b57a 100644
--- 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,9 +9,22 @@ defmodule Pleroma.Object do
     timestamps()
   end
 
+  def create(data) do
+    Object.change(%Object{}, %{data: data})
+    |> Repo.insert
+  end
+
+  def change(struct, params \\ %{}) do
+    struct
+    |> cast(params, [:data])
+    |> validate_required([:data])
+    |> unique_constraint(:ap_id, name: :objects_unique_apid_index)
+  end
+
+  def get_by_ap_id(nil), do: nil
   def get_by_ap_id(ap_id) do
     Repo.one(from object in Object,
-      where: fragment("? @> ?", object.data, ^%{id: ap_id}))
+      where: fragment("(?)->>'id' = ?", object.data, ^ap_id))
   end
 
   def get_cached_by_ap_id(ap_id) do
@@ -19,11 +32,18 @@ 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
 
   def context_mapping(context) do
-    %Object{data: %{"id" => context}}
+    Object.change(%Object{}, %{data: %{"id" => context}})
   end
 end