aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-21 23:36:48 +0300
committerrinpatch <rinpatch@sdf.org>2020-09-21 23:36:48 +0300
commit656741787e1a383a4cf6efc5fe4da57bac8c501a (patch)
tree02746aaffbec82001d6ae1553517413ad8d2784e
parent66d8d670e0f52c684e68ab556059c0bf409e727e (diff)
downloadpleroma-656741787e1a383a4cf6efc5fe4da57bac8c501a.tar.gz
tmp
-rw-r--r--lib/pleroma/object/fetcher.ex19
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index e5e5f8db7..4a907d68f 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -212,16 +212,15 @@ defmodule Pleroma.Object.Fetcher do
defp get_object(id, opts) do
with false <- Keyword.get(opts, :force_http, false),
- _ <- Logger.debug("fetching via fedsocket - #{inspect(id)}")
-
- {:ok, data} <-
- FedSockets.fetch id do
- {:ok, data}
- else
- _other ->
- Logger.debug("fetching via http - #{inspect(id)}")
- get_object_http(id)
- end
+ _ <- Logger.debug("fetching via fedsocket - #{inspect(id)}"),
+ {:ok, data} <-
+ FedSockets.fetch(id) do
+ {:ok, data}
+ else
+ _other ->
+ Logger.debug("fetching via http - #{inspect(id)}")
+ get_object_http(id)
+ end
end
defp get_object_http(id) do