From 9a4d400ff4d2c5c860bcb6582db01879cafd7467 Mon Sep 17 00:00:00 2001 From: lain Date: Sat, 24 Feb 2018 12:49:56 +0100 Subject: [PATCH] Fix remote following. --- lib/pleroma/web/activity_pub/activity_pub_controller.ex | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex index f0dc86a7f..1e0509702 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -12,14 +12,18 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do def user(conn, %{"nickname" => nickname}) do with %User{} = user <- User.get_cached_by_nickname(nickname), {:ok, user} <- Pleroma.Web.WebFinger.ensure_keys_present(user) do - json(conn, UserView.render("user.json", %{user: user})) + conn + |> put_resp_header("content-type", "application/activity+json") + |> json(UserView.render("user.json", %{user: user})) end end def object(conn, %{"uuid" => uuid}) do with ap_id <- o_status_url(conn, :object, uuid), %Object{} = object <- Object.get_cached_by_ap_id(ap_id) do - json(conn, ObjectView.render("object.json", %{object: object})) + conn + |> put_resp_header("content-type", "application/activity+json") + |> json(ObjectView.render("object.json", %{object: object})) end end -- 2.45.2