From: Maksim Pechnikov <parallel588@gmail.com>
Date: Sun, 2 Dec 2018 14:00:33 +0000 (+0300)
Subject: fix http request in Salmon
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=97252a27d9bdde3483cc6d676c0c61150d2174ad;hp=ec34de0c1fd58942c8ecefddef92696750b70420;p=akkoma

fix http request in Salmon
---

diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index b98ece6c9..97251c05e 100644
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -158,14 +158,16 @@ defmodule Pleroma.Web.Salmon do
   end
 
   defp send_to_user(%{info: %{salmon: salmon}}, feed, poster) do
-    with {:ok, %{status_code: code}} <-
+    with {:ok, %{status: code}} <-
            poster.(
              salmon,
              feed,
              [{"Content-Type", "application/magic-envelope+xml"}],
-             timeout: 10000,
-             recv_timeout: 20000,
-             hackney: [pool: :default]
+             adapter: [
+               timeout: 10000,
+               recv_timeout: 20000,
+               pool: :default
+             ]
            ) do
       Logger.debug(fn -> "Pushed to #{salmon}, code #{code}" end)
     else