From 8e766ca1f056db3289e85713c96af80986f0cd5b Mon Sep 17 00:00:00 2001 From: dtluna Date: Tue, 20 Jun 2017 17:34:15 +0300 Subject: [PATCH] Move user related functions to UserController --- lib/pleroma/user.ex | 28 ++++- lib/pleroma/web/router.ex | 14 +-- .../controllers/user_controller.ex | 107 +++++++++++++++++ lib/pleroma/web/twitter_api/twitter_api.ex | 90 --------------- .../web/twitter_api/twitter_api_controller.ex | 79 +++---------- test/user_test.exs | 21 +++- test/web/twitter_api/twitter_api_test.exs | 109 +----------------- 7 files changed, 169 insertions(+), 279 deletions(-) create mode 100644 lib/pleroma/web/twitter_api/controllers/user_controller.ex diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 869a3eb1b..3f502ce59 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -5,7 +5,6 @@ defmodule Pleroma.User do alias Pleroma.{Repo, User, Object, Web} alias Comeonin.Pbkdf2 alias Pleroma.Web.{OStatus, Websub} - alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.Utils schema "users" do @@ -164,11 +163,36 @@ defmodule Pleroma.User do with %User{} = user <- get_by_nickname(nickname) do user else _e -> - with [nick, domain] <- String.split(nickname, "@"), + with [_nick, _domain] <- String.split(nickname, "@"), {:ok, user} <- OStatus.make_user(nickname) do user else _e -> nil end end end + + def get_by_params(user \\ nil, params) do + case params do + %{"user_id" => user_id} -> + case target = Repo.get(User, user_id) do + nil -> + {:not_found, "No user with such user_id"} + _ -> + {:ok, target} + end + %{"screen_name" => nickname} -> + case target = Repo.get_by(User, nickname: nickname) do + nil -> + {:not_found, "No user with such screen_name"} + _ -> + {:ok, target} + end + _ -> + if user do + {:ok, user} + else + {:bad_request, "You need to specify screen_name or user_id"} + end + end + end end diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 5f78ff97f..140787587 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -38,16 +38,16 @@ defmodule Pleroma.Web.Router do get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation - post "/account/register", TwitterAPI.Controller, :register + post "/account/register", TwitterAPI.UserController, :register - get "/externalprofile/show", TwitterAPI.Controller, :external_profile + get "/externalprofile/show", TwitterAPI.UserController, :external_profile end scope "/api", Pleroma.Web do pipe_through :authenticated_api - get "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials - post "/account/verify_credentials", TwitterAPI.Controller, :verify_credentials + get "/account/verify_credentials", TwitterAPI.UserController, :verify_credentials + post "/account/verify_credentials", TwitterAPI.UserController, :verify_credentials get "/statuses/home_timeline", TwitterAPI.Controller, :friends_timeline get "/statuses/friends_timeline", TwitterAPI.Controller, :friends_timeline @@ -57,8 +57,8 @@ defmodule Pleroma.Web.Router do post "/statuses/update", TwitterAPI.Controller, :status_update post "/statuses/retweet/:id", TwitterAPI.Controller, :retweet - post "/friendships/create", TwitterAPI.Controller, :follow - post "/friendships/destroy", TwitterAPI.Controller, :unfollow + post "/friendships/create", TwitterAPI.UserController, :follow + post "/friendships/destroy", TwitterAPI.UserController, :unfollow post "/statusnet/media/upload", TwitterAPI.Controller, :upload post "/media/upload", TwitterAPI.Controller, :upload_json @@ -67,7 +67,7 @@ defmodule Pleroma.Web.Router do post "/favorites/create", TwitterAPI.Controller, :favorite post "/favorites/destroy/:id", TwitterAPI.Controller, :unfavorite - post "/qvitter/update_avatar", TwitterAPI.Controller, :update_avatar + post "/qvitter/update_avatar", TwitterAPI.UserController, :update_avatar end pipeline :ostatus do diff --git a/lib/pleroma/web/twitter_api/controllers/user_controller.ex b/lib/pleroma/web/twitter_api/controllers/user_controller.ex new file mode 100644 index 000000000..f28898371 --- /dev/null +++ b/lib/pleroma/web/twitter_api/controllers/user_controller.ex @@ -0,0 +1,107 @@ +defmodule Pleroma.Web.TwitterAPI.UserController do + use Pleroma.Web, :controller + alias Ecto.Changeset + alias Pleroma.{Activity, Object, Repo, User} + alias Pleroma.Web.ActivityPub.ActivityPub + alias Pleroma.Web.OStatus + alias Pleroma.Web.TwitterAPI.{ErrorView, Utils} + + @httpoison Application.get_env(:pleroma, :httpoison) + + def verify_credentials(%{assigns: %{user: user}} = conn, _params) do + render conn, "show.json", %{user: user, for: user} + end + + #TODO: DRY the code + + def follow(%{assigns: %{user: follower}} = conn, params) do + case find_user(conn, params) do + {:ok, followed = %User{}} -> + case User.follow(follower, followed) do + {:ok, follower = %User{}} -> + {:ok, _activity} = ActivityPub.follow(follower, followed) + render conn, "show.json", %{user: followed, for: follower} + {:error, message} -> + conn + |> put_status(:bad_request) + |> render(ErrorView, "error.json", %{request_path: conn.request_path, message: message}) + end + {:error, response} -> response + end + end + + def unfollow(%{assigns: %{user: follower}} = conn, params) do + case find_user(conn, params) do + {:ok, unfollowed = %User{}} -> + case User.unfollow(follower, unfollowed) do + {:ok, follower = %User{ap_id: ap_id}, %Activity{data: %{"id" => id}}} -> + {:ok, _activity} = ActivityPub.insert(%{ + "type" => "Undo", + "actor" => ap_id, + "object" => id, # get latest Follow for these users + "published" => Utils.make_date() + }) + render conn, "show.json", %{user: unfollowed, for: follower} + {:error, message} -> + conn + |> put_status(:bad_request) + |> render(ErrorView, "error.json", %{request_path: conn.request_path, message: message}) + end + {:error, response} -> response + end + end + + def register(conn, params) do + params = %{ + nickname: params["nickname"], + name: params["fullname"], + bio: params["bio"], + email: params["email"], + password: params["password"], + password_confirmation: params["confirm"] + } + + changeset = User.register_changeset(%User{}, params) + + with {:ok, user} <- Repo.insert(changeset) do + render conn, "show.json", %{user: user} + else + {:error, changeset} -> + errors = Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end) + conn + |> put_status(:bad_request) + |> render(ErrorView, "error.json", + %{request_path: conn.request_path, message: Poison.encode!(errors)}) + end + end + + def update_avatar(%{assigns: %{user: user}} = conn, params) do + {:ok, %Object{data: data}} = ActivityPub.upload(params) + change = Changeset.change(user, %{avatar: data}) + {:ok, user} = Repo.update(change) + render conn, "show.json", %{user: user} + end + + def external_profile(%{assigns: %{user: current_user}} = conn, %{"profileurl" => uri}) do + with {:ok, %User{} = user} <- OStatus.find_or_make_user(uri) do + with url <- user.info["topic"], + {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do + OStatus.handle_incoming(body) + end + render(conn, "show.json", %{user: user, for: current_user}) + else _e -> + {:error, "Couldn't find user"} + end + end + + def find_user(%{assigns: %{user: user}} = conn, params) do + case User.get_by_params(user, params) do + {:ok, user = %User{}} -> {:ok, user} + {status, message} -> + response = conn + |> put_status(status) + |> render(ErrorView, "error.json", %{request_path: conn.request_path, message: message}) + {:error, response} + end + end +end diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 93db3aeed..50b84c310 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -1,14 +1,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do alias Pleroma.{User, Activity, Repo, Object} alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.TwitterAPI.{UserView, Utils} - alias Pleroma.Web.OStatus alias Pleroma.Formatter import Pleroma.Web.TwitterAPI.Utils - @httpoison Application.get_env(:pleroma, :httpoison) - def to_for_user_and_mentions(user, mentions, inReplyTo) do default_to = [ User.ap_followers(user), @@ -42,33 +38,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do end end - def follow(%User{} = follower, params) do - with {:ok, %User{} = followed} <- get_user(params), - {:ok, follower} <- User.follow(follower, followed), - {:ok, activity} <- ActivityPub.follow(follower, followed) - do - {:ok, follower, followed, activity} - else - err -> err - end - end - - def unfollow(%User{} = follower, params) do - with { :ok, %User{} = unfollowed } <- get_user(params), - { :ok, follower, follow_activity } <- User.unfollow(follower, unfollowed), - { :ok, _activity } <- ActivityPub.insert(%{ - "type" => "Undo", - "actor" => follower.ap_id, - "object" => follow_activity.data["id"], # get latest Follow for these users - "published" => Utils.make_date() - }) - do - { :ok, follower, unfollowed } - else - err -> err - end - end - def favorite(%User{} = user, %Activity{data: %{"object" => object}} = activity) do object = Object.get_by_ap_id(object["id"]) @@ -133,28 +102,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do end end - def register_user(params) do - params = %{ - nickname: params["nickname"], - name: params["fullname"], - bio: params["bio"], - email: params["email"], - password: params["password"], - password_confirmation: params["confirm"] - } - - changeset = User.register_changeset(%User{}, params) - - with {:ok, user} <- Repo.insert(changeset) do - {:ok, user} - else - {:error, changeset} -> - errors = Ecto.Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end) - |> Poison.encode! - {:error, %{error: errors}} - end - end - def get_by_id_or_nickname(id_or_nickname) do if !is_integer(id_or_nickname) && :error == Integer.parse(id_or_nickname) do Repo.get_by(User, nickname: id_or_nickname) @@ -163,31 +110,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do end end - def get_user(user \\ nil, params) do - case params do - %{"user_id" => user_id} -> - case target = get_by_id_or_nickname(user_id) do - nil -> - {:error, "No user with such user_id"} - _ -> - {:ok, target} - end - %{"screen_name" => nickname} -> - case target = Repo.get_by(User, nickname: nickname) do - nil -> - {:error, "No user with such screen_name"} - _ -> - {:ok, target} - end - _ -> - if user do - {:ok, user} - else - {:error, "You need to specify screen_name or user_id"} - end - end - end - def context_to_conversation_id(context) do with %Object{id: id} <- Object.get_cached_by_ap_id(context) do id @@ -209,16 +131,4 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do {:error, "No such conversation"} end end - - def get_external_profile(for_user, uri) do - with {:ok, %User{} = user} <- OStatus.find_or_make_user(uri) do - with url <- user.info["topic"], - {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do - OStatus.handle_incoming(body) - end - {:ok, UserView.render("show.json", %{user: user, for: for_user})} - else _e -> - {:error, "Couldn't find user"} - end - end end diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex index ed16e6dd7..77d51a835 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -1,13 +1,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do use Pleroma.Web, :controller - alias Pleroma.Web.TwitterAPI.{ErrorView, StatusView, TwitterAPI, UserView} - alias Pleroma.{Web, Repo, Activity} + alias Pleroma.Web.TwitterAPI.{ErrorView, StatusView, TwitterAPI} + alias Pleroma.{Web, Repo, Activity, User} alias Pleroma.Web.ActivityPub.ActivityPub - alias Ecto.Changeset - - def verify_credentials(%{assigns: %{user: user}} = conn, _params) do - render(conn, UserView, "show.json", %{user: user}) - end def status_update(%{assigns: %{user: user}} = conn, %{"status" => status_text} = status_data) do l = status_text |> String.trim |> String.length @@ -25,7 +20,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end defp empty_status_reply(conn) do - bad_request_reply(conn, "Client must provide a 'status' parameter with a value.") + conn + |> put_status(:bad_request) + |> render(ErrorView, "error.json", %{request_path: conn.request_path, message: "Client must provide a 'status' parameter with a value."}) end defp extract_media_ids(status_data) do @@ -55,13 +52,15 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end def user_timeline(%{assigns: %{user: user}} = conn, params) do - case TwitterAPI.get_user(user, params) do + case User.get_by_params(user, params) do {:ok, target_user} -> params = Map.merge(params, %{"actor_id" => target_user.ap_id}) activities = ActivityPub.fetch_activities([], params) render(conn, StatusView, "timeline.json", %{activities: activities, for: user}) - {:error, msg} -> - bad_request_reply(conn, msg) + {status, msg} -> + conn + |> put_status(status) + |> render(ErrorView, "error.json", %{request_path: conn.request_path, message: msg}) end end @@ -70,22 +69,6 @@ defmodule Pleroma.Web.TwitterAPI.Controller do render(conn, StatusView, "timeline.json", %{activities: activities, for: user}) end - def follow(%{assigns: %{user: user}} = conn, params) do - case TwitterAPI.follow(user, params) do - {:ok, user, followed, _activity} -> - render(conn, UserView, "show.json", %{user: followed, for: user}) - {:error, msg} -> forbidden_reply(conn, msg) - end - end - - def unfollow(%{assigns: %{user: user}} = conn, params) do - case TwitterAPI.unfollow(user, params) do - {:ok, user, unfollowed} -> - render(conn, UserView, "show.json", %{user: unfollowed, for: user}) - {:error, msg} -> forbidden_reply(conn, msg) - end - end - def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do with %Activity{} = activity <- Repo.get(Activity, id) do render(conn, StatusView, "show.json", %{activity: activity, for: user}) @@ -143,49 +126,13 @@ defmodule Pleroma.Web.TwitterAPI.Controller do def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do activity = Repo.get(Activity, id) if activity.data["actor"] == user.ap_id do - bad_request_reply(conn, "You cannot repeat your own notice.") + conn + |> put_status(:bad_request) + |> render(ErrorView, "error.json", %{request_path: conn.request_path, message: "You cannot repeat your own notice."}) else {:ok, activity} = TwitterAPI.retweet(user, activity) render(conn, StatusView, "show.json", %{activity: activity, for: user}) end end - def register(conn, params) do - with {:ok, user} <- TwitterAPI.register_user(params) do - render(conn, UserView, "show.json", %{user: user}) - else - {:error, errors} -> - bad_request_reply(conn, Poison.encode!(errors)) - end - end - - def update_avatar(%{assigns: %{user: user}} = conn, params) do - {:ok, object} = ActivityPub.upload(params) - change = Changeset.change(user, %{avatar: object.data}) - {:ok, user} = Repo.update(change) - - render(conn, UserView, "show.json", %{user: user, for: user}) - end - - def external_profile(%{assigns: %{user: current_user}} = conn, %{"profileurl" => uri}) do - with {:ok, user_map} <- TwitterAPI.get_external_profile(current_user, uri) do - json(conn, user_map) - end - end - - defp bad_request_reply(conn, message) do - conn - |> put_status(:bad_request) - |> render_error(message) - end - - defp forbidden_reply(conn, message) do - conn - |> put_status(:forbidden) - |> render_error(message) - end - - defp render_error(conn, message) do - render(conn, ErrorView, "error.json", %{request_path: conn.request_path, message: message}) - end end diff --git a/test/user_test.exs b/test/user_test.exs index 6a7ecca27..357d72f47 100644 --- a/test/user_test.exs +++ b/test/user_test.exs @@ -9,11 +9,6 @@ defmodule Pleroma.UserTest do import Ecto.Query test "ap_id returns the activity pub id for the user" do - host = - Application.get_env(:pleroma, Pleroma.Web.Endpoint) - |> Keyword.fetch!(:url) - |> Keyword.fetch!(:host) - user = UserBuilder.build expected_ap_id = "#{Pleroma.Web.base_url}/users/#{user.nickname}" @@ -190,5 +185,19 @@ defmodule Pleroma.UserTest do end) end end -end + test "get a user by params" do + user1 = insert(:user) + user2 = insert(:user) + user1_result = {:ok, user1} + + assert {:bad_request, "You need to specify screen_name or user_id"} == User.get_by_params(nil, nil) + assert user1_result == User.get_by_params(nil, %{"user_id" => user1.id}) + assert user1_result == User.get_by_params(nil, %{"screen_name" => user1.nickname}) + assert user1_result == User.get_by_params(user1, nil) + assert user1_result == User.get_by_params(user2, %{"user_id" => user1.id}) + assert user1_result == User.get_by_params(user2, %{"screen_name" => user1.nickname}) + assert {:not_found, "No user with such screen_name"} == User.get_by_params(nil, %{"screen_name" => "Satan"}) + assert {:not_found, "No user with such user_id"} == User.get_by_params(nil, %{"user_id" => 666}) + end +end diff --git a/test/web/twitter_api/twitter_api_test.exs b/test/web/twitter_api/twitter_api_test.exs index f8742aace..c51a430cd 100644 --- a/test/web/twitter_api/twitter_api_test.exs +++ b/test/web/twitter_api/twitter_api_test.exs @@ -1,7 +1,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do use Pleroma.DataCase alias Pleroma.Builders.{UserBuilder} - alias Pleroma.Web.TwitterAPI.{StatusView, TwitterAPI, UserView, Utils} + alias Pleroma.Web.TwitterAPI.{StatusView, TwitterAPI, Utils} alias Pleroma.{Activity, User, Object, Repo} alias Pleroma.Web.ActivityPub.ActivityPub @@ -75,68 +75,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do assert Enum.member?(get_in(reply.data, ["to"]), "some_cool_id") end - test "get a user by params" do - user1_result = {:ok, user1} = UserBuilder.insert(%{ap_id: "some id", email: "test@pleroma"}) - {:ok, user2} = UserBuilder.insert(%{ap_id: "some other id", nickname: "testname2", email: "test2@pleroma"}) - - assert {:error, "You need to specify screen_name or user_id"} == TwitterAPI.get_user(nil, nil) - assert user1_result == TwitterAPI.get_user(nil, %{"user_id" => user1.id}) - assert user1_result == TwitterAPI.get_user(nil, %{"user_id" => user1.nickname}) - assert user1_result == TwitterAPI.get_user(nil, %{"screen_name" => user1.nickname}) - assert user1_result == TwitterAPI.get_user(user1, nil) - assert user1_result == TwitterAPI.get_user(user2, %{"user_id" => user1.id}) - assert user1_result == TwitterAPI.get_user(user2, %{"screen_name" => user1.nickname}) - assert {:error, "No user with such screen_name"} == TwitterAPI.get_user(nil, %{"screen_name" => "Satan"}) - assert {:error, "No user with such user_id"} == TwitterAPI.get_user(nil, %{"user_id" => 666}) - end - - test "Follow another user using user_id" do - user = insert(:user) - followed = insert(:user) - - {: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 - - 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)] - - { :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)]}) - ActivityPub.follow(user, unfollowed) - - {:ok, user, unfollowed } = TwitterAPI.unfollow(user, %{"user_id" => unfollowed.id}) - assert user.following == [] - - { :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)]}) - - ActivityPub.follow(user, 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!" - end - test "upload a file" do file = %Plug.Upload{content_type: "image/jpg", path: Path.absname("test/fixtures/image.jpg"), filename: "an_image.jpg"} @@ -191,37 +129,6 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do assert StatusView.render("show.json", %{activity: status}) == StatusView.render("show.json", %{activity: updated_activity}) # FIXME: was complaining about microseconds end - test "it registers a new user and returns the user." do - data = %{ - "nickname" => "lain", - "email" => "lain@wired.jp", - "fullname" => "lain iwakura", - "bio" => "close the world.", - "password" => "bear", - "confirm" => "bear" - } - - {:ok, user} = TwitterAPI.register_user(data) - - fetched_user = Repo.get_by(User, nickname: "lain") - assert UserView.render("show.json", %{user: user}) == UserView.render("show.json", %{user: fetched_user}) - end - - test "it returns the error on registration problems" do - data = %{ - "nickname" => "lain", - "email" => "lain@wired.jp", - "fullname" => "lain iwakura", - "bio" => "close the world.", - "password" => "bear" - } - - {:error, error_object} = TwitterAPI.register_user(data) - - assert is_binary(error_object[:error]) - refute Repo.get_by(User, nickname: "lain") - end - test "it assigns an integer conversation_id" do note_activity = insert(:note_activity) assert is_number(StatusView.conversation_id(note_activity)) @@ -248,18 +155,4 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do assert conversation_id == object.id end end - - describe "fetching a user by uri" do - test "fetches a user by uri" do - id = "https://mastodon.social/users/lambadalambda" - user = insert(:user) - {:ok, represented} = TwitterAPI.get_external_profile(user, id) - remote = User.get_by_ap_id(id) - - assert represented == UserView.render("show.json", %{user: remote, for: user}) - - # Also fetches the feed. - assert Activity.get_create_activity_by_object_ap_id("tag:mastodon.social,2017-04-05:objectId=1641750:objectType=Status") - end - end end