Browse Source

Email blacklist: Update phrasing again

note-update
Alex Gleason 3 years ago
parent
commit
4f57e85ab9
No known key found for this signature in database GPG Key ID: 7211D1F99744FBB7
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      lib/pleroma/user.ex
  2. +1
    -1
      test/web/mastodon_api/controllers/account_controller_test.exs

+ 1
- 1
lib/pleroma/user.ex View File

@@ -684,7 +684,7 @@ defmodule Pleroma.User do
!String.ends_with?(email, ["@" <> blacklisted_domain, "." <> blacklisted_domain])
end)

if valid?, do: [], else: [credentials: "Invalid credentials"]
if valid?, do: [], else: [email: "Invalid email"]
end)
|> unique_constraint(:nickname)
|> validate_exclusion(:nickname, Config.get([User, :restricted_nicknames]))


+ 1
- 1
test/web/mastodon_api/controllers/account_controller_test.exs View File

@@ -956,7 +956,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
|> put_req_header("authorization", "Bearer " <> token)
|> post("/api/v1/accounts", params)

assert %{"error" => "{\"credentials\":[\"Invalid credentials\"]}"} =
assert %{"error" => "{\"email\":[\"Invalid email\"]}"} =
json_response_and_validate_schema(conn, 400)

Pleroma.Config.put([User, :email_blacklist], [])


Loading…
Cancel
Save