summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFutseh <jonas.folvik@gmail.com>2019-03-01 18:47:45 +0100
committerFutseh <jonas.folvik@gmail.com>2019-03-01 18:47:45 +0100
commit52659dd446ae2628927da520393ec6c8a839bc74 (patch)
treec0c216e974d69fa6c7da103badee93770df83898
parentb8c862c43b29b3cb8f26e213097ce986abce7271 (diff)
You can now update a profile even if the discord field is empty
-rw-r--r--app/models/user.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index a34dcf7..b3bc033 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -18,10 +18,10 @@ class User < ActiveRecord::Base
validates_length_of :name, in: 2..30
validates_length_of :about, maximum: 5000
validates_length_of :ign, minimum: 1, maximum: 16
- validates_length_of :discord, minimum: 7, maximum: 37 # The maximum length of a name is 32, but you need the # and four numbers
validates :email, uniqueness: {case_sensitive: false}, format: {with: /\A.+@(.+\..{2,}|\[(IPv6)?[0-9a-f:.]+\])\z/i, message: "That doesn't look like an email address."}
validates :ign, uniqueness: {case_sensitive: false}, format: {with: /\A[a-z\d_]+\z/i, message: "Username is invalid (a-z, 0-9, _)."}
+ validates :discord, uniqueness: {case_sensitive: false}, format: {with: /\A^(?!everyone|here|discordtag|.*```.*)([^@#:]{2,32}#[0-9]{4})$\z/i, message: "Discord name is invalid."}, allow_blank: true
validates :public_key, format: {with: /\A(-----BEGIN PGP PUBLIC KEY BLOCK-----((.|\n)*?)-----END PGP PUBLIC KEY BLOCK-----)?\z/i, message: "That doesn't look like a PGP formatted public key."}