forked from AkkomaGang/akkoma
Add unfollowing to TwAPI.
This commit is contained in:
parent
75e51b190d
commit
30650e5bc6
7 changed files with 75 additions and 1 deletions
lib/pleroma
test
|
@ -43,4 +43,14 @@ def follow(%User{} = follower, %User{} = followed) do
|
||||||
|> follow_changeset(%{following: following})
|
|> follow_changeset(%{following: following})
|
||||||
|> Repo.update
|
|> Repo.update
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def unfollow(%User{} = follower, %User{} = followed) do
|
||||||
|
ap_followers = User.ap_followers(followed)
|
||||||
|
following = follower.following
|
||||||
|
|> List.delete(ap_followers)
|
||||||
|
|
||||||
|
follower
|
||||||
|
|> follow_changeset(%{following: following})
|
||||||
|
|> Repo.update
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -32,5 +32,6 @@ def user_fetcher(username) do
|
||||||
post "/statuses/update.json", TwitterAPI.Controller, :status_update
|
post "/statuses/update.json", TwitterAPI.Controller, :status_update
|
||||||
get "/statuses/friends_timeline.json", TwitterAPI.Controller, :friends_timeline
|
get "/statuses/friends_timeline.json", TwitterAPI.Controller, :friends_timeline
|
||||||
post "/friendships/create.json", TwitterAPI.Controller, :follow
|
post "/friendships/create.json", TwitterAPI.Controller, :follow
|
||||||
|
post "/friendships/destroy.json", TwitterAPI.Controller, :unfollow
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -42,6 +42,14 @@ def follow(%User{} = follower, followed_id) do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def unfollow(%User{} = follower, followed_id) do
|
||||||
|
with %User{} = followed <- Repo.get(User, followed_id),
|
||||||
|
{ :ok, follower } <- User.unfollow(follower, followed)
|
||||||
|
do
|
||||||
|
{ :ok, follower, followed }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
defp activities_to_statuses(activities) do
|
defp activities_to_statuses(activities) do
|
||||||
Enum.map(activities, fn(activity) ->
|
Enum.map(activities, fn(activity) ->
|
||||||
actor = get_in(activity.data, ["actor"])
|
actor = get_in(activity.data, ["actor"])
|
||||||
|
|
|
@ -41,6 +41,16 @@ def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
|
||||||
|> json_reply(200, response)
|
|> json_reply(200, response)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def unfollow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
|
||||||
|
{ :ok, _user, follower } = TwitterAPI.unfollow(user, followed_id)
|
||||||
|
|
||||||
|
response = follower |> UserRepresenter.to_json
|
||||||
|
|
||||||
|
conn
|
||||||
|
|> json_reply(200, response)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
defp json_reply(conn, status, json) do
|
defp json_reply(conn, status, json) do
|
||||||
conn
|
conn
|
||||||
|> put_resp_content_type("application/json")
|
|> put_resp_content_type("application/json")
|
||||||
|
|
|
@ -24,7 +24,7 @@ test "ap_followers returns the followers collection for the user" do
|
||||||
assert expected_followers_collection == User.ap_followers(user)
|
assert expected_followers_collection == User.ap_followers(user)
|
||||||
end
|
end
|
||||||
|
|
||||||
test "follow takes a user and an id and tries to follow another user" do
|
test "follow takes a user and another user" do
|
||||||
{ :ok, user } = UserBuilder.insert
|
{ :ok, user } = UserBuilder.insert
|
||||||
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"})
|
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"})
|
||||||
|
|
||||||
|
@ -34,4 +34,15 @@ test "follow takes a user and an id and tries to follow another user" do
|
||||||
|
|
||||||
assert user.following == [User.ap_followers(following)]
|
assert user.following == [User.ap_followers(following)]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "unfollow takes a user and another user" do
|
||||||
|
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"})
|
||||||
|
{ :ok, user } = UserBuilder.insert(%{following: [User.ap_followers(following)]})
|
||||||
|
|
||||||
|
{:ok, user } = User.unfollow(user, following)
|
||||||
|
|
||||||
|
user = Repo.get(User, user.id)
|
||||||
|
|
||||||
|
assert user.following == []
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -99,6 +99,29 @@ test "with credentials", %{conn: conn, user: current_user} do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe "POST /friendships/destroy.json" do
|
||||||
|
setup [:valid_user]
|
||||||
|
test "without valid credentials", %{conn: conn} do
|
||||||
|
conn = post conn, "/api/friendships/destroy.json"
|
||||||
|
assert json_response(conn, 403) == %{"error" => "Invalid credentials."}
|
||||||
|
end
|
||||||
|
|
||||||
|
test "with credentials", %{conn: conn, user: current_user} do
|
||||||
|
{:ok, followed } = UserBuilder.insert(%{name: "some guy"})
|
||||||
|
|
||||||
|
{:ok, current_user} = User.follow(current_user, followed)
|
||||||
|
assert current_user.following == [User.ap_followers(followed)]
|
||||||
|
|
||||||
|
conn = conn
|
||||||
|
|> with_credentials(current_user.nickname, "test")
|
||||||
|
|> post("/api/friendships/destroy.json", %{user_id: followed.id})
|
||||||
|
|
||||||
|
current_user = Repo.get(User, current_user.id)
|
||||||
|
assert current_user.following == []
|
||||||
|
assert json_response(conn, 200) == UserRepresenter.to_map(followed)
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
defp valid_user(_context) do
|
defp valid_user(_context) do
|
||||||
{ :ok, user } = UserBuilder.insert(%{nickname: "lambda", ap_id: "lambda"})
|
{ :ok, user } = UserBuilder.insert(%{nickname: "lambda", ap_id: "lambda"})
|
||||||
[user: user]
|
[user: user]
|
||||||
|
|
|
@ -51,4 +51,15 @@ test "Follow another user" do
|
||||||
|
|
||||||
assert user.following == [User.ap_followers(following)]
|
assert user.following == [User.ap_followers(following)]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "Unfollow another user" do
|
||||||
|
{ :ok, following } = UserBuilder.insert(%{nickname: "guy"})
|
||||||
|
{ :ok, user } = UserBuilder.insert(%{following: [User.ap_followers(following)]})
|
||||||
|
|
||||||
|
{:ok, user, _following } = TwitterAPI.unfollow(user, following.id)
|
||||||
|
|
||||||
|
user = Repo.get(User, user.id)
|
||||||
|
|
||||||
|
assert user.following == []
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue