From ea4799fc285c1bebaabfb72c176583b05edd9def Mon Sep 17 00:00:00 2001 From: Logan Fick Date: Sat, 28 Oct 2017 15:25:39 -0400 Subject: Made Who's Playing page hide vanished users from non-staff ranks. --- app/controllers/statics_controller.rb | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/app/controllers/statics_controller.rb b/app/controllers/statics_controller.rb index c624c32..3a46ac1 100644 --- a/app/controllers/statics_controller.rb +++ b/app/controllers/statics_controller.rb @@ -17,15 +17,23 @@ class StaticsController < ApplicationController end def online + @players = {} + @count = 0 begin json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/ModuleLoader/players.json")) rescue flash.now[:alert] = "The server is currently offline." - @players = {} - @count = 0 else - @players = json["players"].collect!{ |p| User.find_by(uuid: p["UUID"].tr("-", "")) or User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true) }.sort_by!(&:role).reverse! - @count = json["amount"] + json["players"].each do |p| + next if p["vanished"] == "true" && !mod? + if User.find_by(uuid: p["UUID"].tr("-", "")) + @players.push(User.find_by(uuid: p["UUID"].tr("-", ""))) + else + @players.push(User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true)) + end + end end + @players.sort_by!(&:role).reverse! + @count = @players.count end end -- cgit v1.2.3 From 7d766c8cf2043e386346a3b479875400f1f1464c Mon Sep 17 00:00:00 2001 From: MrYummy Date: Sun, 29 Oct 2017 22:26:16 +0100 Subject: Optimized @players collection from json --- app/controllers/statics_controller.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/app/controllers/statics_controller.rb b/app/controllers/statics_controller.rb index 3a46ac1..a47b893 100644 --- a/app/controllers/statics_controller.rb +++ b/app/controllers/statics_controller.rb @@ -17,20 +17,15 @@ class StaticsController < ApplicationController end def online - @players = {} + @players = [] @count = 0 begin - json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/ModuleLoader/players.json")) + json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/ModuleLoader/players.json"))["players"].reject{|p| !mod? && p["vanished"] == "true"} rescue flash.now[:alert] = "The server is currently offline." else - json["players"].each do |p| - next if p["vanished"] == "true" && !mod? - if User.find_by(uuid: p["UUID"].tr("-", "")) - @players.push(User.find_by(uuid: p["UUID"].tr("-", ""))) - else - @players.push(User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true)) - end + json.each do |p| + @players.push(User.find_by(uuid: p["UUID"].tr("-", "")) || User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true)) end end @players.sort_by!(&:role).reverse! -- cgit v1.2.3 From 2d9fdcd802b32dd17168a9317977fc7dfa30257b Mon Sep 17 00:00:00 2001 From: Logan Fick Date: Sun, 29 Oct 2017 19:44:52 -0400 Subject: Added backward compatibility for old data format. --- app/controllers/statics_controller.rb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/app/controllers/statics_controller.rb b/app/controllers/statics_controller.rb index a47b893..0809dbc 100644 --- a/app/controllers/statics_controller.rb +++ b/app/controllers/statics_controller.rb @@ -20,15 +20,23 @@ class StaticsController < ApplicationController @players = [] @count = 0 begin - json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/ModuleLoader/players.json"))["players"].reject{|p| !mod? && p["vanished"] == "true"} + json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/ModuleLoader/players.json")) rescue flash.now[:alert] = "The server is currently offline." else - json.each do |p| - @players.push(User.find_by(uuid: p["UUID"].tr("-", "")) || User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true)) + case json["dataFormat"] + when "v1" + @players = json["players"].collect!{ |p| User.find_by(uuid: p["UUID"].tr("-", "")) or User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true) } + @count = json["amount"] + when "v2" + json["players"].reject{|p| !mod? && p["vanished"] == "true"}.each do |p| + @players.push(User.find_by(uuid: p["UUID"].tr("-", "")) || User.new(name: p["name"], ign: p["name"], uuid: p["UUID"].tr("-", ""), role: Role.get("normal"), badge: Badge.get("none"), confirmed: true)) + end + @count = @players.count + else + flash.now[:alert] = "The server is using an incompatible data format. Please report this error!" end + @players.sort_by!(&:role).reverse! end - @players.sort_by!(&:role).reverse! - @count = @players.count end end -- cgit v1.2.3 From 3c7bfa93380074ce4d866196b340cdbe0f294db2 Mon Sep 17 00:00:00 2001 From: Logan Fick Date: Sun, 29 Oct 2017 20:22:00 -0400 Subject: Changed the invalid data format error message. --- app/controllers/statics_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/statics_controller.rb b/app/controllers/statics_controller.rb index 0809dbc..aaaf5b4 100644 --- a/app/controllers/statics_controller.rb +++ b/app/controllers/statics_controller.rb @@ -34,7 +34,7 @@ class StaticsController < ApplicationController end @count = @players.count else - flash.now[:alert] = "The server is using an incompatible data format. Please report this error!" + flash.now[:alert] = "The server is using an incompatible data format. We are aware of this issue and are most likely already working on it." end @players.sort_by!(&:role).reverse! end -- cgit v1.2.3