3 files changed, 24 insertions, 5 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 735d88832..569ef5d14 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -117,7 +117,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     end
   end
 
-  def unfollow(%User{} = follower, followed_id) do
+  def unfollow(%User{} = follower, %{ "user_id" => followed_id }) do
     with %User{} = followed <- Repo.get(User, followed_id),
          { :ok, follower } <- User.unfollow(follower, followed)
     do
@@ -125,6 +125,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
     end
   end
 
+  def unfollow(%User{} = follower, %{ "screen_name" => followed_name }) do
+    with %User{} = followed <- Repo.get_by(User, nickname: followed_name),
+         { :ok, follower } <- User.unfollow(follower, followed)
+      do
+      { :ok, follower, followed }
+    end
+  end
+
   def favorite(%User{} = user, %Activity{data: %{"object" => object}} = activity) do
     object = Object.get_by_ap_id(object["id"])
 
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index b0287a7f4..b70af3b09 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -54,8 +54,8 @@ 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)
+  def unfollow(%{assigns: %{user: user}} = conn, params) do
+    { :ok, user, follower } = TwitterAPI.unfollow(user, params)
 
     response = follower |> UserRepresenter.to_json(%{for: user})
 
diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs
index 1e5204db8..3d16a2049 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -125,11 +125,22 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
     assert follow == activity
   end
 
-  test "Unfollow another user" do
+  test "Unfollow another user using user_id" do
     following = insert(:user)
     user = insert(:user, %{following: [User.ap_followers(following)]})
 
-    {:ok, user, _following } = TwitterAPI.unfollow(user, following.id)
+    {:ok, user, _following } = TwitterAPI.unfollow(user, %{"user_id" => following.id})
+
+    user = Repo.get(User, user.id)
+
+    assert user.following == []
+  end
+
+  test "Unfollow another user using screen_name" do
+    following = insert(:user)
+    user = insert(:user, %{following: [User.ap_followers(following)]})
+
+    {:ok, user, _following } = TwitterAPI.unfollow(user, %{"screen_name" => following.nickname})
 
     user = Repo.get(User, user.id)