From 91b8a6cab615a1416f83b420824a5b71c7a2b794 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 5 Mar 2013 17:06:25 -0600
Subject: [PATCH] Rearrange ranks a bit and fix unleader bug

---
 channel.js                 |  3 ++-
 rank.js                    |  5 +++--
 user.js                    | 12 ++++++++----
 www/assets/js/callbacks.js |  2 +-
 www/assets/js/client.js    |  4 ++--
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/channel.js b/channel.js
index 0f6f6f00..4a796f0b 100644
--- a/channel.js
+++ b/channel.js
@@ -477,7 +477,8 @@ Channel.prototype.changeLeader = function(name) {
         this.broadcastRankUpdate(old);
     }
     if(name == "") {
-        channelVideoUpdate(this, this.currentMedia.id);
+        if(this.currentMedia != null)
+            channelVideoUpdate(this, this.currentMedia.id);
         return;
     }
     for(var i = 0; i < this.users.length; i++) {
diff --git a/rank.js b/rank.js
index c57391d8..a4257d32 100644
--- a/rank.js
+++ b/rank.js
@@ -8,14 +8,15 @@
 
 exports.Guest = 0;
 exports.Member = 1;
-exports.Moderator = 4;
-exports.Owner = 8;
+exports.Moderator = 2;
+exports.Owner = 3;
 exports.Siteadmin = 255;
 
 var permissions = {
     queue: exports.Moderator,
     assignLeader: exports.Moderator,
     kick: exports.Moderator,
+    promote: exports.Moderator,
     search: exports.Guest,
     chat: exports.Guest,
 };
diff --git a/user.js b/user.js
index 358f460e..3d9b281f 100644
--- a/user.js
+++ b/user.js
@@ -63,14 +63,18 @@ User.prototype.initCallbacks = function() {
     }.bind(this));
 
     this.socket.on('promote', function(data) {
-        if(this.channel != null) {
-            this.channel.promoteUser(this, data.name);
+        if(Rank.hasPermission(this, "promote")) {
+            if(this.channel != null) {
+                this.channel.promoteUser(this, data.name);
+            }
         }
     }.bind(this));
 
     this.socket.on('demote', function(data) {
-        if(this.channel != null) {
-            this.channel.demoteUser(this, data.name);
+        if(Rank.hasPermission(this, "promote")) {
+            if(this.channel != null) {
+                this.channel.demoteUser(this, data.name);
+            }
         }
     }.bind(this));
 
diff --git a/www/assets/js/callbacks.js b/www/assets/js/callbacks.js
index 4539b879..dd974bf9 100644
--- a/www/assets/js/callbacks.js
+++ b/www/assets/js/callbacks.js
@@ -150,7 +150,7 @@ function initCallbacks() {
                         PLAYER.api('getCurrentTime', function(data) {
                             socket.emit('mediaUpdate', {
                                 id: PLAYER.videoid,
-                                seconds: data.seconds,
+                                seconds: data,
                                 paused: false,
                                 type: "vi"
                             });
diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index 964bc82c..86b2d988 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -19,8 +19,8 @@ var pw = readCookie('sync_pw');
 var Rank = {
     Guest: 0,
     Member: 1,
-    Moderator: 4,
-    Owner: 8,
+    Moderator: 2,
+    Owner: 3,
     Siteadmin: 255
 };