sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

formatting

This commit is contained in:
Henry Jameson 2018-06-12 15:01:40 +03:00
parent f42ffbe9a8
commit 9c1cf1befb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/pleroma/web/twitter_api/twitter_api.ex
View File

@ -143,7 +143,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
cond do
@registrations_open || !is_nil(token) && !token.used ->
@registrations_open || (!is_nil(token) && !token.used) ->
changeset = User.register_changeset(%User{}, params)
with {:ok, user} <- Repo.insert(changeset) do
@ -155,11 +155,14 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
Ecto.Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end)
|> Jason.encode!()
{:error, %{error: errors}}
{:error, %{error: errors}}
end
!@registrations_open && is_nil(token) -> {:error, "Invalid token"}
!@registrations_open && token.used -> {:error, "Expired token"}
!@registrations_open && is_nil(token) ->
{:error, "Invalid token"}
!@registrations_open && token.used ->
{:error, "Expired token"}
end
end

3
test/web/twitter_api/twitter_api_test.exs
View File

@ -266,8 +266,9 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
token = Repo.get_by(UserInviteToken, token: token.token)
assert token.used == true
assert UserView.render("show.json", %{user: user}) ==
UserView.render("show.json", %{user: fetched_user})
UserView.render("show.json", %{user: fetched_user})
end
@moduletag skip: "needs 'registrations_open: false' in config"