Commit 30650e5b authored by lain's avatar lain

Add unfollowing to TwAPI.

parent 75e51b19
......@@ -43,4 +43,14 @@ def follow(%User{} = follower, %User{} = followed) do
|> follow_changeset(%{following: following})
|> Repo.update
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
......@@ -32,5 +32,6 @@ def user_fetcher(username) do
post "/statuses/update.json", TwitterAPI.Controller, :status_update
get "/statuses/friends_timeline.json", TwitterAPI.Controller, :friends_timeline
post "/friendships/create.json", TwitterAPI.Controller, :follow
post "/friendships/destroy.json", TwitterAPI.Controller, :unfollow
end
end
......@@ -42,6 +42,14 @@ def follow(%User{} = follower, followed_id) do
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
Enum.map(activities, fn(activity) ->
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)
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
conn
|> 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)
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, 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)]
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
......@@ -99,6 +99,29 @@ test "with credentials", %{conn: conn, user: current_user} do
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
{ :ok, user } = UserBuilder.insert(%{nickname: "lambda", ap_id: "lambda"})
[user: user]
......
......@@ -51,4 +51,15 @@ test "Follow another user" do
assert user.following == [User.ap_followers(following)]
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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment