7 files changed, 75 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 29fd1de8b..a10b43b78 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -43,4 +43,14 @@ defmodule Pleroma.User do
     |> follow_changeset(%{following: following})
     |> Repo.update
   end
+
+  def unfollow(%User{} = follower, %User{} = followed) do
+    ap_followers = User.ap_followers(followed)
+    following = follower.following
+    |> List.delete(ap_followers)
+
+    follower
+    |> follow_changeset(%{following: following})
+    |> Repo.update
+  end
 end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 6d854c538..e7d0b9437 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -32,5 +32,6 @@ defmodule Pleroma.Web.Router do
     post "/statuses/update.json", TwitterAPI.Controller, :status_update
     get "/statuses/friends_timeline.json", TwitterAPI.Controller, :friends_timeline
     post "/friendships/create.json", TwitterAPI.Controller, :follow
+    post "/friendships/destroy.json", TwitterAPI.Controller, :unfollow
   end
 end
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index fb093b227..2ef679397 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -42,6 +42,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     end
   end
 
+  def unfollow(%User{} = follower, followed_id) do
+    with %User{} = followed <- Repo.get(User, followed_id),
+         { :ok, follower } <- User.unfollow(follower, followed)
+    do
+      { :ok, follower, followed }
+    end
+  end
+
   defp activities_to_statuses(activities) do
     Enum.map(activities, fn(activity) ->
       actor = get_in(activity.data, ["actor"])
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index ac319b109..d574f1003 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -41,6 +41,16 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> json_reply(200, response)
   end
 
+  def unfollow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
+    { :ok, _user, follower } = TwitterAPI.unfollow(user, followed_id)
+
+    response = follower |> UserRepresenter.to_json
+
+    conn
+    |> json_reply(200, response)
+  end
+
+
   defp json_reply(conn, status, json) do
     conn
     |> put_resp_content_type("application/json")
diff --git a/test/user_test.exs b/test/user_test.exs
index e39c0be31..e11bade93 100644
--- a/test/user_test.exs
+++ b/test/user_test.exs
@@ -24,7 +24,7 @@ defmodule Pleroma.UserTest do
     assert expected_followers_collection == User.ap_followers(user)
   end
 
-  test "follow takes a user and an id and tries to follow another user" do
+  test "follow takes a user and another user" do
     { :ok, user } = UserBuilder.insert
     { :ok, following } = UserBuilder.insert(%{nickname: "guy"})
 
@@ -34,4 +34,15 @@ defmodule Pleroma.UserTest do
 
     assert user.following == [User.ap_followers(following)]
   end
+
+  test "unfollow takes a user and another user" do
+    { :ok, following } = UserBuilder.insert(%{nickname: "guy"})
+    { :ok, user } = UserBuilder.insert(%{following: [User.ap_followers(following)]})
+
+    {:ok, user } = User.unfollow(user, following)
+
+    user = Repo.get(User, user.id)
+
+    assert user.following == []
+  end
 end
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index a504393be..b0a0cdb54 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -99,6 +99,29 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
     end
   end
 
+  describe "POST /friendships/destroy.json" do
+    setup [:valid_user]
+    test "without valid credentials", %{conn: conn} do
+      conn = post conn, "/api/friendships/destroy.json"
+      assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
+    end
+
+    test "with credentials", %{conn: conn, user: current_user} do
+      {:ok, followed } = UserBuilder.insert(%{name: "some guy"})
+
+      {:ok, current_user} = User.follow(current_user, followed)
+      assert current_user.following == [User.ap_followers(followed)]
+
+      conn = conn
+      |> with_credentials(current_user.nickname, "test")
+      |> post("/api/friendships/destroy.json", %{user_id: followed.id})
+
+      current_user = Repo.get(User, current_user.id)
+      assert current_user.following == []
+      assert json_response(conn, 200) == UserRepresenter.to_map(followed)
+    end
+  end
+
   defp valid_user(_context) do
     { :ok, user } = UserBuilder.insert(%{nickname: "lambda", ap_id: "lambda"})
     [user: user]
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index c9f79d2ff..3cb3196d9 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -51,4 +51,15 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
 
     assert user.following == [User.ap_followers(following)]
   end
+
+  test "Unfollow another user" do
+    { :ok, following } = UserBuilder.insert(%{nickname: "guy"})
+    { :ok, user } = UserBuilder.insert(%{following: [User.ap_followers(following)]})
+
+    {:ok, user, _following } = TwitterAPI.unfollow(user, following.id)
+
+    user = Repo.get(User, user.id)
+
+    assert user.following == []
+  end
 end