diff options
| author | kaniini <nenolod@gmail.com> | 2019-02-23 03:59:23 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-02-23 03:59:23 +0000 |
| commit | 101c20f8d95299767c19498d627ff404f0a7b130 (patch) | |
| tree | a6681dc1ce495d83fca0f9956b3d60be63e54842 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
| parent | ab2d2dfa7bc01ce1714d03c32419f357ea6384a2 (diff) | |
| parent | 9e0686efa61940fe78736c3e2669acb7233d8ada (diff) | |
| download | pleroma-101c20f8d95299767c19498d627ff404f0a7b130.tar.gz | |
Merge branch 'card-handling' into 'develop'
Private card handling
Closes #652
See merge request pleroma/pleroma!854
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index b815379fd..0d74c30c3 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -13,6 +13,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do alias Pleroma.{Repo, Activity, Object, User, Notification} alias Pleroma.Web.OAuth.Token alias Pleroma.Web.ActivityPub.ActivityPub + alias Pleroma.Web.ActivityPub.Visibility alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.CommonAPI alias Pleroma.Web.TwitterAPI.ActivityView @@ -268,7 +269,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do with %Activity{} = activity <- Repo.get(Activity, id), - true <- ActivityPub.visible_for_user?(activity, user) do + true <- Visibility.visible_for_user?(activity, user) do conn |> put_view(ActivityView) |> render("activity.json", %{activity: activity, for: user}) |