diff options
| author | Logan Fick <logaldeveloper@protonmail.com> | 2019-03-01 12:56:10 -0500 |
|---|---|---|
| committer | Logan Fick <logaldeveloper@protonmail.com> | 2019-03-01 12:56:10 -0500 |
| commit | 6ef42dc3314d30378592d0a19625d37b25f418d1 (patch) | |
| tree | c0c216e974d69fa6c7da103badee93770df83898 | |
| parent | 32e7b99b6da9bc5397e65dc4d2a146d7d2da510f (diff) | |
| parent | 52659dd446ae2628927da520393ec6c8a839bc74 (diff) | |
Merged pull request #57.
| -rw-r--r-- | app/helpers/users_helper.rb | 1 | ||||
| -rw-r--r-- | app/models/user.rb | 3 | ||||
| -rw-r--r-- | app/views/users/show.html.erb | 20 |
3 files changed, 11 insertions, 13 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 7ad99d8..73704ed 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -51,5 +51,4 @@ module UsersHelper return nil end end - end diff --git a/app/models/user.rb b/app/models/user.rb index 85c154e..b3bc033 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -18,11 +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: 2, 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."} + 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."} diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 1edf6db..9853b08 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -82,6 +82,16 @@ <td><b>Joined</b></td> <td><%= ago @user.created_at %></td> </tr> + <tr> + <td><b>Last seen</b></td> + <td> + <% if @user.last_seen %> + <%= ago @user.last_seen %> + <% else %> + Never + <% end %> + </td> + </tr> <% if mod? || @user.is?(current_user) %> <tr> <td><b>Last IP</b></td> @@ -91,16 +101,6 @@ <td><b>Email</b></td> <td><%= mail_to @user.email, @user.email, :subject => "Redstoner" %></td> </tr> - <tr> - <td><b>Last seen</b></td> - <td> - <% if @user.last_seen %> - <%= ago @user.last_seen %> - <% else %> - Never - <% end %> - </td> - </tr> <% end %> </tbody> </table> |