@@ -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]) | ||||
@@ -115,9 +115,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do | |||||
end | end | ||||
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(%{ | { :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 | |||||
with %User{} = followed <- Repo.get(User, followed_id), | |||||
{ :ok, follower } <- User.unfollow(follower, followed) | |||||
def unfollow(%User{} = follower, params) do | |||||
with { :ok, %User{} = unfollowed } <- get_user(params), | |||||
{ :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 | ||||
@@ -12,11 +12,23 @@ defmodule Pleroma.Web.TwitterAPI.Controller do | |||||
|> json_reply(200, response) | |> json_reply(200, response) | ||||
end | end | ||||
def status_update(%{assigns: %{user: user}} = conn, status_data) do | |||||
media_ids = extract_media_ids(status_data) | |||||
{:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids", media_ids )) | |||||
conn | |||||
|> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user})) | |||||
def status_update(%{assigns: %{user: user}} = conn, %{"status" => status_text} = status_data) do | |||||
if status_text |> String.trim |> String.length != 0 do | |||||
media_ids = extract_media_ids(status_data) | |||||
{:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids", media_ids )) | |||||
conn | |||||
|> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user})) | |||||
else | |||||
empty_status_reply(conn) | |||||
end | |||||
end | |||||
def status_update(conn, _status_data) do | |||||
empty_status_reply(conn) | |||||
end | |||||
defp empty_status_reply(conn) do | |||||
bad_request_reply(conn, "Client must provide a 'status' parameter with a value.") | |||||
end | end | ||||
defp extract_media_ids(status_data) do | defp extract_media_ids(status_data) do | ||||
@@ -65,8 +77,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 | |||||
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 } -> | { :ok, user, followed, _activity } -> | ||||
response = followed |> UserRepresenter.to_json(%{for: user}) | response = followed |> UserRepresenter.to_json(%{for: user}) | ||||
conn | conn | ||||
@@ -75,11 +87,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do | |||||
end | end | ||||
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 | conn | ||||
|> json_reply(200, response) | |> json_reply(200, response) | ||||
{ :error, msg } -> forbidden_json_reply(conn, msg) | { :error, msg } -> forbidden_json_reply(conn, msg) | ||||
@@ -183,7 +194,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do | |||||
end | end | ||||
defp bad_request_reply(conn, error_message) do | defp bad_request_reply(conn, error_message) do | ||||
json = Poison.encode!(%{"error" => error_message}) | |||||
json = error_json(conn, error_message) | |||||
json_reply(conn, 400, json) | json_reply(conn, 400, json) | ||||
end | end | ||||
@@ -194,9 +205,11 @@ defmodule Pleroma.Web.TwitterAPI.Controller do | |||||
end | end | ||||
defp forbidden_json_reply(conn, error_message) do | defp forbidden_json_reply(conn, error_message) do | ||||
json = %{"error" => error_message, "request" => conn.request_path} | |||||
|> Poison.encode! | |||||
json = error_json(conn, error_message) | |||||
json_reply(conn, 403, json) | json_reply(conn, 403, json) | ||||
end | end | ||||
defp error_json(conn, error_message) do | |||||
%{"error" => error_message, "request" => conn.request_path} |> Poison.encode! | |||||
end | |||||
end | end |
@@ -31,10 +31,21 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do | |||||
end | end | ||||
test "with credentials", %{conn: conn, user: user} do | test "with credentials", %{conn: conn, user: user} do | ||||
conn = conn | |||||
|> with_credentials(user.nickname, "test") | |||||
|> post("/api/statuses/update.json", %{ status: "Nice meme." }) | |||||
conn_with_creds = conn |> with_credentials(user.nickname, "test") | |||||
request_path = "/api/statuses/update.json" | |||||
error_response = %{"request" => request_path, | |||||
"error" => "Client must provide a 'status' parameter with a value."} | |||||
conn = conn_with_creds |> post(request_path) | |||||
assert json_response(conn, 400) == error_response | |||||
conn = conn_with_creds |> post(request_path, %{ status: "" }) | |||||
assert json_response(conn, 400) == error_response | |||||
conn = conn_with_creds |> post(request_path, %{ status: " " }) | |||||
assert json_response(conn, 400) == error_response | |||||
conn = conn_with_creds |> post(request_path, %{ status: "Nice meme." }) | |||||
assert json_response(conn, 200) == ActivityRepresenter.to_map(Repo.one(Activity), %{user: user}) | assert json_response(conn, 200) == ActivityRepresenter.to_map(Repo.one(Activity), %{user: user}) | ||||
end | end | ||||
end | end | ||||
@@ -139,7 +150,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do | |||||
setup [:valid_user] | setup [:valid_user] | ||||
test "without any params", %{conn: conn} do | test "without any params", %{conn: conn} do | ||||
conn = get(conn, "/api/statuses/user_timeline.json") | conn = get(conn, "/api/statuses/user_timeline.json") | ||||
assert json_response(conn, 400) == %{"error" => "You need to specify screen_name or user_id"} | |||||
assert json_response(conn, 400) == %{"error" => "You need to specify screen_name or user_id", "request" => "/api/statuses/user_timeline.json"} | |||||
end | end | ||||
test "with user_id", %{conn: conn} do | test "with user_id", %{conn: conn} do | ||||
@@ -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}) | |||||
assert user.following == [User.ap_followers(followed)] | |||||
{ :error, msg } = TwitterAPI.follow(user, %{"user_id" => followed.id}) | |||||
assert msg == "Could not follow user: #{followed.nickname} is already on your list." | |||||
end | |||||
user = Repo.get(User, user.id) | |||||
follow = Repo.get(Activity, activity.id) | |||||
test "Follow another user using screen_name" do | |||||
user = insert(:user) | |||||
followed = insert(:user) | |||||
{:ok, user, followed, _activity } = TwitterAPI.follow(user, %{"screen_name" => followed.nickname}) | |||||
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, %{"screen_name" => followed.nickname}) | |||||
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 | |||||
followed = insert(:user) | |||||
user = insert(:user, %{following: [User.ap_followers(followed)]}) | |||||
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 == [] | |||||
{ :ok, user, _followed } = TwitterAPI.unfollow(user, followed.id) | |||||
{ :error, msg } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id}) | |||||
assert msg == "Not subscribed!" | |||||
end | |||||
user = Repo.get(User, user.id) | |||||
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 == [] | assert user.following == [] | ||||
{ :error, msg } = TwitterAPI.unfollow(user, followed.id) | |||||
{ :error, msg } = TwitterAPI.unfollow(user, %{"screen_name" => unfollowed.nickname}) | |||||
assert msg == "Not subscribed!" | assert msg == "Not subscribed!" | ||||
end | end | ||||