diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-06-30 16:59:54 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-06-30 16:59:54 +0200 |
| commit | 9bdea19d833cb3fa2dff4bad4f9083ed74085a89 (patch) | |
| tree | 8c8947385b35a4b85b794d47158032fe1a745cac /lib | |
| parent | cd522d2139d999adf36705250084662e56a70d0d (diff) | |
| download | pleroma-9bdea19d833cb3fa2dff4bad4f9083ed74085a89.tar.gz | |
For non-create activities, grab the create activity to fav/rt
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 7 |
1 files changed, 6 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 c16c76951..407a7931a 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -129,7 +129,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end def get_by_id_or_ap_id(id) do - Repo.get(Activity, id) || Activity.get_create_activity_by_object_ap_id(id) + activity = Repo.get(Activity, id) || Activity.get_create_activity_by_object_ap_id(id) + if activity.data["type"] == "Create" do + activity + else + Activity.get_create_activity_by_object_ap_id(activity.data["object"]) + end end def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do |