summaryrefslogtreecommitdiff
path: root/lib/pleroma/object/fetcher.ex
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-08 17:21:12 +0000
committerrinpatch <rinpatch@sdf.org>2020-09-08 17:21:12 +0000
commit425324aae3d4534bc045466a1cc15653ddfa27d2 (patch)
tree2d785eb4396e2dc79bb6b0bed5d766b393479dd5 /lib/pleroma/object/fetcher.ex
parent73dd5bdb7dcdf804bdbabcf632671d4de5042ebc (diff)
parent073f5490ece616fd9602382c1be1347457cbbe79 (diff)
Merge branch 'release/2.1.1' into 'stable'v2.1.1
2.1.1 release See merge request pleroma/secteam/pleroma!13
Diffstat (limited to 'lib/pleroma/object/fetcher.ex')
-rw-r--r--lib/pleroma/object/fetcher.ex6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/object/fetcher.ex b/lib/pleroma/object/fetcher.ex
index 6fdbc8efd..374d8704a 100644
--- a/lib/pleroma/object/fetcher.ex
+++ b/lib/pleroma/object/fetcher.ex
@@ -164,12 +164,12 @@ defmodule Pleroma.Object.Fetcher do
date: date
})
- [{"signature", signature}]
+ {"signature", signature}
end
defp sign_fetch(headers, id, date) do
if Pleroma.Config.get([:activitypub, :sign_object_fetches]) do
- headers ++ make_signature(id, date)
+ [make_signature(id, date) | headers]
else
headers
end
@@ -177,7 +177,7 @@ defmodule Pleroma.Object.Fetcher do
defp maybe_date_fetch(headers, date) do
if Pleroma.Config.get([:activitypub, :sign_object_fetches]) do
- headers ++ [{"date", date}]
+ [{"date", date} | headers]
else
headers
end