X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fobject.ex;h=558e151b093bac8a48f972cf2c81e2e9fa3404a3;hb=72b93d13f8208f22f9a771dc8ba18c474fc81849;hp=5b51d6be340170e649c55b7e8c8d06083c9464a2;hpb=1e6491ec96c3eb4e7ce1ca76b521b892206fac03;p=akkoma

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 5b51d6be3..558e151b0 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -4,41 +4,48 @@ defmodule Pleroma.Object do
   import Ecto.{Query, Changeset}
 
   schema "objects" do
-    field :data, :map
+    field(:data, :map)
 
     timestamps()
   end
 
   def create(data) do
     Object.change(%Object{}, %{data: data})
-    |> Repo.insert
+    |> Repo.insert()
   end
 
   def change(struct, params \\ %{}) do
-    changeset = struct
+    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}))
+    Repo.one(from(object in Object, where: fragment("(?)->>'id' = ?", object.data, ^ap_id)))
   end
 
   def get_cached_by_ap_id(ap_id) do
-    if Mix.env == :test do
+    if Mix.env() == :test do
       get_by_ap_id(ap_id)
     else
       key = "object:#{ap_id}"
-      Cachex.get!(:user_cache, key, fallback: fn(_) ->
-        object = get_by_ap_id(ap_id)
-        if object do
-          {:commit, object}
-        else
-          {:ignore, object}
+
+      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
   end