diff options
author | lain <lain@soykaf.club> | 2020-03-19 18:00:55 +0100 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-03-19 18:00:55 +0100 |
commit | 3c2c32b460c2d942d085725d14e77a96c4a01e4c (patch) | |
tree | 1542ba8f33738650c561a1f944ae7ce9e16dd116 /lib/pleroma/web/mastodon_api/controllers/status_controller.ex | |
parent | ac5c2b66b9f106bad117708cf74e3007c434d09e (diff) | |
parent | d4bafabfd14887e61eb5bc1d877035dcfebbd33f (diff) |
Merge branch 'remake-remodel' into develop
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/status_controller.ex')
-rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/status_controller.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex index 5c90065f6..83cd2c768 100644 --- a/lib/pleroma/web/mastodon_api/controllers/status_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/status_controller.ex @@ -207,9 +207,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusController do end @doc "POST /api/v1/statuses/:id/favourite" - def favourite(%{assigns: %{user: user}} = conn, %{"id" => ap_id_or_id}) do - with {:ok, _fav, %{data: %{"id" => id}}} <- CommonAPI.favorite(ap_id_or_id, user), - %Activity{} = activity <- Activity.get_create_by_object_ap_id(id) do + def favourite(%{assigns: %{user: user}} = conn, %{"id" => activity_id}) do + with {:ok, _fav} <- CommonAPI.favorite(user, activity_id), + %Activity{} = activity <- Activity.get_by_id(activity_id) do try_render(conn, "show.json", activity: activity, for: user, as: :activity) end end |