diff options
author | lain <lain@soykaf.club> | 2018-05-13 11:59:35 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2018-05-13 11:59:35 +0200 |
commit | a5c9dd0a2aa792ed075c6ff83b1de262a1529026 (patch) | |
tree | cde89f940be50a6ad13d3acc0a0c15d237ca7d96 /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
parent | 3c3933e40bce7001b5025bf2e05412dd9c128f0f (diff) | |
parent | aeff2d647483d5348cc1da5c901ce55f1c02b733 (diff) | |
download | pleroma-a5c9dd0a2aa792ed075c6ff83b1de262a1529026.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index 960925f42..a99487738 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -157,8 +157,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do - with {:ok, delete} <- CommonAPI.delete(id, user) do - render(conn, ActivityView, "activity.json", %{activity: delete, for: user}) + with {:ok, activity} <- TwitterAPI.delete(user, id) do + render(conn, ActivityView, "activity.json", %{activity: activity, for: user}) end end |