From 079dd23c737007a5f1c1924d2e37fcffa56af479 Mon Sep 17 00:00:00 2001
From: Rodrigo Nascimento <rodrigoknascimento@gmail.com>
Date: Sat, 5 Sep 2015 09:15:37 -0300
Subject: [PATCH] Replace webrtc stream by Notifications stream

---
 packages/rocketchat-webrtc/common.js  |  1 -
 packages/rocketchat-webrtc/package.js | 14 ++++----------
 packages/rocketchat-webrtc/server.js  | 18 ------------------
 packages/rocketchat-webrtc/webrtc.js  |  9 +++++----
 server/stream/streamBroadcast.coffee  |  3 ---
 5 files changed, 9 insertions(+), 36 deletions(-)
 delete mode 100644 packages/rocketchat-webrtc/common.js
 delete mode 100644 packages/rocketchat-webrtc/server.js

diff --git a/packages/rocketchat-webrtc/common.js b/packages/rocketchat-webrtc/common.js
deleted file mode 100644
index a4cd85fd360..00000000000
--- a/packages/rocketchat-webrtc/common.js
+++ /dev/null
@@ -1 +0,0 @@
-stream = new Meteor.Stream('webrtc');
\ No newline at end of file
diff --git a/packages/rocketchat-webrtc/package.js b/packages/rocketchat-webrtc/package.js
index b80b4e64910..fe0e62fb242 100644
--- a/packages/rocketchat-webrtc/package.js
+++ b/packages/rocketchat-webrtc/package.js
@@ -8,18 +8,12 @@ Package.describe({
 Package.onUse(function(api) {
 	api.versionsFrom('1.0');
 
-	api.use([
-		'coffeescript',
-		'arunoda:streams@0.1.17',
-		'rocketchat:lib@0.0.1'
-	]);
+	api.use('rocketchat:lib@0.0.1', 'client');
 
-	api.addFiles('common.js');
-	api.addFiles('adapter.js', ['client']);
-	api.addFiles('webrtc.js', ['client']);
-	api.addFiles('server.js', ['server']);
+	api.addFiles('adapter.js', 'client');
+	api.addFiles('webrtc.js', 'client');
 
-	api.export('webrtc')
+	api.export('webrtc');
 });
 
 
diff --git a/packages/rocketchat-webrtc/server.js b/packages/rocketchat-webrtc/server.js
deleted file mode 100644
index d305ebe10c5..00000000000
--- a/packages/rocketchat-webrtc/server.js
+++ /dev/null
@@ -1,18 +0,0 @@
-webrtc = {
-	stream: stream
-}
-
-stream.permissions.write(function(eventName) {
-	console.log('stream.permissions.write', this.userId);
-	return eventName == 'send' && this.userId;
-});
-
-stream.permissions.read(function(eventName) {
-	console.log('stream.permissions.read', this.userId, eventName);
-	return this.userId == eventName;
-});
-
-stream.on('send', function(data) {
-	console.log('send', data);
-	stream.emit(data.to, data);
-});
\ No newline at end of file
diff --git a/packages/rocketchat-webrtc/webrtc.js b/packages/rocketchat-webrtc/webrtc.js
index 7fc22064707..e851cf3e4c6 100644
--- a/packages/rocketchat-webrtc/webrtc.js
+++ b/packages/rocketchat-webrtc/webrtc.js
@@ -10,12 +10,11 @@ webrtc = {
 			{url: "stun:stun.l.google.com:19302"}
 		]
 	},
-	stream: stream,
 	send: function(data) {
 		data.to = webrtc.to;
 		data.room = webrtc.room;
 		data.from = Meteor.user().username;
-		stream.emit('send', data);
+		RocketChat.Notifications.notifyUser(data.to, 'webrtc', data);
 	},
 	stop: function(sendEvent) {
 		if (webrtc.pc) {
@@ -23,7 +22,7 @@ webrtc = {
 				webrtc.pc.close();
 			}
 			if (sendEvent != false) {
-				stream.emit('send', {to: webrtc.to, room: webrtc.room, from: Meteor.userId(), close: true});
+				RocketChat.Notifications.notifyUser(webrtc.to, 'webrtc', {to: webrtc.to, room: webrtc.room, from: Meteor.userId(), close: true});
 			}
 		}
 	},
@@ -126,7 +125,9 @@ webrtc.start = function (isCaller, fromUsername) {
 	}
 }
 
-stream.on(Meteor.userId(), function(data) {
+RocketChat.Notifications.onUser(function(eventName, data) {
+	if (eventName !== 'webrtc') return
+
 	webrtc.log('stream.on', Meteor.userId(), data)
 	if (!webrtc.to) {
 		webrtc.to = data.room.replace(Meteor.userId(), '');
diff --git a/server/stream/streamBroadcast.coffee b/server/stream/streamBroadcast.coffee
index d1f18d86f79..49c608ec5e6 100644
--- a/server/stream/streamBroadcast.coffee
+++ b/server/stream/streamBroadcast.coffee
@@ -59,7 +59,4 @@ Meteor.startup ->
 		'RocketChat.Notifications.streamUser': RocketChat.Notifications.streamUser
 		'deleteMsgStream': deleteMsgStream
 
-	if webrtc
-		config['webrtc.stream'] = webrtc.stream
-
 	startStreamBroadcast config