avoid mix format bug
authorHakaba Hitoyo <hakabahitoyo@example.com>
Thu, 6 Dec 2018 09:41:29 +0000 (18:41 +0900)
committerHakaba Hitoyo <hakabahitoyo@example.com>
Thu, 6 Dec 2018 09:41:29 +0000 (18:41 +0900)
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/ostatus/ostatus.ex

index 922ffb94600f2c3e4aa5d004b00f8e9c014be98a..a1637ccadd41462ee3edcfbe27675fd8b49b0b6c 100644 (file)
@@ -765,7 +765,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
          {:ok, %{body: body, status: code}} when code in 200..299 <-
            @httpoison.get(
              id,
-             Accept: "application/activity+json"
+             [{:Accept, "application/activity+json"}]
            ),
          {:ok, data} <- Jason.decode(body),
          :ok <- Transmogrifier.contain_origin_from_id(id, data) do
index 9f33cd5cd402ea163b6c34c4eee03f1b01d8b931..53d71440eb3b416facf9814ed9bbef648a8a430e 100644 (file)
@@ -349,7 +349,7 @@ defmodule Pleroma.Web.OStatus do
          {:ok, %{body: body, status: code}} when code in 200..299 <-
            @httpoison.get(
              url,
-             Accept: "application/atom+xml"
+             [{:Accept, "application/atom+xml"}]
            ) do
       Logger.debug("Got document from #{url}, handling...")
       handle_incoming(body)