Merge branch 'develop' into feature/incoming_ostatus

2017-04-26 09:18:49 +02:00 · 2017-04-26 09:18:49 +02:00 · e8882ab3da
commit e8882ab3da
parent b91ccef237 fb5cebc1b5
5 changed files with 104 additions and 49 deletions
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@ -65,6 +65,7 @@ defmodule Pleroma.User do
    |> validate_confirmation(:password)
    |> unique_constraint(:email)
    |> unique_constraint(:nickname)
+    |> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)

    if changeset.valid? do
      hashed = Comeonin.Pbkdf2.hashpwsalt(changeset.changes[:password])