Merge branch 'develop' into dtluna/pleroma-bugfix/deny-empty-posts

This commit is contained in:
Roger Braun 2017-04-25 11:09:14 +02:00
commit 6529cab982
4 changed files with 43 additions and 28 deletions

View File

@ -63,6 +63,7 @@ defmodule Pleroma.User do
|> validate_confirmation(:password) |> validate_confirmation(:password)
|> unique_constraint(:email) |> unique_constraint(:email)
|> unique_constraint(:nickname) |> unique_constraint(:nickname)
|> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
if changeset.valid? do if changeset.valid? do
hashed = Comeonin.Pbkdf2.hashpwsalt(changeset.changes[:password]) hashed = Comeonin.Pbkdf2.hashpwsalt(changeset.changes[:password])

View File

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

View File

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

View File

@ -155,32 +155,47 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
assert status == ActivityRepresenter.to_map(activity, %{for: user, user: actor}) assert status == ActivityRepresenter.to_map(activity, %{for: user, user: actor})
end end
test "Follow another user" do test "Follow another user using user_id" do
user = insert(:user) user = insert(:user)
followed = insert(:user) followed = insert(:user)
{ :ok, user, followed, activity } = TwitterAPI.follow(user, followed.id) {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"user_id" => followed.id})
user = Repo.get(User, user.id)
follow = Repo.get(Activity, activity.id)
assert user.following == [User.ap_followers(followed)] assert user.following == [User.ap_followers(followed)]
assert follow == activity
{ :error, msg } = TwitterAPI.follow(user, followed.id) { :error, msg } = TwitterAPI.follow(user, %{"user_id" => followed.id})
assert msg == "Could not follow user: #{followed.nickname} is already on your list." assert msg == "Could not follow user: #{followed.nickname} is already on your list."
end end
test "Unfollow another user" do test "Follow another user using screen_name" do
user = insert(:user)
followed = insert(:user) followed = insert(:user)
user = insert(:user, %{following: [User.ap_followers(followed)]})
{ :ok, user, _followed } = TwitterAPI.unfollow(user, followed.id) {:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
assert user.following == [User.ap_followers(followed)]
user = Repo.get(User, user.id) { :error, msg } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname})
assert msg == "Could not follow user: #{followed.nickname} is already on your list."
end
test "Unfollow another user using user_id" do
unfollowed = insert(:user)
user = insert(:user, %{following: [User.ap_followers(unfollowed)]})
{:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
assert user.following == [] assert user.following == []
{ :error, msg } = TwitterAPI.unfollow(user, followed.id)
{ :error, msg } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id})
assert msg == "Not subscribed!"
end
test "Unfollow another user using screen_name" do
unfollowed = insert(:user)
user = insert(:user, %{following: [User.ap_followers(unfollowed)]})
{:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
assert user.following == []
{ :error, msg } = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname})
assert msg == "Not subscribed!" assert msg == "Not subscribed!"
end end