From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 30 Jun 2017 14:53:25 +0000 (+0200)
Subject: Also fetch posts by id in fav/rts.
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=cd522d2139d999adf36705250084662e56a70d0d;p=akkoma

Also fetch posts by id in fav/rts.
---

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 56b2f7cfa..c16c76951 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -128,8 +128,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> json_reply(200, response)
   end
 
+  def get_by_id_or_ap_id(id) do
+    Repo.get(Activity, id) || Activity.get_create_activity_by_object_ap_id(id)
+  end
+
   def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    activity = Repo.get(Activity, id)
+    activity = get_by_id_or_ap_id(id)
     {:ok, status} = TwitterAPI.favorite(user, activity)
     response = Poison.encode!(status)
 
@@ -138,7 +142,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    activity = Repo.get(Activity, id)
+    activity = get_by_id_or_ap_id(id)
     {:ok, status} = TwitterAPI.unfavorite(user, activity)
     response = Poison.encode!(status)
 
@@ -147,7 +151,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    activity = Repo.get(Activity, id)
+    activity = get_by_id_or_ap_id(id)
     if activity.data["actor"] == user.ap_id do
       bad_request_reply(conn, "You cannot repeat your own notice.")
     else