Commit 896e40cd authored by dtluna's avatar dtluna
Browse files

Add following using screen_name parameter

parent b5e94bf9
......@@ -101,7 +101,7 @@ def fetch_status(user, id) 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 @@ def follow(%User{} = follower, followed_id) 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)
......
......@@ -43,8 +43,8 @@ def friends_timeline(%{assigns: %{user: user}} = conn, params) 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})
......
......@@ -103,11 +103,24 @@ test "fetch a single status" 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)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment