Merge branch 'verify-credentials-default-scope' into 'develop'

[akkoma] / lib / pleroma / object.ex

diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
index 558e151b093bac8a48f972cf2c81e2e9fa3404a3..1bcff5a7b092f5dbc1db4a23192f2d98b4e5cf99 100644 (file)
--- a/lib/pleroma/object.ex
+++ b/lib/pleroma/object.ex
@@ -27,25 +27,25 @@ 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!(:user_cache, key, fn _ ->
+        object = get_by_ap_id(ap_id)
+
+        if object do
+          {:commit, object}
+        else
+          {:ignore, object}
         end
-      )
+      end)
     end
   end