diff options
author | Roman Chvanikov <chvanikoff@pm.me> | 2021-01-18 11:56:40 +0300 |
---|---|---|
committer | Roman Chvanikov <chvanikoff@pm.me> | 2021-01-18 11:56:40 +0300 |
commit | 2289a1d58777b8ed129e322c3ce4119bc129366c (patch) | |
tree | 693af643bfd94af28c29ec519ef8df0f208d7424 /lib/pleroma/web/common_api/utils.ex | |
parent | dbaa15232bfe4c2bc3e2b1a17cfc7503e7036d77 (diff) | |
parent | 732cc0ce46e8044909dd5205858c43f75fe3e937 (diff) | |
download | pleroma-2289a1d58777b8ed129e322c3ce4119bc129366c.tar.gz |
Merge branch 'develop' into refactor/uploads
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
-rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index 7b814826a..6a4e22f27 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -1,5 +1,5 @@ # Pleroma: A lightweight social networking server -# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> +# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only defmodule Pleroma.Web.CommonAPI.Utils do @@ -321,7 +321,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 @@ -401,7 +401,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 |