Add favoriting to TwAPI controller.

diff --git a/TODO.txt b/TODO.txt
index 42501a6374f3ffd33b836bc5ad23db7e1b0a3c67..78cb92e2c757db1acf3291526ba3b695912d5b7d 100644 (file)
--- a/TODO.txt
+++ b/TODO.txt
@@ -1 +1,8 @@
 - Add cache for user fetching / representing. (mostly in TwitterAPI.activity_to_status)
+
+Favorites:
+- Add 'likes' to activity, collection of ids of people who liked it.
+- show if you favorited something or not.
+- Don't allow double favorites
+- Address favorites to the followers of the liked activity's author.
+

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 40350ad0c9461755942eb35fa03c25c828c3e89f..a61e32b409958edcc8433c7eb3238d59e7a784f5 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -39,5 +39,6 @@ defmodule Pleroma.Web.Router do
     post "/friendships/create", TwitterAPI.Controller, :follow
     post "/friendships/destroy", TwitterAPI.Controller, :unfollow
     post "/statusnet/media/upload", TwitterAPI.Controller, :upload
+    post "/favorites/create/:id", TwitterAPI.Controller, :favorite
   end
 end

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 3f299a941690e2a93d0e5013ecec9c53e9f90e8f..3969e92a65164000d274d7ad7b611e8f52445dff 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -2,6 +2,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   use Pleroma.Web, :controller
   alias Pleroma.Web.TwitterAPI.TwitterAPI
   alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
+  alias Pleroma.{Repo, Activity}
 
   def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
     response = user |> UserRepresenter.to_json(%{for: user})
@@ -97,6 +98,15 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> json_reply(200, response)
   end
 
+  def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
+    activity = Repo.get(Activity, id)
+    {:ok, status} = TwitterAPI.favorite(user, activity)
+    response = Poison.encode!(status)
+
+    conn
+    |> json_reply(200, response)
+  end
+
   defp json_reply(conn, status, json) do
     conn
     |> put_resp_content_type("application/json")

diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 7c75ff757e6a47c03b0f189b915f348815efa17c..728a1b6a81a0a6c2903ace01192fa4ddde2e69bb 100644 (file)
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -4,6 +4,8 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
   alias Pleroma.Builders.{ActivityBuilder, UserBuilder}
   alias Pleroma.{Repo, Activity, User}
 
+  import Pleroma.Factory
+
   describe "POST /api/account/verify_credentials" do
     setup [:valid_user]
     test "without valid credentials", %{conn: conn} do
@@ -154,6 +156,25 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
   end
 
+  describe "POST /api/favorites/create/:id" do
+    setup [:valid_user]
+    test "without valid credentials", %{conn: conn} do
+      note_activity = insert(:note_activity)
+      conn = post conn, "/api/favorites/create/#{note_activity.id}.json"
+      assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
+    end
+
+    test "with credentials", %{conn: conn, user: current_user} do
+      note_activity = insert(:note_activity)
+
+      conn = conn
+      |> with_credentials(current_user.nickname, "test")
+      |> post("/api/favorites/create/#{note_activity.id}.json")
+
+      assert json_response(conn, 200)
+    end
+  end
+
   defp valid_user(_context) do
     { :ok, user } = UserBuilder.insert(%{nickname: "lambda", ap_id: "lambda"})
     [user: user]