Merge branch 'master' of github.com:Fauntleroy/relay.js

assets/scripts/models/channel.js

@@ -49,7 +49,7 @@ module.exports = Backbone.Model.extend({
 		this.destroy();
 	},
 	doAddMessage: function( message ){
-		if( this.get('active') ) this.mediator.trigger( 'active:messages:add', message );
+		if( this.get('active') ) this.mediator.trigger( 'active:messages:add', message.toJSON() );
 		if( !this.get('active') && message.get('message') ){
 			var unread = this.get('unread');
 			this.set( 'unread', unread + 1 );

assets/scripts/models/title.js

@@ -11,16 +11,18 @@ module.exports = Backbone.Model.extend({
 	initialize: function( data, mediator ){
 		_( this ).bindAll( 'updateVisibility', 'clearUnread' );
 		this.mediator = mediator;
-		this.listenTo( this.mediator, 'chat:active:message', this.updateUnread );
+		this.listenTo( this.mediator, 'active:messages:add', this.updateUnread );
 		this.listenTo( this.mediator, 'channels:active', this.updateChannel );
 		Visibility.change( this.updateVisibility );
 	},
 	isHidden: function(){
 		return Visibility.hidden();
 	},
-	updateUnread: function(){
+	// update unread message count
+	// only updates for 'message' type messages now
+	updateUnread: function( message ){
 		if( !this.isHidden() ) return;
-		this.set( 'unread', this.get('unread') + 1 );
+		if( message.message ) this.set( 'unread', this.get('unread') + 1 );
 	},
 	updateChannel: function( channel ){
 		this.set( 'channel', channel );

lib/server.js

@@ -79,7 +79,7 @@ module.exports = function( config ){
 
 		try {
 
-			var preset_server = ( config.defaults.locked )? config.defaults.server: {};
+			var preset_server = ( config.defaults.server.locked )? config.defaults.server: {};
 
 			irc_adapter = new Adapter({
 				server: preset_server.host || parameters.server,