Add unrepeat functionality

[akkoma] / lib / pleroma / web / twitter_api / twitter_api_controller.ex

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index fb09deada7325745d517999c27837f840c12cc62..986436326ce8c096795a39f3c263b2e9b686c16c 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -1,7 +1,6 @@
 defmodule Pleroma.Web.TwitterAPI.Controller do
   use Pleroma.Web, :controller
   alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView, ActivityView}
-  alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
   alias Pleroma.Web.CommonAPI
   alias Pleroma.{Repo, Activity, User}
   alias Pleroma.Web.ActivityPub.ActivityPub
@@ -46,7 +45,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   def public_and_external_timeline(%{assigns: %{user: user}} = conn, params) do
     params =
       params
-      |> Map.put("type", ["Create", "Announce", "Follow"])
+      |> Map.put("type", ["Create", "Announce"])
       |> Map.put("blocking_user", user)
 
     activities = ActivityPub.fetch_public_activities(params)
@@ -58,7 +57,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   def public_timeline(%{assigns: %{user: user}} = conn, params) do
     params =
       params
-      |> Map.put("type", ["Create", "Announce", "Follow"])
+      |> Map.put("type", ["Create", "Announce"])
       |> Map.put("local_only", true)
       |> Map.put("blocking_user", user)
 
@@ -152,10 +151,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do
     with {:ok, delete} <- CommonAPI.delete(id, user) do
-      json = ActivityRepresenter.to_json(delete, %{user: user, for: user})
-
-      conn
-      |> json_reply(200, json)
+      render(conn, ActivityView, "activity.json", %{activity: delete, for: user})
     end
   end
 
@@ -216,20 +212,26 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    with {:ok, status} <- TwitterAPI.fav(user, id) do
-      json(conn, status)
+    with {:ok, activity} <- TwitterAPI.fav(user, id) do
+      render(conn, ActivityView, "activity.json", %{activity: activity, for: user})
     end
   end
 
   def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    with {:ok, status} <- TwitterAPI.unfav(user, id) do
-      json(conn, status)
+    with {:ok, activity} <- TwitterAPI.unfav(user, id) do
+      render(conn, ActivityView, "activity.json", %{activity: activity, for: user})
     end
   end
 
   def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    with {:ok, status} <- TwitterAPI.repeat(user, id) do
-      json(conn, status)
+    with {:ok, activity} <- TwitterAPI.repeat(user, id) do
+      render(conn, ActivityView, "activity.json", %{activity: activity, for: user})
+    end
+  end
+
+  def unretweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
+    with {:ok, activity} <- TwitterAPI.unrepeat(user, id) do
+      render(conn, ActivityView, "activity.json", %{activity: activity, for: user})
     end
   end