diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-14 07:19:36 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-14 07:19:36 +0000 |
| commit | 8c7fdcb31b1255f91493b8f2e0f86dfbbfa2ac85 (patch) | |
| tree | 6bafa899d5e5ac3696ae1d05c1746e134c5898b9 /lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | |
| parent | 2c303b3302e28a85aec448a9d57f9c5b1e658bfb (diff) | |
| parent | fc15f30a3c53860af35eb39c6893428df966fb96 (diff) | |
| download | pleroma-8c7fdcb31b1255f91493b8f2e0f86dfbbfa2ac85.tar.gz | |
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
Diffstat (limited to 'lib/pleroma/web/mastodon_api/mastodon_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 922b83ed0..8a8d1e050 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -360,7 +360,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end def unreblog_status(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do - with {:ok, _, _, %{data: %{"id" => id}}} <- CommonAPI.unrepeat(ap_id_or_id, user), + with {:ok, _unannounce, %{data: %{"id" => id}}} <- CommonAPI.unrepeat(ap_id_or_id, user), %Activity{} = activity <- Activity.get_create_activity_by_object_ap_id(id) do render(conn, StatusView, "status.json", %{activity: activity, for: user, as: :activity}) end |