pleroma

commit: 28bfb09b01d324e149e9f36a74db2674a07b07da
parent: ffbf306c9a03e88520c02690d5357d7a4937d961
Author: href <href+git-pleroma@random.sh>
Date:   Fri,  1 Feb 2019 19:45:55 +0000

Merge branch 'hotfix/object-normalize-cache' into 'develop'

object: use cached accesses when possible in Object.normalize()

See merge request pleroma/pleroma!757
Diffstat:
M
lib/pleroma/object.ex
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/object.ex b/lib/pleroma/object.ex
@@ -31,8 +31,8 @@ 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(%{"id" => ap_id}), do: normalize(ap_id)
+  def normalize(ap_id) when is_binary(ap_id), do: get_cached_by_ap_id(ap_id)
   def normalize(_), do: nil
 
   # Owned objects can only be mutated by their owner