diff options
| author | Logan Fick <logaldeveloper@protonmail.com> | 2017-10-31 22:19:34 -0400 |
|---|---|---|
| committer | Logan Fick <logaldeveloper@protonmail.com> | 2017-10-31 22:19:34 -0400 |
| commit | 52e32808b5b0f1550c3cb3a5f6082dbaabd2ae60 (patch) | |
| tree | 13dafc78d7ab46bcb0326be04b09462243e16fc7 | |
| parent | 06467477803715b11e5c5267e4dba819b21133a7 (diff) | |
| parent | 7ed1c2ac57038127ba95f5ef940a3ea7f7e042f7 (diff) | |
Merge pull request #41.
| -rw-r--r-- | app/controllers/users_controller.rb | 8 | ||||
| -rw-r--r-- | app/views/users/show.html.erb | 8 |
2 files changed, 13 insertions, 3 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 4c854ea..f6d9a71 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -6,6 +6,8 @@ class UsersController < ApplicationController before_filter :set_user, except: [:index, :new, :create, :lost_password, :reset_password, :suggestions] + caches_action :show, expires_in: 10.seconds, layout: false + def index role = Role.find_by(name: params[:role]) badge = Badge.find_by(name: params[:badge]) @@ -16,6 +18,12 @@ class UsersController < ApplicationController end def show + begin + @ban_json = JSON.parse(File.read("/etc/minecraft/redstoner/banned-players.json")).detect {|u| u["uuid"].tr("-", "") == @user.uuid} + rescue + flash.now[:alert] = "An error occured while checking if this user is banned from the server!" + @ban_json = nil + end end # SIGNUP diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 794d2e2..a982928 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -15,11 +15,13 @@ <h1><%= @user.name %></h1> <div class="clear"></div> - + <% if @ban_json %> + <span class="user-banned">This user is banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%></span> + <% end %> <% if @user.banned? %> - <span class="user-banned">This user is banned!</span> + <span class="user-banned">This user is banned on the website!</span> <% end %> - + <br> <% if !@user.confirmed? %> <% if @user.is?(current_user) || mod? %> <span class="user-unconfirmed">Please confirm your email <u><%= @user.email %></u> !</span> |