diff options
| author | lain <lain@soykaf.club> | 2018-03-05 09:27:08 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2018-03-05 09:27:08 +0100 |
| commit | 0f2bf3eefb0adba13a3f3d37e8d8b1bd414a33e4 (patch) | |
| tree | e69fe391032fc9d9564e16db612480e08ed538e3 /lib | |
| parent | 0e20d5529a090f12636caccb41e5e040786eb0c6 (diff) | |
| parent | 3ecdab0911e061ec569fcd616c756ece9782a71b (diff) | |
| download | pleroma-0f2bf3eefb0adba13a3f3d37e8d8b1bd414a33e4.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 81cec8265..59f6340b8 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -93,7 +93,7 @@ defmodule Pleroma.User do |> cast(params, [:bio, :name]) |> unique_constraint(:nickname) |> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/) - |> validate_length(:bio, min: 1, max: 1000) + |> validate_length(:bio, max: 1000) |> validate_length(:name, min: 1, max: 100) end @@ -119,13 +119,13 @@ defmodule Pleroma.User do def register_changeset(struct, params \\ %{}) do changeset = struct |> cast(params, [:bio, :email, :name, :nickname, :password, :password_confirmation]) - |> validate_required([:bio, :email, :name, :nickname, :password, :password_confirmation]) + |> validate_required([:email, :name, :nickname, :password, :password_confirmation]) |> validate_confirmation(:password) |> unique_constraint(:email) |> unique_constraint(:nickname) |> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/) |> validate_format(:email, @email_regex) - |> validate_length(:bio, min: 1, max: 1000) + |> validate_length(:bio, max: 1000) |> validate_length(:name, min: 1, max: 100) if changeset.valid? do |