hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add following using screen_name parameter

Browse source
This commit is contained in:
dtluna 2017-04-10 16:38:21 +03:00
commit 896e40cd2b
3 changed files with 32 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/pleroma/web/twitter_api/twitter_api.ex
View file

@ -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)

4
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file

@ -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})