From e30752bc79d9e03a64c83a7990a7afdcb0176a07 Mon Sep 17 00:00:00 2001 From: lain Date: Tue, 27 Mar 2018 22:24:19 +0200 Subject: Add basic activity view. --- lib/pleroma/web/twitter_api/twitter_api_controller.ex | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex') diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 085113f26..a3c98a245 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -1,6 +1,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do use Pleroma.Web, :controller - alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView} + alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView, ActivityView} alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter alias Pleroma.Web.CommonAPI alias Pleroma.{Repo, Activity, User} @@ -140,10 +140,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do - response = Jason.encode!(TwitterAPI.fetch_status(user, id)) - - conn - |> json_reply(200, response) + with %Activity{} = activity <- Repo.get(Activity, id), + true <- ActivityPub.visible_for_user?(activity, user) do + render conn, ActivityView, "activity.json", %{activity: activity, for: user} + end end def fetch_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do -- cgit v1.2.3