diff options
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 5881af95e..b5b59eb4b 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -1,12 +1,11 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do alias Pleroma.{User, Activity, Repo, Object} alias Pleroma.Web.ActivityPub.ActivityPub - alias Pleroma.Web.ActivityPub.Utils - alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter} + alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter + alias Pleroma.Web.TwitterAPI.UserView alias Pleroma.Web.OStatus alias Pleroma.Formatter - import Ecto.Query import Pleroma.Web.TwitterAPI.Utils @httpoison Application.get_env(:pleroma, :httpoison) @@ -197,7 +196,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do changeset = User.register_changeset(%User{}, params) with {:ok, user} <- Repo.insert(changeset) do - {:ok, UserRepresenter.to_map(user)} + {:ok, user} else {:error, changeset} -> errors = Ecto.Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end) @@ -308,7 +307,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do {:ok, %{body: body}} <- @httpoison.get(url, [], follow_redirect: true, timeout: 10000, recv_timeout: 20000) do OStatus.handle_incoming(body) end - {:ok, UserRepresenter.to_map(user, %{for: for_user})} + {:ok, UserView.render("show.json", %{user: user, for: for_user})} else _e -> {:error, "Couldn't find user"} end |