Move Notify to inside package rockectchat-lib and renamte to Notifications

client/lib/msgTyping.coffee

@@ -10,7 +10,7 @@
 	addStream = (room) ->
 		if _.isEmpty usersTyping[room]?.users
 			usersTyping[room] = { users: {} }
-			Notify.onRoom room, (type, typing) ->
+			RocketChat.Notifications.onRoom room, (type, typing) ->
 				console.log arguments
 				if type isnt 'typing' then return
 
@@ -43,7 +43,7 @@
 
 		renew = false
 		selfTyping.set true
-		Notify.notifyRoom room, 'typing', { room: room, username: Meteor.user()?.username, start: true }
+		RocketChat.Notifications.notifyRoom room, 'typing', { room: room, username: Meteor.user()?.username, start: true }
 		clearTimeout timeouts[room]
 		timeouts[room] = Meteor.setTimeout ->
 			stop(room)
@@ -55,7 +55,7 @@
 		if timeouts?[room]?
 			clearTimeout(timeouts[room])
 			timeouts[room] = null
-		Notify.notifyRoom room, 'typing', { room: room, username: Meteor.user()?.username, stop: true }
+		RocketChat.Notifications.notifyRoom room, 'typing', { room: room, username: Meteor.user()?.username, stop: true }
 
 	get = (room) ->
 		dep.depend()

packages/rocketchat-lib/client/Notifications.coffee

@@ -1,4 +1,4 @@
-@Notify = new class
+RocketChat.Notifications = new class
 	constructor: ->
 		@debug = true
 		@streamAll = new Meteor.Stream 'notify-all'
@@ -6,18 +6,18 @@
 		@streamUser = new Meteor.Stream 'notify-user'
 
 		if @debug is true
-			@onAll -> console.log "Notify: onAll", arguments
-			@onUser -> console.log "Notify: onAll", arguments
+			@onAll -> console.log "RocketChat.Notifications: onAll", arguments
+			@onUser -> console.log "RocketChat.Notifications: onAll", arguments
 
 
 	notifyRoom: (room, args...) ->
-		console.log "Notify: notifyRoom", arguments if @debug is true
+		console.log "RocketChat.Notifications: notifyRoom", arguments if @debug is true
 
 		args = [room].concat args
 		@streamRoom.emit.apply @streamRoom, args
 
 	notifyUser: (userId, args...) ->
-		console.log "Notify: notifyUser", arguments if @debug is true
+		console.log "RocketChat.Notifications: notifyUser", arguments if @debug is true
 
 		args = [userId].concat args
 		@streamUser.emit.apply @streamUser, args
@@ -29,7 +29,7 @@
 	onRoom: (room, callback) ->
 		console.log 'onRoom'
 		if @debug is true
-			@streamRoom.on room, -> console.log "Notify: onRoom #{room}", arguments
+			@streamRoom.on room, -> console.log "RocketChat.Notifications: onRoom #{room}", arguments
 
 		@streamRoom.on room, callback
 

packages/rocketchat-lib/package.js

@@ -8,51 +8,53 @@ Package.describe({
 Package.onUse(function(api) {
 	api.versionsFrom('1.0');
 
-	api.use([
-		'reactive-dict',
-		'coffeescript',
-		'random',
-		'underscore',
-		'underscorestring:underscore.string'
-	]);
-
-	api.addFiles('lib/core.coffee', ['server', 'client']);
-	api.addFiles('lib/callbacks.coffee', ['server', 'client']);
-	api.addFiles('lib/slashCommand.coffee', ['server', 'client']);
-	
-	api.addFiles([
-		'server/functions/checkUsernameAvailability.coffee',
-		'server/functions/setUsername.coffee'
-	], ['server']);
-	
-	api.addFiles([
-		'server/methods/joinDefaultChannels.coffee',
-		'server/methods/setAdminStatus.coffee',
-		'server/methods/setUsername.coffee',
-		'server/methods/updateUser.coffee'
-	], ['server']);
-
-	api.addFiles('server/sendMessage.coffee', ['server']);
-
-	api.addFiles([
-		'settings/lib/settings.coffee',
-		'settings/lib/rocketchat.coffee'
-	], ['server', 'client']);
-
-	api.addFiles('settings/client/startup.coffee', ['client']);
-	api.addFiles('settings/client/rocketchat.coffee', ['client']);
-
-	api.addFiles([
-		'settings/server/methods.coffee',
-		'settings/server/publication.coffee',
-		'settings/server/startup.coffee',
-		'settings/server/updateServices.coffee',
-		'settings/server/addOAuthService.coffee'
-	], ['server']);
-
-	api.addFiles('server/cdn.coffee', ['server']);
-
-	api.export(['RocketChat'], ['server', 'client']);
+	api.use('reactive-dict');
+	api.use('coffeescript');
+	api.use('random');
+	api.use('underscore');
+	api.use('underscorestring:underscore.string');
+
+
+	// COMMON
+	api.addFiles('lib/core.coffee');
+	api.addFiles('lib/callbacks.coffee');
+	api.addFiles('lib/slashCommand.coffee');
+
+	api.addFiles('settings/lib/settings.coffee');
+	api.addFiles('settings/lib/rocketchat.coffee');
+
+
+	// CLIENT
+	api.addFiles('client/Notifications.coffee', 'client');
+
+	api.addFiles('settings/client/startup.coffee', 'client');
+	api.addFiles('settings/client/rocketchat.coffee', 'client');
+
+
+	// SERVER
+	api.addFiles('server/functions/checkUsernameAvailability.coffee', 'server');
+	api.addFiles('server/functions/setUsername.coffee', 'server');
+
+	api.addFiles('server/methods/joinDefaultChannels.coffee', 'server');
+	api.addFiles('server/methods/setAdminStatus.coffee', 'server');
+	api.addFiles('server/methods/setUsername.coffee', 'server');
+	api.addFiles('server/methods/updateUser.coffee', 'server');
+
+	api.addFiles('server/sendMessage.coffee', 'server');
+
+	api.addFiles('server/Notifications.coffee', 'server');
+
+	api.addFiles('settings/server/methods.coffee', 'server');
+	api.addFiles('settings/server/publication.coffee', 'server');
+	api.addFiles('settings/server/startup.coffee', 'server');
+	api.addFiles('settings/server/updateServices.coffee', 'server');
+	api.addFiles('settings/server/addOAuthService.coffee', 'server');
+
+	api.addFiles('server/cdn.coffee', 'server');
+
+
+	// EXPORT
+	api.export('RocketChat');
 });
 
 Package.onTest(function(api) {

packages/rocketchat-lib/server/Notifications.coffee

@@ -1,4 +1,4 @@
-@NotifyClient = new class
+RocketChat.Notifications = new class
 	constructor: ->
 		self = @
 

server/stream/streamBroadcast.coffee

@@ -54,9 +54,9 @@
 
 Meteor.startup ->
 	config =
-		'NotifyClient.streamAll': NotifyClient.streamAll
-		'NotifyClient.streamRoom': NotifyClient.streamRoom
-		'NotifyClient.streamUser': NotifyClient.streamUser
+		'RocketChat.Notifications.streamAll': RocketChat.Notifications.streamAll
+		'RocketChat.Notifications.streamRoom': RocketChat.Notifications.streamRoom
+		'RocketChat.Notifications.streamUser': RocketChat.Notifications.streamUser
 		'deleteMsgStream': deleteMsgStream
 
 	if webrtc