aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-03-27 22:24:19 +0200
committerlain <lain@soykaf.club>2018-03-27 22:24:19 +0200
commite30752bc79d9e03a64c83a7990a7afdcb0176a07 (patch)
tree448752eed81160ef08f0cc769e4a1060b6c2a07c /lib/pleroma/web/twitter_api/twitter_api_controller.ex
parent86058c9a8883c5f6c71f1d3553ca52f658fdf79e (diff)
downloadpleroma-e30752bc79d9e03a64c83a7990a7afdcb0176a07.tar.gz
Add basic activity view.
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex10
1 files changed, 5 insertions, 5 deletions
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