aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api_controller.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-05-13 09:32:29 +0000
committerlambda <pleromagit@rogerbraun.net>2018-05-13 09:32:29 +0000
commitaeff2d647483d5348cc1da5c901ce55f1c02b733 (patch)
tree7b7db3e9a7e90771fc6f0283605ac390f2bddb45 /lib/pleroma/web/twitter_api/twitter_api_controller.ex
parent7e9f14bf3ca95fda9042e10b44b80d8441fa3c42 (diff)
parent54ccbd8479a77f613e8efd9568b3611c28d21742 (diff)
downloadpleroma-aeff2d647483d5348cc1da5c901ce55f1c02b733.tar.gz
Merge branch 'feature/unrepeats' into 'develop'
Add unrepeats Closes #69 See merge request pleroma/pleroma!113
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex4
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