aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-03-27 16:45:38 +0200
committerlain <lain@soykaf.club>2018-03-27 16:45:38 +0200
commitd2099c849d355a9b8d3b1f2e0342dfe3c7e3497c (patch)
treed2973f3e43913e6e620f4cd31d699144d9348b13 /lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
parent527e8037589ab06e772125cdf937388db6d2c468 (diff)
downloadpleroma-d2099c849d355a9b8d3b1f2e0342dfe3c7e3497c.tar.gz
More Jason changes.
Diffstat (limited to 'lib/pleroma/web/mastodon_api/mastodon_api_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex14
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index c03941254..70a7fa863 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -284,7 +284,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
{:error, reason} ->
conn
|> put_resp_content_type("application/json")
- |> send_resp(403, Poison.encode!(%{"error" => reason}))
+ |> send_resp(403, Jason.encode!(%{"error" => reason}))
end
end
@@ -300,7 +300,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
{:error, reason} ->
conn
|> put_resp_content_type("application/json")
- |> send_resp(403, Poison.encode!(%{"error" => reason}))
+ |> send_resp(403, Jason.encode!(%{"error" => reason}))
end
end
@@ -381,7 +381,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
{:error, message} ->
conn
|> put_resp_content_type("application/json")
- |> send_resp(403, Poison.encode!(%{"error" => message}))
+ |> send_resp(403, Jason.encode!(%{"error" => message}))
end
end
@@ -394,7 +394,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
{:error, message} ->
conn
|> put_resp_content_type("application/json")
- |> send_resp(403, Poison.encode!(%{"error" => message}))
+ |> send_resp(403, Jason.encode!(%{"error" => message}))
end
end
@@ -419,7 +419,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
{:error, message} ->
conn
|> put_resp_content_type("application/json")
- |> send_resp(403, Poison.encode!(%{"error" => message}))
+ |> send_resp(403, Jason.encode!(%{"error" => message}))
end
end
@@ -431,7 +431,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
{:error, message} ->
conn
|> put_resp_content_type("application/json")
- |> send_resp(403, Poison.encode!(%{"error" => message}))
+ |> send_resp(403, Jason.encode!(%{"error" => message}))
end
end
@@ -565,7 +565,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
push_subscription: nil,
accounts: accounts,
custom_emojis: mastodon_emoji
- } |> Poison.encode!
+ } |> Jason.encode!
conn
|> put_layout(false)
|> render(MastodonView, "index.html", %{initial_state: initial_state})