Skip to content
Snippets Groups Projects
Commit 21621cb6 authored by Gabriel Engel's avatar Gabriel Engel
Browse files

Merge pull request #802 from RocketChat/rename-external

Rename external
parents 2ddbb0b5 22b47630
No related branches found
No related tags found
No related merge requests found
Showing
with 6 additions and 12 deletions
......@@ -42,7 +42,7 @@ rocketchat:slashcommands-join
rocketchat:slashcommands-leave
rocketchat:statistics
rocketchat:webrtc
#rocketchat:external
#rocketchat:livechat
#rocketchat:hubot
#rocketchat:irc
......
......@@ -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 ./
\ No newline at end of file
- meteor build --server demo.rocket.chat ./
#!/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
......
@visitorId = new ReactiveVar null
Meteor.startup ->
if not localStorage.getItem('rocketChatExternal')?
localStorage.setItem('rocketChatExternal', Random.id())
visitorId.set localStorage.getItem('rocketChatExternal')
......@@ -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
###
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment