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

Merge branch 'feature/unfollow-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:46:27 +03:00
commit 01901d9835
3 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -124,7 +124,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
end
def unfollow(%User{} = follower, followed_id) do
def unfollow(%User{} = follower, %{ "user_id" => followed_id }) do
with %User{} = followed <- Repo.get(User, followed_id),
{ :ok, follower } <- User.unfollow(follower, followed)
do
@ -134,6 +134,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
end
def unfollow(%User{} = follower, %{ "screen_name" => followed_name }) do
with %User{} = followed <- Repo.get_by(User, nickname: followed_name),
{ :ok, follower } <- User.unfollow(follower, followed)
do
{ :ok, follower, followed }
end
end
def favorite(%User{} = user, %Activity{data: %{"object" => object}} = activity) do
object = Object.get_by_ap_id(object["id"])

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

@ -67,11 +67,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end
end
def unfollow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
case TwitterAPI.unfollow(user, followed_id) do
{ :ok, user, followed } ->
response = followed |> UserRepresenter.to_json(%{for: user})
def unfollow(%{assigns: %{user: user}} = conn, params) do
case TwitterAPI.unfollow(user, params) do
{ :ok, user, unfollowed, } ->
response = unfollowed |> UserRepresenter.to_json(%{for: user})
conn
|> json_reply(200, response)
{ :error, msg } -> forbidden_json_reply(conn, msg)