Permalink
Browse files

cleanup of room changes

  • Loading branch information...
1 parent eb4c356 commit 0f99c0719a1593618e72fe7fe52795032e0956e9 Kevin Nuut committed Apr 28, 2012
View
@@ -68,7 +68,7 @@ var AppAction = {
// Delete room user, but avoid if they went back to same room
if (oldRoom && oldRoom.name != room.name) {
- this.removeRoomUser(user, oldRoom, prevMessage);
+ this.removeRoomUser(user, oldRoom, prevMessage || 'went to #' + room.name);
}
} catch (err) {
console.log('AppAction.addRoomUser');
@@ -163,7 +163,7 @@ var AppAction = {
this.messageUser('restart', {
message: message
}, user);
- } else {
+ } else if (message != -1) {
this.messageUser('logout', {}, user);
}
View
@@ -23,6 +23,9 @@ var AppBoiler = {
if (page != sanePage) {
res.writeHead(303, {'Location': '/' + sanePage});
res.end();
+
+ // Return true so the rest of oauthreq doesn't occur
+ return true;
} else {
// Store the page for when callback occurs
req.session.page = sanePage;
@@ -80,6 +83,7 @@ var AppBoiler = {
}
}
} catch (err) {
+ console.log('AppBoiler.onConnect');
console.log(err.stack || err.message || err);
}
},
@@ -138,7 +142,6 @@ var AppBoiler = {
this.messageClient(this.getSocket(user.sid), method, request);
} catch(err) {
console.log('AppBoiler.messageUser ' + method);
- console.log(request);
console.log(err.stack || err.message || err);
}
},
@@ -181,7 +184,7 @@ var AppBoiler = {
if (!user.isConnected() && time - user.tsDisconnect > this.timerList.remove) {
console.log('disconnecting ' + user.uid);
- this.removeUser(user, 'You were disconnected for too long (C1).');
+ this.removeUser(user, -1);
} else if (!user.isIdle() && time - user.tsMessage > this.timerList.idle) {
console.log('setting to idle ' + user.uid);

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
View
@@ -87,9 +87,9 @@ <h1 id="header">Chatlr</h1>
google_ad_height = 600;
//-->
</script>
- <!--
+
<script type="text/javascript" src="http://pagead2.googlesyndication.com/pagead/show_ads.js"></script>
- -->
+
</div>
</div>

0 comments on commit 0f99c07

Please sign in to comment.