put_resp_header("content-type", "application/activity+json") -> put_resp_content_typ...
authorMaksim Pechnikov <parallel588@gmail.com>
Sat, 24 Aug 2019 14:17:17 +0000 (17:17 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sat, 24 Aug 2019 14:17:17 +0000 (17:17 +0300)
lib/pleroma/web/activity_pub/activity_pub_controller.ex

index e72ec5500bbacbbf7a1fe13de9848319826745da..ed801a7ae3729e0eee56fa0ded27506388edf8a9 100644 (file)
@@ -41,7 +41,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
     with %User{} = user <- User.get_cached_by_nickname(nickname),
          {:ok, user} <- User.ensure_keys_present(user) do
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(UserView.render("user.json", %{user: user}))
     else
       nil -> {:error, :not_found}
@@ -53,7 +53,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
          %Object{} = object <- Object.get_cached_by_ap_id(ap_id),
          {_, true} <- {:public?, Visibility.is_public?(object)} do
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(ObjectView.render("object.json", %{object: object}))
     else
       {:public?, false} ->
@@ -69,7 +69,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
       {page, _} = Integer.parse(page)
 
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(ObjectView.render("likes.json", ap_id, likes, page))
     else
       {:public?, false} ->
@@ -83,7 +83,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
          {_, true} <- {:public?, Visibility.is_public?(object)},
          likes <- Utils.get_object_likes(object) do
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(ObjectView.render("likes.json", ap_id, likes))
     else
       {:public?, false} ->
@@ -96,7 +96,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
          %Activity{} = activity <- Activity.normalize(ap_id),
          {_, true} <- {:public?, Visibility.is_public?(activity)} do
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(ObjectView.render("object.json", %{object: activity}))
     else
       {:public?, false} ->
@@ -107,7 +107,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   # GET /relay/following
   def following(%{assigns: %{relay: true}} = conn, _params) do
     conn
-    |> put_resp_header("content-type", "application/activity+json")
+    |> put_resp_content_type("application/activity+json")
     |> json(UserView.render("following.json", %{user: Relay.get_actor()}))
   end
 
@@ -119,12 +119,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
       {page, _} = Integer.parse(page)
 
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(UserView.render("following.json", %{user: user, page: page, for: for_user}))
     else
       {:show_follows, _} ->
         conn
-        |> put_resp_header("content-type", "application/activity+json")
+        |> put_resp_content_type("application/activity+json")
         |> send_resp(403, "")
     end
   end
@@ -133,7 +133,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
     with %User{} = user <- User.get_cached_by_nickname(nickname),
          {user, for_user} <- ensure_user_keys_present_and_maybe_refresh_for_user(user, for_user) do
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(UserView.render("following.json", %{user: user, for: for_user}))
     end
   end
@@ -141,7 +141,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   # GET /relay/followers
   def followers(%{assigns: %{relay: true}} = conn, _params) do
     conn
-    |> put_resp_header("content-type", "application/activity+json")
+    |> put_resp_content_type("application/activity+json")
     |> json(UserView.render("followers.json", %{user: Relay.get_actor()}))
   end
 
@@ -153,12 +153,12 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
       {page, _} = Integer.parse(page)
 
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(UserView.render("followers.json", %{user: user, page: page, for: for_user}))
     else
       {:show_followers, _} ->
         conn
-        |> put_resp_header("content-type", "application/activity+json")
+        |> put_resp_content_type("application/activity+json")
         |> send_resp(403, "")
     end
   end
@@ -167,7 +167,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
     with %User{} = user <- User.get_cached_by_nickname(nickname),
          {user, for_user} <- ensure_user_keys_present_and_maybe_refresh_for_user(user, for_user) do
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(UserView.render("followers.json", %{user: user, for: for_user}))
     end
   end
@@ -176,7 +176,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
     with %User{} = user <- User.get_cached_by_nickname(nickname),
          {:ok, user} <- User.ensure_keys_present(user) do
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(UserView.render("outbox.json", %{user: user, max_id: params["max_id"]}))
     end
   end
@@ -224,7 +224,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   defp represent_service_actor(%User{} = user, conn) do
     with {:ok, user} <- User.ensure_keys_present(user) do
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(UserView.render("user.json", %{user: user}))
     else
       nil -> {:error, :not_found}
@@ -245,7 +245,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
 
   def whoami(%{assigns: %{user: %User{} = user}} = conn, _params) do
     conn
-    |> put_resp_header("content-type", "application/activity+json")
+    |> put_resp_content_type("application/activity+json")
     |> json(UserView.render("user.json", %{user: user}))
   end
 
@@ -254,7 +254,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
   def read_inbox(%{assigns: %{user: user}} = conn, %{"nickname" => nickname} = params) do
     if nickname == user.nickname do
       conn
-      |> put_resp_header("content-type", "application/activity+json")
+      |> put_resp_content_type("application/activity+json")
       |> json(UserView.render("inbox.json", %{user: user, max_id: params["max_id"]}))
     else
       err =