fucking fuck to the fucking fuckimum piece of retarded shit fucking h…

…ell how could I have been so fucking stupid fuck me
Zirak · May 25, 2013 · 940b9f0 · Zirak · May 25, 2013 · AmaanC
1 parent 007e3fb
commit 940b9f0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/master.js b/master.js
@@ -2840,10 +2840,10 @@ var join = function ( msgObj ) {
 };
 
 IO.register( 'userjoin', function ( msgObj ) {
-	bot.log( msgObj, 'userjoin' );
+	bot.log( msgObj, bot.users[msgObj.user_id], 'userjoin' );
 
 	var user = bot.users[ msgObj.user_id ];
-	if ( user ) {
+	if ( !user ) {
 		join( msgObj );
 	}
 	else {
@@ -4899,9 +4899,10 @@ function muteList () {
 }
 
 IO.register( 'userregister', function permissionCb ( user, room ) {
+	bot.log( user, room, 'permissionCb' );
 	var id = user.id;
 
-	if ( room !== ownerRoom || bot.isOwner(id) || muted[id] ) {
+	if ( Number(room) !== ownerRoom || bot.isOwner(id) || muted[id] ) {
 		bot.log( 'not giving voice', user, room );
 		return;
 	}

diff --git a/master.min.js b/master.min.js
diff --git a/source/plugins/roomPermissions.js b/source/plugins/roomPermissions.js
@@ -61,9 +61,10 @@ function muteList () {
 }
 
 IO.register( 'userregister', function permissionCb ( user, room ) {
+	bot.log( user, room, 'permissionCb' );
 	var id = user.id;
 
-	if ( room !== ownerRoom || bot.isOwner(id) || muted[id] ) {
+	if ( Number(room) !== ownerRoom || bot.isOwner(id) || muted[id] ) {
 		bot.log( 'not giving voice', user, room );
 		return;
 	}

diff --git a/source/users.js b/source/users.js
@@ -18,10 +18,10 @@ var join = function ( msgObj ) {
 };
 
 IO.register( 'userjoin', function ( msgObj ) {
-	bot.log( msgObj, 'userjoin' );
+	bot.log( msgObj, bot.users[msgObj.user_id], 'userjoin' );
 
 	var user = bot.users[ msgObj.user_id ];
-	if ( user ) {
+	if ( !user ) {
 		join( msgObj );
 	}
 	else {