Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

UserList Fix #49

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

UserList Fix #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5aeca76
Fixed 'fanof' on user object change in tt
nfollin Jun 12, 2013
7a602c1
Fixed userlist and vote notifications in updateGuestList() and addHea…
nfollin Jul 21, 2013
de9c01a
removed addUserToMap function as it was undefined.
nfollin Jul 21, 2013
a9d1f21
changed superuser determination to new user.isSuperuser() method
nfollin Jul 23, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Turntable Plus",
"version": "0.3.17",
"version": "0.3.18",
"manifest_version": 2,
"description": "Add features to turntable.fm that you thought were missing!",
"icons": {
Expand Down
Binary file added scripts/.DS_Store
View file
Open in desktop
Binary file not shown.
91 changes: 50 additions & 41 deletions scripts/onPage.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,12 +206,12 @@ var ttp = {
if (user) {
user.lastActivity = now;
user.lastVote = now;
$user = ttp.getListElByName(user.name);
$user = ttp.getListElByName(user.get("name"));
if ($user !== null) {
$user.data("ttplastactivity", now);
$user.data("ttplastvote", now);
if (user) {
a = $.inArray(user.userid, ttp.room.downvoters);
a = $.inArray(user.id, ttp.room.downvoters);
if (msg.room.metadata.votelog[x][1] === "up") {
$user.removeClass("downvoted").addClass("upvoted");
if (a > -1) {
Expand All @@ -220,7 +220,7 @@ var ttp = {
} else if (msg.room.metadata.votelog[x][1] === "down") {
$user.removeClass("upvoted").addClass("downvoted");
if (a === -1) {
ttp.room.downvoters.push(user.userid);
ttp.room.downvoters.push(user.id);
}
}
}
Expand Down Expand Up @@ -318,24 +318,27 @@ var ttp = {
},
addHeader: function () {
var header = '';
if ((ttp.roominfo.layout === 'dual' && $('#left-panel').is(':visible') && $('#left-panel .ttpHeader').length > 0) || (ttp.roominfo.layout === 'single' && $('#right-panel .ttpHeader').length > 0)) {
/*if ((ttp.roominfo.layout === 'dual' && $('#left-panel').is(':visible') && $('#left-panel .ttpHeader').length > 0) || (ttp.roominfo.layout === 'single' && $('#right-panel .ttpHeader').length > 0)) {
return;
}
header = '<div class="ttpHeader">' +
'<span style="padding: 0 0 0 5px;">Votes: </span>' +
}*/
$(".ttpHeader").remove();

header = '<div class="ttpHeader" >' +
'<span id="ttpHearts" title="Number of Times Queued">' + ttp.room.hearts + '</span>' +
'<span id="ttpUpvotes" title="Awesomes">' + ttp.room.upvotes + '</span>' +
'<span id="ttpDownvotes" title="Lames">' + ttp.room.downvotes + '</span>' +
'</div>';
if (ttp.roominfo.layout === 'dual' && $('#left-panel').is(':visible')) {
/*if (ttp.roominfo.layout === 'dual' && $('#left-panel').is(':visible')) {
$('.selected #chat').attr('style', 'top: 36px !important;');
$('.ttpHeader').remove();
$('#left-panel').prepend(header);
} else if (ttp.roominfo.layout === 'single') {
$('.selected #chat').attr('style', '');
$('.ttpHeader').remove();
$('#right-panel').prepend(header);
}
}*/
$(".header-bar").append(header);
$(".ttpHeader").css("display", "inline");
},
changeLayout: function (layout) {
var rightHandle = '.ttpHeader',
Expand Down Expand Up @@ -525,7 +528,7 @@ var ttp = {
ttp.addResizeHandler();
}

$chat.scrollTop($chat[0].scrollHeight);
//$chat.scrollTop($chat[0].scrollHeight);
},
addResizeHandler: function () {
$(window).resize(function (e) {
Expand Down Expand Up @@ -834,12 +837,13 @@ var ttp = {
ttp.replaced.guestListName = Room.layouts.guestListName;
Room.layouts.guestListName = function(user, room, selected, now) {
try {
var a = user.images.headfront,
var a= user.getAvatarUrl(),
guestClass = selected ? ".guest.selected" : ".guest",
icons = ['div.icons', {}];
if (ttp.roominfo.upvoters.indexOf(user.userid) > -1) {
a = a.substr(0,a.lastIndexOf("/"))+"/headfront.png"
if (ttp.roominfo.upvoters.indexOf(user.id) > -1) {
guestClass += ".upvoted";
} else if (ttp.room.downvoters.indexOf(user.userid) > -1) {
} else if (ttp.room.downvoters.indexOf(user.id) > -1) {
guestClass += ".downvoted";
}

Expand All @@ -852,28 +856,31 @@ var ttp = {
if (user.lastVote === undefined) {
user.lastVote = ttp.startTime;
}

if (user.acl > 0) {

if (user.isSuperuser()) {
console.log(user);
icons.push(['div.superuser.icon', {title: 'Superuser'}]);
} else {
if (ttp.roominfo.roomData.metadata.moderator_id.indexOf(user.userid) > -1) {
if (ttp.roominfo.roomData.metadata.moderator_id.indexOf(user.id) > -1) {
icons.push(['div.mod.icon', {title: 'Moderator'}]);
}
}
if (turntable.user.fanOf.indexOf(user.userid) > -1) {
if (turntable.user.get('fanof').indexOf(user.id) > -1) {
icons.push(['div.fanned.icon', {title: 'Fanned'}]);
}
if (ttp.room.snaggers.indexOf(user.userid) > -1) {
if (ttp.room.snaggers.indexOf(user.id) > -1) {
icons.push(['div.snagged.icon', {title: 'Queued Current Song'}]);
}

var spec = ["div" + guestClass, {event: {mouseover: function() {
$(this).find("div.guestArrow").show();
},mouseout: function() {
$(this).find("div.guestArrow").hide();
},click: function() {
var g = $(this).parent().find("div.guestOptionsContainer");

var h = $(this);

if (!g.length) {
$.proxy(function() {
this.addGuestListMenu(user, h);
Expand All @@ -887,18 +894,20 @@ var ttp = {
}, room));
}
}
},dblclick: function() { room.handlePM({ senderid: user.userid }, true); }},
data: {id: user.userid, ttplastactivity: user.lastActivity, ttplastchat: user.lastChat, ttplastvote: user.lastVote}},
},dblclick: function() { room.handlePM({ senderid: user.id }, true); }},
data: {id: user.id, ttplastactivity: user.lastActivity, ttplastchat: user.lastChat, ttplastvote: user.lastVote}},
["div.guest-avatar", {style: {"background-image": "url(" + a + ")"}}],
["div.guestName", {}, user.name],
["div.guestName", {},user.get("name") ],
icons,
["div.guestArrow"],
["div.idletime", {}, ttp.formatTime(now - user.lastActivity)]];
if (room.roomData.metadata.currentDj === user.userid) {
if (room.roomData.metadata.currentDj === user.id) {
spec.splice(3, 0, ['div.current-dj']);
}
return spec;
} catch (e) {


console.warn("Error in guestListName:", e);
ttp.replaced.guestListName(user, room, selected);
}
Expand All @@ -907,6 +916,7 @@ var ttp = {
ttp.replaced.guestListUpdate = ttp.roominfo.updateGuestList;
ttp.roominfo.updateGuestList = function() {
try {

var supers = [],
mods = [],
djs = [],
Expand All @@ -915,17 +925,17 @@ var ttp = {
guests = [],
$list = $(".guest-list-container .guests"),
users = ttp.roominfo.userMap,
fans = turntable.user.fanOf;

fans = turntable.user.get('fanof');
for (var o = 0, s = ttp.roominfo.djids, q = s.length; o < q; o++) {
djs.push(users[s[o]]);
}

for (var o = 0, s = ttp.roominfo.listenerids, q = s.length; o < q; o++) {
var listenerid = s[o];
if (ttp.roominfo.djids.indexOf(listenerid) > -1) {
continue;
} else if (users[listenerid].acl > 0) {
} else if (users[listenerid].isSuperuser()) {
supers.push(users[listenerid]);
} else if (ttp.roominfo.roomData.metadata !== undefined && ttp.roominfo.roomData.metadata.moderator_id.indexOf(listenerid) > -1) {
mods.push(users[listenerid]);
Expand All @@ -937,10 +947,9 @@ var ttp = {
listeners.push(users[listenerid]);
}
}

mods = supers.sort(this.guestListSort).concat(mods.sort(this.guestListSort));
listeners = fanof.sort(this.guestListSort).concat(listeners.sort(this.guestListSort));

var c = $list.find(".guest.selected").data("id");
$list.children().remove();
var t = [djs, mods, listeners], v = ["DJs", "Moderators", "Audience"];
Expand Down Expand Up @@ -993,35 +1002,35 @@ var ttp = {
};
ttp.roominfo.updateGuestList();

ttp.replaced.addUserToMap = ttp.roominfo.addUserToMap;
/*ttp.replaced.addUserToMap = ttp.roominfo.addUserToMap;
ttp.roominfo.addUserToMap = function (user) {
try {
var users = ttp.roominfo.userMap,
now = ttp.now(),
lastActivity = now,
lastChat = now,
lastVote = now;
if (users[user.userid]) {
if (users[user.userid].lastActivity) {
lastActivity = users[user.userid].lastActivity;
if (users[user.id]) {
if (users[user.id].lastActivity) {
lastActivity = users[user.id].lastActivity;
}
if (users[user.userid].lastChat) {
lastChat = users[user.userid].lastChat;
if (users[user.id].lastChat) {
lastChat = users[user.id].lastChat;
}
if (users[user.userid].lastVote) {
lastVote = users[user.userid].lastVote;
if (users[user.id].lastVote) {
lastVote = users[user.id].lastVote;
}
}
ttp.replaced.addUserToMap.call(ttp.roominfo, user);
users[user.userid].lastActivity = lastActivity;
users[user.userid].lastChat = lastChat;
users[user.userid].lastVote = lastVote;
users[user.id].lastActivity = lastActivity;
users[user.id].lastChat = lastChat;
users[user.id].lastVote = lastVote;
} catch (e) {
console.warn("Error in addUserToMap:", e);
ttp.replaced.addUserToMap.call(ttp.roominfo, user);
}
};

*/
ttp.replaced.setPanelLayout = ttp.roominfo.setPanelLayout;
ttp.roominfo.setPanelLayout = function (layout) {
try {
Expand Down