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

Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name

Browse source
This commit is contained in:
dtluna 2017-04-20 10:39:18 +03:00
commit d952b6cd7b
3 changed files with 20 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -108,9 +108,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
end
def follow(%User{} = follower, followed_id) do
with %User{} = followed <- Repo.get(User, followed_id),
{ :ok, follower } <- User.follow(follower, followed),
def follow(%User{} = follower, params) do
with { :ok, %User{} = followed } <- get_user(params),
{ :ok, follower } <- User.follow(follower, followed),
{ :ok, activity } <- ActivityPub.insert(%{
"type" => "Follow",
"actor" => follower.ap_id,
@ -259,7 +259,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
end
def get_user(user, params) do
def get_user(user \\ nil, params) do
case params do
%{ "user_id" => user_id } ->
case target = Repo.get(User, user_id) do

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

@ -57,8 +57,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end
end
def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
case TwitterAPI.follow(user, followed_id) do
def follow(%{assigns: %{user: user}} = conn, params) do
case TwitterAPI.follow(user, params) do
{ :ok, user, followed, _activity } ->
response = followed |> UserRepresenter.to_json(%{for: user})
conn