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