From 3c4d7073a577ba6452da84ecefd42f5f3b5dbd32 Mon Sep 17 00:00:00 2001 From: calzoneman Date: Fri, 19 Apr 2013 14:50:08 -0500 Subject: [PATCH] Implement AFK functionality [Issue #37] --- channel.js | 6 ++++-- chatcommand.js | 4 ++++ user.js | 11 +++++++---- www/assets/js/callbacks.js | 6 +++--- www/assets/js/functions.js | 25 ++++++++++++++----------- 5 files changed, 32 insertions(+), 20 deletions(-) diff --git a/channel.js b/channel.js index 4b72c23a..bc2b9d9f 100644 --- a/channel.js +++ b/channel.js @@ -437,7 +437,8 @@ Channel.prototype.broadcastNewUser = function(user) { this.sendAll("addUser", { name: user.name, rank: user.rank, - leader: this.leader == user + leader: this.leader == user, + meta: user.meta }); this.sendRankStuff(user); } @@ -446,7 +447,8 @@ Channel.prototype.broadcastRankUpdate = function(user) { this.sendAll("updateUser", { name: user.name, rank: user.rank, - leader: this.leader == user + leader: this.leader == user, + meta: user.meta }); this.sendRankStuff(user); } diff --git a/chatcommand.js b/chatcommand.js index f6aba1e9..ae2b1981 100644 --- a/chatcommand.js +++ b/chatcommand.js @@ -23,6 +23,10 @@ function handle(chan, user, msg) { chan.sendMessage(user.name, msg.substring(5), "shout"); } } + else if(msg.indexOf("/afk") == 0) { + user.meta.afk = !user.meta.afk; + chan.broadcastRankUpdate(user); + } else if(msg.indexOf("/m ") == 0) { if(user.rank >= Rank.Moderator) { chan.sendMessage(user.name, msg.substring(3), "modflair", { diff --git a/user.js b/user.js index d6de6ce2..27cb17a1 100644 --- a/user.js +++ b/user.js @@ -1,11 +1,11 @@ /* The MIT License (MIT) Copyright (c) 2013 Calvin Montgomery - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ @@ -25,6 +25,9 @@ var User = function(socket, ip) { this.channel = null; this.playerReady = false; this.name = ""; + this.meta = { + afk: false + }; this.initCallbacks(); if(Server.announcement != null) { @@ -239,7 +242,7 @@ User.prototype.initCallbacks = function() { this.channel.tryUpdateMotd(this, data); } }.bind(this)); - + this.socket.on("voteskip", function(data) { if(this.channel != null) { this.channel.tryVoteskip(this); diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js index 57ae0946..9a32699e 100644 --- a/www/assets/js/callbacks.js +++ b/www/assets/js/callbacks.js @@ -142,12 +142,12 @@ function initCallbacks() { socket.on("userlist", function(data) { $(".userlist_item").each(function() { $(this).remove(); }); for(var i = 0; i < data.length; i++) { - addUser(data[i].name, data[i].rank, data[i].leader); + addUser(data[i]); } }); socket.on("addUser", function(data) { - addUser(data.name, data.rank, data.leader); + addUser(data); }); socket.on("updateUser", function(data) { @@ -178,7 +178,7 @@ function initCallbacks() { var name = users[i].children[1].innerHTML; // Reformat user if(name == data.name) { - formatUserlistItem(users[i], data.rank, data.leader); + formatUserlistItem(users[i], data); } } }); diff --git a/www/assets/js/functions.js b/www/assets/js/functions.js index 2a5c041b..cc62ab16 100644 --- a/www/assets/js/functions.js +++ b/www/assets/js/functions.js @@ -19,16 +19,16 @@ function handleDisconnect() { } // Adds a user to the chatbox userlist -function addUser(name, rank, leader) { +function addUser(data) { var div = $("
").attr("class", "userlist_item"); var flair = $("").appendTo(div); - var nametag = $("").text(name).appendTo(div); - formatUserlistItem(div[0], rank, leader); - addUserDropdown(div, name); + var nametag = $("").text(data.name).appendTo(div); + formatUserlistItem(div[0], data); + addUserDropdown(div, data.name); var users = $("#userlist").children(); for(var i = 0; i < users.length; i++) { var othername = users[i].children[1].innerHTML; - if(othername.toLowerCase() > name.toLowerCase()) { + if(othername.toLowerCase() > data.name.toLowerCase()) { div.insertBefore(users[i]); return; } @@ -36,19 +36,22 @@ function addUser(name, rank, leader) { div.appendTo($("#userlist")); } -// Format a userlist entry based on a person"s rank -function formatUserlistItem(div, rank, leader) { +// Format a userlist entry based on a person's rank +function formatUserlistItem(div, data) { var name = div.children[1]; $(name).removeClass(); - $(name).addClass(getNameColor(rank)); + $(name).css("font-style", ""); + $(name).addClass(getNameColor(data.rank)); var flair = div.children[0]; + flair.innerHTML = ""; // denote current leader with a star - if(leader) { + if(data.leader) { $("").addClass("icon-star-empty").appendTo(flair); } - else { - flair.innerHTML = ""; + if(data.meta.afk) { + $(name).css("font-style", "italic"); + $("").addClass("icon-time").appendTo(flair); } }