diff options
author | lain <lain@soykaf.club> | 2021-01-07 11:09:18 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2021-01-07 11:09:18 +0000 |
commit | cf0eb0c1c5c945c660295f51c99fe157b2b8229c (patch) | |
tree | 9b9ad23ec0f83628db7f7878498e0382bec4cb1d /lib/pleroma/web/common_api/utils.ex | |
parent | 4d56aca9040f87708e38a050071aa9d3dc977c45 (diff) | |
parent | d44850d7a5d1303c1c9d185fc5eb6642823b3ec4 (diff) | |
download | pleroma-cf0eb0c1c5c945c660295f51c99fe157b2b8229c.tar.gz |
Merge branch 'object-normalize-refactor' into 'develop'
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 1c74ea787..ddbdb3376 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -319,7 +319,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do defp add_in_reply_to(object, nil), do: object defp add_in_reply_to(object, in_reply_to) do - with %Object{} = in_reply_to_object <- Object.normalize(in_reply_to) do + with %Object{} = in_reply_to_object <- Object.normalize(in_reply_to, fetch: false) do Map.put(object, "inReplyTo", in_reply_to_object.data["id"]) else _ -> object @@ -399,7 +399,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do %Activity{data: %{"to" => _to, "type" => type} = data} = activity ) when type == "Create" do - object = Object.normalize(activity, false) + object = Object.normalize(activity, fetch: false) object_data = cond do |