Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

Now able to update user profile even if discord field is blank #57

Merged
ThatSimplex merged 2 commits from user_stats into master 2019-03-01 17:57:07 +00:00
Conversation 0 Commits 2 Files Changed 3 +11 -13
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/helpers/users_helper.rb
View File

@ -51,5 +51,4 @@ module UsersHelper
return nil
end
end
end

3
app/models/user.rb
View File

@ -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."}

20
app/views/users/show.html.erb
View File

@ -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>