squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Also fetch posts by id in fav/rts.

Browse Source
This commit is contained in:
Roger Braun 2017-06-30 16:53:25 +02:00
parent 201804b836
commit cd522d2139
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View File

@ -128,8 +128,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|> json_reply(200, response) |> json_reply(200, response)
end 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 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) {:ok, status} = TwitterAPI.favorite(user, activity)
response = Poison.encode!(status) response = Poison.encode!(status)
@ -138,7 +142,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end end
def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do 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) {:ok, status} = TwitterAPI.unfavorite(user, activity)
response = Poison.encode!(status) response = Poison.encode!(status)
@ -147,7 +151,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end end
def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do 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 if activity.data["actor"] == user.ap_id do
bad_request_reply(conn, "You cannot repeat your own notice.") bad_request_reply(conn, "You cannot repeat your own notice.")
else else