diff options
author | lambadalambda <gitgud@rogerbraun.net> | 2017-09-04 14:49:55 -0400 |
---|---|---|
committer | lambadalambda <gitgud@rogerbraun.net> | 2017-09-04 14:49:55 -0400 |
commit | ea57e42b257ac49c1e9383fac8e5d8d6d961b8c8 (patch) | |
tree | 5fb62ba9f4ce108a08155ff4d270aab5de313d9e /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
parent | 10e40206c6890cc1d88a391ab620ef859ed71521 (diff) | |
parent | 632e1f7943b8736d2f4084bfcb347c448eac7252 (diff) | |
download | pleroma-ea57e42b257ac49c1e9383fac8e5d8d6d961b8c8.tar.gz |
Merge branch 'deletions' into 'develop'
Deletions
See merge request !26
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 13 |
1 files changed, 12 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 3580e48d2..3ec54616a 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -2,7 +2,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do use Pleroma.Web, :controller alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView} alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter - alias Pleroma.{Repo, Activity, User} + alias Pleroma.{Repo, Activity, User, Object} alias Pleroma.Web.ActivityPub.ActivityPub alias Ecto.Changeset @@ -94,6 +94,17 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end end + def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do + with %Activity{data: %{"object" => %{"id" => object_id}}} <- Repo.get(Activity, id), + %Object{} = object <- Object.get_by_ap_id(object_id), + true <- user.ap_id == object.data["actor"], + {:ok, delete} <- ActivityPub.delete(object) |> IO.inspect do + json = ActivityRepresenter.to_json(delete, %{user: user, for: user}) + conn + |> json_reply(200, json) + end + end + def unfollow(%{assigns: %{user: user}} = conn, params) do case TwitterAPI.unfollow(user, params) do {:ok, user, unfollowed} -> |