Merge branch 'missing-mastodon-follow-endpoint' into 'develop'

Add missing mastodon follow endpoint.

See merge request pleroma/pleroma!2

lib/pleroma/web/mastodon_api/mastodon_api_controller.ex

@@ -269,11 +269,16 @@ def following(conn, %{"id" => id}) do
     end
   end
 
-  def follow(%{assigns: %{user: follower}} = conn, %{"id" => id}) do
+  def follow(%{assigns: %{user: follower}} = conn, params) do
-    with %User{} = followed <- Repo.get(User, id),
+    with {:ok, %User{} = followed} <- get_user(params),
-       {:ok, follower} <- User.follow(follower, followed),
+         {:ok, follower} <- User.follow(follower, followed),
-       {:ok, activity} <- ActivityPub.follow(follower, followed) do
+         {:ok, activity} <- ActivityPub.follow(follower, followed) do
       render conn, AccountView, "relationship.json", %{user: follower, target: followed}
+    else
+      {:error, message} = err ->
+        conn
+        |> put_resp_content_type("application/json")
+        |> send_resp(403, Poison.encode!(%{"error" => message}))
     end
   end
 
@@ -338,4 +343,25 @@ def empty_array(conn, _) do
     Logger.debug("Unimplemented, returning an empty array")
     json(conn, [])
   end
+
+  defp get_user(params) do
+    case params do
+      %{"uri" => uri} ->
+        case target = Repo.get_by(User, nickname: uri) do
+          nil ->
+            {:error, "No user with such nickname"}
+          _ ->
+            {:ok, target}
+        end
+      %{"id" => id} ->
+        case target = Repo.get(User, id) do
+          nil ->
+            {:error, "No user with such id"}
+          _ ->
+            {:ok, target}
+        end
+      _ ->
+        {:error, "You need to specify uri or id"}
+    end
+  end
 end

lib/pleroma/web/router.ex

@@ -62,6 +62,8 @@ def user_fetcher(username) do
     post "/accounts/:id/mute", MastodonAPIController, :relationship_noop
     post "/accounts/:id/unmute", MastodonAPIController, :relationship_noop
 
+    post "/follows", MastodonAPIController, :follow
+
     get "/blocks", MastodonAPIController, :empty_array
     get "/domain_blocks", MastodonAPIController, :empty_array
     get "/follow_requests", MastodonAPIController, :empty_array

test/web/mastodon_api/mastodon_api_controller_test.exs

@@ -281,6 +281,13 @@ test "following / unfollowing a user", %{conn: conn} do
     |> post("/api/v1/accounts/#{other_user.id}/unfollow")
 
     assert %{"id" => id, "following" => false} = json_response(conn, 200)
+
+    user = Repo.get(User, user.id)
+    conn = build_conn()
+    |> assign(:user, user)
+    |> post("/api/v1/follows", %{"uri" => other_user.nickname})
+
+    assert %{"id" => id, "following" => true} = json_response(conn, 200)
   end
 
   test "unimplemented block/mute endpoints" do