Skip to content
Snippets Groups Projects
Commit 28bfb09b authored by href's avatar href
Browse files

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

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

See merge request pleroma/pleroma!757
parents ffbf306c af10ef8d
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment