diff options
| author | MrYummy <elemental428@gmail.com> | 2017-05-31 21:44:22 +0200 |
|---|---|---|
| committer | MrYummy <elemental428@gmail.com> | 2017-06-18 13:11:36 -0400 |
| commit | 1b8744abdba3e835a46efd0fcb3b518a452087e7 (patch) | |
| tree | bd8e248540c8414c7bc3ca85dbaa1de024432430 | |
| parent | 617890c2097c554b69382ecfec5cc9a7f016fddd (diff) | |
Changed 'Who's Playing' code to handle revised JSON format
| -rw-r--r-- | app/controllers/statics_controller.rb | 5 | ||||
| -rw-r--r-- | app/views/statics/online.html.erb | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/app/controllers/statics_controller.rb b/app/controllers/statics_controller.rb index 8ea9524..4b0c911 100644 --- a/app/controllers/statics_controller.rb +++ b/app/controllers/statics_controller.rb @@ -17,7 +17,8 @@ class StaticsController < ApplicationController end def online - @players = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/JavaUtils/players.json"))["players"] - @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"), confirmed: true) }.sort_by!(&:role).reverse! + json = JSON.parse(File.read("/etc/minecraft/redstoner/plugins/JavaUtils/players.json")) + @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"] end end diff --git a/app/views/statics/online.html.erb b/app/views/statics/online.html.erb index 8c31182..8bacf6f 100644 --- a/app/views/statics/online.html.erb +++ b/app/views/statics/online.html.erb @@ -1,14 +1,15 @@ <% title "Who's Playing?" %> -<h1>These players are currently playing on Redstoner:</h1> +<h1>These players are currently playing on Redstoner (<%= @count %>):</h1> <div id="userlist"> <% @players.each do |u| %> <div class="list-user"> <%= link_to(u.avatar(64), u) %> <div class="detail"> <%= render partial: "users/username", locals: { user: u } %><br> - <i><%= u.ign %></i> - <% unless u.id %> - <br><i>(Not signed up)</i> + <% if u.id %> + <i><%= u.ign %></i> + <% else %> + <i>(Not signed up)</i> <% end %> </div> </div> |