hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add some basic changesets.

Browse source
This commit is contained in:
Roger Braun 2017-05-09 18:11:51 +02:00
commit 373753e595
4 changed files with 75 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/pleroma/user.ex
View file

@ -61,6 +61,17 @@ defmodule Pleroma.User do
}
end
@email_regex ~r/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
def remote_user_creation(params) do
changeset = %User{}
|> cast(params, [:bio, :name, :ap_id, :nickname, :info])
|> validate_required([:bio, :name, :ap_id, :nickname])
|> unique_constraint(:nickname)
|> validate_format(:nickname, @email_regex)
|> validate_length(:bio, max: 1000)
|> validate_length(:name, max: 100)
end
def register_changeset(struct, params \\ %{}) do
changeset = struct
|> cast(params, [:bio, :email, :name, :nickname, :password, :password_confirmation])
@ -69,6 +80,9 @@ defmodule Pleroma.User do
|> unique_constraint(:email)
|> unique_constraint(:nickname)
|> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
|> validate_format(:email, @email_regex)
|> validate_length(:bio, max: 1000)
|> validate_length(:name, max: 100)
if changeset.valid? do
hashed = Pbkdf2.hashpwsalt(changeset.changes[:password])