diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 66b07fd..ed1c2a6 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -19,7 +19,11 @@ class UsersController < ApplicationController 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!" + if @user.is?(current_user) + flash.now[:alert] = "An error occured while checking if you are banned from the server!" + else + flash.now[:alert] = "An error occured while checking if this user is banned from the server!" + end @ban_json = nil end end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index cafe726..fb0c174 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -16,16 +16,27 @@
<% if @ban_json && (@ban_json["expires"] == "forever" || !(DateTime.parse(@ban_json["expires"]) <= DateTime.now)) %> - This user is banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%> + <% if @user.is?(current_user) %> + You are banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%> + <% else %> + This user is banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%> + <% end %> <% end %> <% if @user.banned? %> + <% if @user.is?(current_user) %> + You are banned on the website! + <% else %> This user is banned on the website! + <% end %> <% end %>