From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 26 Apr 2017 06:56:34 +0000 (+0200)
Subject: Merge branch 'dtluna/pleroma-bugfix/deny-self-repeats' into develop
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=fb5cebc1b5dcfd6af7fa1a81bc5b26275714fa26;hp=22e936372e12879e97beac5d886566b1c6c4d55e;p=akkoma

Merge branch 'dtluna/pleroma-bugfix/deny-self-repeats' into develop
---

diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 3ce07d510..5e579dc44 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -63,6 +63,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])