X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fobject.ex;h=067ecfaf4732d271f7edfa045401efe2b80d279b;hb=6cadfcb21eb58de3d4c635fb563cd4bcebffd3e2;hp=558e151b093bac8a48f972cf2c81e2e9fa3404a3;hpb=b3d67750f04d7c72c3e1deeb6df573cbb195146a;p=akkoma

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 558e151b0..067ecfaf4 100644
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -1,6 +1,6 @@
 defmodule Pleroma.Object do
   use Ecto.Schema
-  alias Pleroma.{Repo, Object}
+  alias Pleroma.{Repo, Object, Activity}
   import Ecto.{Query, Changeset}
 
   schema "objects" do
@@ -27,29 +27,37 @@ defmodule Pleroma.Object do
     Repo.one(from(object in Object, where: fragment("(?)->>'id' = ?", object.data, ^ap_id)))
   end
 
+  def normalize(obj) when is_map(obj), do: Object.get_by_ap_id(obj["id"])
+  def normalize(ap_id) when is_binary(ap_id), do: Object.get_by_ap_id(ap_id)
+  def normalize(_), do: nil
+
   def get_cached_by_ap_id(ap_id) 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}
-          end
+      Cachex.fetch!(:object_cache, key, 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.change(%Object{}, %{data: %{"id" => context}})
   end
+
+  def delete(%Object{data: %{"id" => id}} = object) do
+    with Repo.delete(object),
+         Repo.delete_all(Activity.all_non_create_by_object_ap_id_q(id)),
+         {:ok, true} <- Cachex.del(:object_cache, "object:#{id}") do
+      {:ok, object}
+    end
+  end
 end