From e3c460353dacb796a867a0a3afa3632746d57aa2 Mon Sep 17 00:00:00 2001 From: rinpatch Date: Sun, 2 Jun 2019 23:24:48 +0300 Subject: [PATCH] Refresh the object in CommonAPI.vote instead of MastoAPI controller --- lib/pleroma/web/common_api/common_api.ex | 1 + lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index f54f8a7b9..a12ee011b 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -141,6 +141,7 @@ def vote(user, object, choices) do }) end) + object = Object.get_cached_by_ap_id(object.data["id"]) {:ok, answer_activities, object} else {:author, _} -> {:error, "Already voted"} diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 8da31161f..bab6d693d 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -436,8 +436,6 @@ def poll_vote(%{assigns: %{user: user}} = conn, %{"id" => id, "choices" => choic %Activity{} = activity <- Activity.get_create_by_object_ap_id(object.data["id"]), true <- Visibility.visible_for_user?(activity, user), {:ok, _activities, object} <- CommonAPI.vote(user, object, choices) do - object = Object.get_cached_by_ap_id(object.data["id"]) - conn |> put_view(StatusView) |> try_render("poll.json", %{object: object, for: user})