Add following using screen_name parameter
This commit is contained in:
parent
b5e94bf930
commit
896e40cd2b
3 changed files with 32 additions and 5 deletions
|
@ -101,7 +101,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|
||||||
end
|
end
|
||||||
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),
|
with %User{} = followed <- Repo.get(User, followed_id),
|
||||||
{ :ok, follower } <- User.follow(follower, followed),
|
{ :ok, follower } <- User.follow(follower, followed),
|
||||||
{ :ok, activity } <- ActivityPub.insert(%{
|
{ :ok, activity } <- ActivityPub.insert(%{
|
||||||
|
@ -115,6 +115,20 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|
||||||
end
|
end
|
||||||
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
|
def unfollow(%User{} = follower, followed_id) do
|
||||||
with %User{} = followed <- Repo.get(User, followed_id),
|
with %User{} = followed <- Repo.get(User, followed_id),
|
||||||
{ :ok, follower } <- User.unfollow(follower, followed)
|
{ :ok, follower } <- User.unfollow(follower, followed)
|
||||||
|
|
|
@ -43,8 +43,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|
||||||
|> json_reply(200, json)
|
|> json_reply(200, json)
|
||||||
end
|
end
|
||||||
|
|
||||||
def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
|
def follow(%{assigns: %{user: user}} = conn, params) do
|
||||||
{ :ok, _user, follower, _activity } = TwitterAPI.follow(user, followed_id)
|
{ :ok, _user, follower, _activity } = TwitterAPI.follow(user, params)
|
||||||
|
|
||||||
response = follower |> UserRepresenter.to_json(%{for: user})
|
response = follower |> UserRepresenter.to_json(%{for: user})
|
||||||
|
|
||||||
|
|
|
@ -103,11 +103,24 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
assert status == ActivityRepresenter.to_map(activity, %{for: user, user: actor})
|
assert status == ActivityRepresenter.to_map(activity, %{for: user, user: actor})
|
||||||
end
|
end
|
||||||
|
|
||||||
test "Follow another user" do
|
test "Follow another user using user_id" do
|
||||||
{ :ok, user } = UserBuilder.insert
|
{ :ok, user } = UserBuilder.insert
|
||||||
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"})
|
{ :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)
|
user = Repo.get(User, user.id)
|
||||||
follow = Repo.get(Activity, activity.id)
|
follow = Repo.get(Activity, activity.id)
|
||||||
|
|
Loading…
Reference in a new issue