rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #684 from Xaekai/afk.meta

Browse source 
Single source of truth for AFK
This commit is contained in:
Calvin Montgomery 2017-06-16 21:42:23 -07:00 • committed by GitHub
commit 33f632036e
4 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

26
www/js/callbacks.js
View file

@ -490,13 +490,12 @@ Callbacks = {
div.data("leader", Boolean(data.leader));
div.data("profile", data.profile);
div.data("meta", data.meta);
div.data("afk", data.meta.afk);
if (data.meta.muted || data.meta.smuted) {
div.data("icon", "glyphicon-volume-off");
} else {
div.data("icon", false);
}
formatUserlistItem(div, data);
formatUserlistItem(div);
addUserDropdown(div, data);
div.appendTo($("#userlist"));
sortUserlist();
@ -515,11 +514,24 @@ Callbacks = {
user.data("icon", false);
}
/*
* 2017-06-15
* TODO: Remove this and the empty function below
* after script authors have had ample time to update
*/
socket.listeners('setAFK').forEach(function(listener){
listener(data.meta.afk);
});
formatUserlistItem(user, data);
addUserDropdown(user, data);
sortUserlist();
},
setAFK: function() {
return true;
},
setUserProfile: function (data) {
var user = findUserlistItem(data.name);
if (user === null)
@ -610,16 +622,6 @@ Callbacks = {
formatUserlistItem(user);
},
setAFK: function (data) {
var user = findUserlistItem(data.name);
if(user === null)
return;
user.data("afk", data.afk);
formatUserlistItem(user);
if(USEROPTS.sort_afk)
sortUserlist();
},
userLeave: function(data) {
var user = findUserlistItem(data.name);
if(user !== null)

12
www/js/util.js
View file

@ -87,7 +87,6 @@ function formatUserlistItem(div) {
profile: div.data("profile") || { image: "", text: ""},
leader: div.data("leader") || false,
icon: div.data("icon") || false,
afk: div.data("afk") || false
};
var name = $(div.children()[1]);
name.removeClass();
@ -95,19 +94,20 @@ function formatUserlistItem(div) {
name.addClass(getNameColor(data.rank));
div.find(".profile-box").remove();
if (data.afk) {
var meta = div.data().meta || {}; // Not sure how this could happen.
if (meta.afk) {
div.addClass("userlist_afk");
} else {
div.removeClass("userlist_afk");
}
if (div.data("meta") && div.data("meta").muted) {
if (meta.muted) {
div.addClass("userlist_muted");
} else {
div.removeClass("userlist_muted");
}
if (div.data("meta") && div.data("meta").smuted) {
if (meta.smuted) {
div.addClass("userlist_smuted");
} else {
div.removeClass("userlist_smuted");
@ -173,7 +173,7 @@ function formatUserlistItem(div) {
if(data.leader) {
$("<span/>").addClass("glyphicon glyphicon-star-empty").appendTo(icon);
}
if(data.afk) {
if(div.data().meta.afk) {
name.css("font-style", "italic");
$("<span/>").addClass("glyphicon glyphicon-time").appendTo(icon);
}
@ -398,7 +398,7 @@ function calcUserBreakdown() {
total++;
if($(item).data("afk"))
if($(item).data().meta.afk)
breakdown["AFK"]++;
});