From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 4 Aug 2020 03:20:49 +0000 (-0500)
Subject: Email blacklist: Update phrasing again
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=4f57e85ab9c80fb7cb51428cef978793ba22971c;p=akkoma

Email blacklist: Update phrasing again
---

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 16679ac42..9e03373de 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -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]))
diff --git a/test/web/mastodon_api/controllers/account_controller_test.exs b/test/web/mastodon_api/controllers/account_controller_test.exs
index 86e3ac3e7..17a1e7d66 100644
--- a/test/web/mastodon_api/controllers/account_controller_test.exs
+++ b/test/web/mastodon_api/controllers/account_controller_test.exs
@@ -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], [])