Merge pull request #802 from RocketChat/rename-external

Rename external
RocketChat · Sep 14, 2015 · 21621cb · 21621cb
2 parents 2ddbb0b + 22b4763
commit 21621cb
Show file tree

Hide file tree

Showing 46 changed files with 51 additions and 50 deletions.
diff --git a/.meteor/packages b/.meteor/packages
@@ -42,7 +42,7 @@ rocketchat:slashcommands-join
 rocketchat:slashcommands-leave
 rocketchat:statistics
 rocketchat:webrtc
-#rocketchat:external
+#rocketchat:livechat
 #rocketchat:hubot
 #rocketchat:irc
 

diff --git a/.travis.yml b/.travis.yml
@@ -7,6 +7,6 @@ before_install:
   - "curl https://install.meteor.com | /bin/sh"
 
 script:
-  - meteor add rocketchat:external
+  - meteor add rocketchat:livechat
   - meteor add rocketchat:hubot
-  - meteor build --server demo.rocket.chat ./
+  - meteor build --server demo.rocket.chat ./
diff --git a/build.sh b/build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 source ./build-info.sh
 export METEOR_SETTINGS=$(cat settings.json)
-meteor add rocketchat:external
+meteor add rocketchat:livechat
 meteor add rocketchat:hubot
 meteor build --server https://demo.rocket.chat --directory /var/www/rocket.chat
 cd /var/www/rocket.chat/bundle/programs/server

diff --git a/packages/rocketchat-external/app/client/startup/visitor.coffee b/packages/rocketchat-external/app/client/startup/visitor.coffee
diff --git a/packages/rocketchat-external/plugin/build.sh b/packages/rocketchat-external/plugin/build.sh
diff --git a/packages/rocketchat-lib/server/sendMessage.coffee b/packages/rocketchat-lib/server/sendMessage.coffee
@@ -53,6 +53,7 @@ RocketChat.sendMessage = (user, message, room, options) ->
 	Meteor.defer ->
 
 		if not room.t? or room.t is 'd'
+
 			###
 			Update the other subscriptions
 			###

diff --git a/packages/rocketchat-external/.gitignore → packages/rocketchat-livechat/.gitignore b/packages/rocketchat-external/.gitignore → packages/rocketchat-livechat/.gitignore
diff --git a/...-external/app/.meteor/.finished-upgraders → ...-livechat/app/.meteor/.finished-upgraders b/...-external/app/.meteor/.finished-upgraders → ...-livechat/app/.meteor/.finished-upgraders
diff --git a/...ocketchat-external/app/.meteor/.gitignore → ...ocketchat-livechat/app/.meteor/.gitignore b/...ocketchat-external/app/.meteor/.gitignore → ...ocketchat-livechat/app/.meteor/.gitignore
diff --git a/packages/rocketchat-external/app/.meteor/.id → packages/rocketchat-livechat/app/.meteor/.id b/packages/rocketchat-external/app/.meteor/.id → packages/rocketchat-livechat/app/.meteor/.id
diff --git a/.../rocketchat-external/app/.meteor/packages → .../rocketchat-livechat/app/.meteor/packages b/.../rocketchat-external/app/.meteor/packages → .../rocketchat-livechat/app/.meteor/packages
diff --git a/...rocketchat-external/app/.meteor/platforms → ...rocketchat-livechat/app/.meteor/platforms b/...rocketchat-external/app/.meteor/platforms → ...rocketchat-livechat/app/.meteor/platforms
diff --git a/...s/rocketchat-external/app/.meteor/release → ...s/rocketchat-livechat/app/.meteor/release b/...s/rocketchat-external/app/.meteor/release → ...s/rocketchat-livechat/app/.meteor/release
diff --git a/.../rocketchat-external/app/.meteor/versions → .../rocketchat-livechat/app/.meteor/versions b/.../rocketchat-external/app/.meteor/versions → .../rocketchat-livechat/app/.meteor/versions
diff --git a/.../app/client/lib/RoomHistoryManager.coffee → .../app/client/lib/RoomHistoryManager.coffee b/.../app/client/lib/RoomHistoryManager.coffee → .../app/client/lib/RoomHistoryManager.coffee
diff --git a/...t-external/app/client/lib/_visitor.coffee → ...t-livechat/app/client/lib/_visitor.coffee b/...t-external/app/client/lib/_visitor.coffee → ...t-livechat/app/client/lib/_visitor.coffee
diff --git a/...hat-external/app/client/lib/avatar.coffee → ...hat-livechat/app/client/lib/avatar.coffee b/...hat-external/app/client/lib/avatar.coffee → ...hat-livechat/app/client/lib/avatar.coffee
diff --git a/...ternal/app/client/lib/chatMessages.coffee → ...vechat/app/client/lib/chatMessages.coffee b/...ternal/app/client/lib/chatMessages.coffee → ...vechat/app/client/lib/chatMessages.coffee
@@ -87,7 +87,7 @@ class @ChatMessages
 				else
 					#Run to allow local encryption
 					# Meteor.call 'onClientBeforeSendMessage', {}
-					Meteor.call 'sendMessageExternal', msgObject, (error, result) ->
+					Meteor.call 'sendMessageLivechat', msgObject, (error, result) ->
 						if error
 							ChatMessage.update msgObject._id, { $set: { error: true } }
 							showError error.reason

diff --git a/...xternal/app/client/lib/collections.coffee → ...ivechat/app/client/lib/collections.coffee b/...xternal/app/client/lib/collections.coffee → ...ivechat/app/client/lib/collections.coffee
diff --git a/...chat-external/app/client/lib/error.coffee → ...chat-livechat/app/client/lib/error.coffee b/...chat-external/app/client/lib/error.coffee → ...chat-livechat/app/client/lib/error.coffee
diff --git a/...-external/app/client/lib/msgTyping.coffee → ...-livechat/app/client/lib/msgTyping.coffee b/...-external/app/client/lib/msgTyping.coffee → ...-livechat/app/client/lib/msgTyping.coffee
diff --git a/...external/app/client/lib/parentCall.coffee → ...livechat/app/client/lib/parentCall.coffee b/...external/app/client/lib/parentCall.coffee → ...livechat/app/client/lib/parentCall.coffee
diff --git a/...client/methods/sendMessageExternal.coffee → ...client/methods/sendMessageExternal.coffee b/...client/methods/sendMessageExternal.coffee → ...client/methods/sendMessageExternal.coffee
@@ -1,5 +1,5 @@
 Meteor.methods
-	sendMessageExternal: (message) ->
+	sendMessageLivechat: (message) ->
 		if s.trim(message.msg) isnt ''
 
 			message.ts = new Date(Date.now() + TimeSync.serverOffset())

diff --git a/...-external/app/client/routes/router.coffee → ...-livechat/app/client/routes/router.coffee b/...-external/app/client/routes/router.coffee → ...-livechat/app/client/routes/router.coffee
@@ -1,4 +1,4 @@
-FlowRouter.route '/external',
+FlowRouter.route '/livechat',
 	name: 'index'
 
 	triggersEnter: [

diff --git a/...t-external/app/client/startup/room.coffee → ...t-livechat/app/client/startup/room.coffee b/...t-external/app/client/startup/room.coffee → ...t-livechat/app/client/startup/room.coffee
diff --git a/packages/rocketchat-livechat/app/client/startup/visitor.coffee b/packages/rocketchat-livechat/app/client/startup/visitor.coffee
@@ -0,0 +1,7 @@
+@visitorId = new ReactiveVar null
+
+Meteor.startup ->
+	if not localStorage.getItem('rocketChatLivechat')?
+		localStorage.setItem('rocketChatLivechat', Random.id())
+
+	visitorId.set localStorage.getItem('rocketChatLivechat')
diff --git a/...al/app/client/stylesheets/_variables.less → ...at/app/client/stylesheets/_variables.less b/...al/app/client/stylesheets/_variables.less → ...at/app/client/stylesheets/_variables.less
diff --git a/...external/app/client/stylesheets/main.less → ...livechat/app/client/stylesheets/main.less b/...external/app/client/stylesheets/main.less → ...livechat/app/client/stylesheets/main.less
@@ -40,7 +40,7 @@ input:focus {
 	box-shadow: 0 0 0;
 }
 
-.external-room {
+.livechat-room {
 	position: fixed;
 	top: 0;
 	bottom: 0;
@@ -321,7 +321,7 @@ input:focus {
 }
 
 @media all and(max-height: 200px) {
-	.external-room {
+	.livechat-room {
 		.title {
 			height: 100%;
 		}

diff --git a/.../stylesheets/utils/_keyframes.import.less → .../stylesheets/utils/_keyframes.import.less b/.../stylesheets/utils/_keyframes.import.less → .../stylesheets/utils/_keyframes.import.less
diff --git a/...nt/stylesheets/utils/_lesshat.import.less → ...nt/stylesheets/utils/_lesshat.import.less b/...nt/stylesheets/utils/_lesshat.import.less → ...nt/stylesheets/utils/_lesshat.import.less
diff --git a/...ient/stylesheets/utils/_reset.import.less → ...ient/stylesheets/utils/_reset.import.less b/...ient/stylesheets/utils/_reset.import.less → ...ient/stylesheets/utils/_reset.import.less
diff --git a/...t-external/app/client/views/avatar.coffee → ...t-livechat/app/client/views/avatar.coffee b/...t-external/app/client/views/avatar.coffee → ...t-livechat/app/client/views/avatar.coffee
diff --git a/...hat-external/app/client/views/avatar.html → ...hat-livechat/app/client/views/avatar.html b/...hat-external/app/client/views/avatar.html → ...hat-livechat/app/client/views/avatar.html
diff --git a/...tchat-external/app/client/views/main.html → ...tchat-livechat/app/client/views/main.html b/...tchat-external/app/client/views/main.html → ...tchat-livechat/app/client/views/main.html
diff --git a/...-external/app/client/views/message.coffee → ...-livechat/app/client/views/message.coffee b/...-external/app/client/views/message.coffee → ...-livechat/app/client/views/message.coffee
diff --git a/...at-external/app/client/views/message.html → ...at-livechat/app/client/views/message.html b/...at-external/app/client/views/message.html → ...at-livechat/app/client/views/message.html
diff --git a/...hat-external/app/client/views/room.coffee → ...hat-livechat/app/client/views/room.coffee b/...hat-external/app/client/views/room.coffee → ...hat-livechat/app/client/views/room.coffee
diff --git a/...tchat-external/app/client/views/room.html → ...tchat-livechat/app/client/views/room.html b/...tchat-external/app/client/views/room.html → ...tchat-livechat/app/client/views/room.html
@@ -1,5 +1,5 @@
 <template name="room">
-	<div class="external-room">
+	<div class="livechat-room">
 		<div class="title">
 			<h1>Rocket.Chat</h1>
 		</div>

diff --git a/packages/rocketchat-external/app/run.sh → packages/rocketchat-livechat/app/run.sh b/packages/rocketchat-external/app/run.sh → packages/rocketchat-livechat/app/run.sh
diff --git a/packages/rocketchat-external/external.coffee → packages/rocketchat-livechat/livechat.coffee b/packages/rocketchat-external/external.coffee → packages/rocketchat-livechat/livechat.coffee
@@ -1,15 +1,15 @@
 WebApp = Package.webapp.WebApp
 Autoupdate = Package.autoupdate.Autoupdate
 
-WebApp.connectHandlers.use '/external/', (req, res, next) ->
+WebApp.connectHandlers.use '/livechat/', (req, res, next) ->
 	res.setHeader 'content-type', 'html'
 
 	head = Assets.getText('public/head.html')
 
 	html = """
 	<html>
 		<head>
-			<link rel="stylesheet" type="text/css" class="__meteor-css__" href="/packages/rocketchat_external/public/external.css?_dc=#{Autoupdate.autoupdateVersion}">
+			<link rel="stylesheet" type="text/css" class="__meteor-css__" href="/packages/rocketchat_livechat/public/livechat.css?_dc=#{Autoupdate.autoupdateVersion}">
 			<script type="text/javascript">
 				__meteor_runtime_config__ = {
 					"meteorRelease": "METEOR@1.1.0.2",
@@ -20,7 +20,7 @@ WebApp.connectHandlers.use '/external/', (req, res, next) ->
 					"autoupdateVersionCordova": "#{Autoupdate.autoupdateVersionCordova}"
 				};
 			</script>
-			<script type="text/javascript" src="/packages/rocketchat_external/public/external.js?_dc=#{Autoupdate.autoupdateVersion}"></script>
+			<script type="text/javascript" src="/packages/rocketchat_livechat/public/livechat.js?_dc=#{Autoupdate.autoupdateVersion}"></script>
 
 			#{head}
 		</head>

diff --git a/packages/rocketchat-external/methods.coffee → packages/rocketchat-livechat/methods.coffee b/packages/rocketchat-external/methods.coffee → packages/rocketchat-livechat/methods.coffee
@@ -32,8 +32,8 @@ Meteor.methods
 			pass: pass
 		}
 
-	sendMessageExternal: (message) ->
-		console.log 'sendMessageExternal ->',arguments
+	sendMessageLivechat: (message) ->
+		console.log 'sendMessageLivechat ->',arguments
 
 		check message.rid, String
 		check message.token, String

diff --git a/packages/rocketchat-external/package.js → packages/rocketchat-livechat/package.js b/packages/rocketchat-external/package.js → packages/rocketchat-livechat/package.js
@@ -1,14 +1,14 @@
 Package.describe({
-	name: 'rocketchat:external',
+	name: 'rocketchat:livechat',
 	version: '0.0.1',
-	summary: 'External for Rocket.Chat'
+	summary: 'Livechat plugin for Rocket.Chat'
 });
 
 Package.registerBuildPlugin({
-	name: "builExternal",
+	name: "builLivechat",
 	use: [],
 	sources: [
-		'plugin/build-external.js'
+		'plugin/build-livechat.js'
 	],
 	npmDependencies: {
 		"shelljs": "0.5.1"
@@ -20,12 +20,12 @@ Package.onUse(function(api) {
 
 	api.use(['coffeescript', 'webapp', 'autoupdate'], 'server');
 
-	api.addFiles('external.coffee', 'server');
+	api.addFiles('livechat.coffee', 'server');
 	api.addFiles('methods.coffee', 'server');
 	api.addFiles('publications.coffee', 'server');
 
-	api.addFiles('rocket-external.js', 'client', {isAsset: true});
-	api.addFiles('public/external.css', 'client', {isAsset: true});
-	api.addFiles('public/external.js', 'client', {isAsset: true});
+	api.addFiles('rocket-livechat.js', 'client', {isAsset: true});
+	api.addFiles('public/livechat.css', 'client', {isAsset: true});
+	api.addFiles('public/livechat.js', 'client', {isAsset: true});
 	api.addFiles('public/head.html', 'server', {isAsset: true});
 });
diff --git a/...ketchat-external/plugin/build-external.js → ...ketchat-livechat/plugin/build-livechat.js b/...ketchat-external/plugin/build-external.js → ...ketchat-livechat/plugin/build-livechat.js
@@ -3,7 +3,7 @@ var path = Npm.require('path');
 var shell = Npm.require('shelljs');
 
 var curPath = path.resolve('.')
-var packagePath = path.join(path.resolve('.'), 'packages', 'rocketchat-external');
+var packagePath = path.join(path.resolve('.'), 'packages', 'rocketchat-livechat');
 var pluginPath = path.join(packagePath, 'plugin');
 
-shell.exec('sh '+pluginPath+'/build.sh');
+shell.exec('sh '+pluginPath+'/build.sh');
diff --git a/packages/rocketchat-livechat/plugin/build.sh b/packages/rocketchat-livechat/plugin/build.sh
@@ -0,0 +1,16 @@
+cd packages/rocketchat-livechat/app
+meteor build .meteor/build/ --directory
+
+mkdir -p ../public
+
+rm -f ../public/livechat.css
+rm -f ../public/livechat.js
+rm -f ../public/head.html
+
+cp .meteor/build/bundle/programs/web.browser/*.css ../public/livechat.css
+cp .meteor/build/bundle/programs/web.browser/*.js ../public/livechat.js
+cp .meteor/build/bundle/programs/web.browser/head.html ../public/head.html
+
+# echo "body {background-color: red;}" > livechat.css
+
+rm -rf .meteor/build/
diff --git a/...s/rocketchat-external/publications.coffee → ...s/rocketchat-livechat/publications.coffee b/...s/rocketchat-external/publications.coffee → ...s/rocketchat-livechat/publications.coffee
diff --git a/...es/rocketchat-external/rocket-external.js → ...es/rocketchat-livechat/rocket-livechat.js b/...es/rocketchat-external/rocket-external.js → ...es/rocketchat-livechat/rocket-livechat.js
@@ -4,9 +4,9 @@
 // 		var h = d.getElementsByTagName(s)[0],
 // 			j = d.createElement(s);
 // 		j.async = true;
-// 		j.src = 'rocket-external.js';
+// 		j.src = 'rocket-livechat.js';
 // 		h.parentNode.insertBefore(j, h);
-// 	})(window, document, 'script', 'initRocket', 'http://localhost:5000/external');
+// 	})(window, document, 'script', 'initRocket', 'http://localhost:5000/livechat');
 // </script>
 
 ;(function(w) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,6 +53,7 @@ RocketChat.sendMessage = (user, message, room, options) -> @@
     	Meteor.defer ->
     		if not room.t? or room.t is 'd'
     			###
     			Update the other subscriptions
     			###
@@ Expand Down @@