From 896e40cd2bbd064548a1a9cb730f79d793e6d6f5 Mon Sep 17 00:00:00 2001
From: dtluna <dtluna@openmailbox.org>
Date: Mon, 10 Apr 2017 16:38:21 +0300
Subject: [PATCH] Add following using screen_name parameter
---
lib/pleroma/web/twitter_api/twitter_api.ex | 16 +++++++++++++++-
.../web/twitter_api/twitter_api_controller.ex | 4 ++--
test/web/twitter_api/twitter_api_test.exs | 17 +++++++++++++++--
3 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index 0a942e880..f6793cc21 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -101,7 +101,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
end
- def follow(%User{} = follower, followed_id) do
+ def follow(%User{} = follower, %{ "user_id" => followed_id }) do
with %User{} = followed <- Repo.get(User, followed_id),
{ :ok, follower } <- User.follow(follower, followed),
{ :ok, activity } <- ActivityPub.insert(%{
@@ -115,6 +115,20 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
end
+ def follow(%User{} = follower, %{ "screen_name" => followed_name }) do
+ with %User{} = followed <- Repo.get_by(User, nickname: followed_name),
+ { :ok, follower } <- User.follow(follower, followed),
+ { :ok, activity } <- ActivityPub.insert(%{
+ "type" => "Follow",
+ "actor" => follower.ap_id,
+ "object" => followed.ap_id,
+ "published" => make_date()
+ })
+ do
+ { :ok, follower, followed, activity }
+ end
+ end
+
def unfollow(%User{} = follower, followed_id) do
with %User{} = followed <- Repo.get(User, followed_id),
{ :ok, follower } <- User.unfollow(follower, followed)
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index f2c893e96..dc53e09ec 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -43,8 +43,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|> json_reply(200, json)
end
- def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
- { :ok, _user, follower, _activity } = TwitterAPI.follow(user, followed_id)
+ def follow(%{assigns: %{user: user}} = conn, params) do
+ { :ok, _user, follower, _activity } = TwitterAPI.follow(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 ad932131a..65d7b0ca8 100644
--- a/test/web/twitter_api/twitter_api_test.exs
+++ b/test/web/twitter_api/twitter_api_test.exs
@@ -103,11 +103,24 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert status == ActivityRepresenter.to_map(activity, %{for: user, user: actor})
end
- test "Follow another user" do
+ test "Follow another user using user_id" do
{ :ok, user } = UserBuilder.insert
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"})
- {:ok, user, following, activity } = TwitterAPI.follow(user, following.id)
+ {:ok, user, following, activity } = TwitterAPI.follow(user, %{"user_id" => following.id})
+
+ user = Repo.get(User, user.id)
+ follow = Repo.get(Activity, activity.id)
+
+ assert user.following == [User.ap_followers(following)]
+ assert follow == activity
+ end
+
+ test "Follow another user using screen_name" do
+ { :ok, user } = UserBuilder.insert
+ { :ok, following } = UserBuilder.insert(%{nickname: "guy"})
+
+ {:ok, user, following, activity } = TwitterAPI.follow(user, %{"screen_name" => following.nickname})
user = Repo.get(User, user.id)
follow = Repo.get(Activity, activity.id)