- {{> icon block="mail-messages__instructions-icon" icon="modal-success"}}
+ {{> icon block="mail-messages__instructions-icon rc-icon--default-size" icon="checkmark-circled"}}
{{selectedMessages.length}} Messages selected
Click here to clear the selection
@@ -13,7 +13,7 @@
{{else}}
- {{> icon block="mail-messages__instructions-icon" icon="hand-pointer"}}
+ {{> icon block="mail-messages__instructions-icon rc-icon--default-size" icon="hand-pointer"}}
{{_ "Click_the_messages_you_would_like_to_send_by_email"}}
@@ -25,7 +25,7 @@
{{_ "To_users"}}
+
+
{{_ "Agents"}}
diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js b/app/livechat/client/views/app/livechatDepartmentForm.js
similarity index 86%
rename from packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js
rename to app/livechat/client/views/app/livechatDepartmentForm.js
index 1ecfeddd6966..5a807d3c10d1 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatDepartmentForm.js
+++ b/app/livechat/client/views/app/livechatDepartmentForm.js
@@ -2,13 +2,13 @@ import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { t, handleError } from '../../../../utils';
import { AgentUsers } from '../../collections/AgentUsers';
import { LivechatDepartment } from '../../collections/LivechatDepartment';
import { LivechatDepartmentAgents } from '../../collections/LivechatDepartmentAgents';
import _ from 'underscore';
import toastr from 'toastr';
+import './livechatDepartmentForm.html';
Template.livechatDepartmentForm.helpers({
department() {
@@ -28,6 +28,10 @@ Template.livechatDepartmentForm.helpers({
const department = Template.instance().department.get();
return department.showOnRegistration === value || (department.showOnRegistration === undefined && value === true);
},
+ showOnOfflineForm(value) {
+ const department = Template.instance().department.get();
+ return department.showOnOfflineForm === value || (department.showOnOfflineForm === undefined && value === true);
+ },
});
Template.livechatDepartmentForm.events({
@@ -40,6 +44,8 @@ Template.livechatDepartmentForm.events({
const name = instance.$('input[name=name]').val();
const description = instance.$('textarea[name=description]').val();
const showOnRegistration = instance.$('input[name=showOnRegistration]:checked').val();
+ const email = instance.$('input[name=email]').val();
+ const showOnOfflineForm = instance.$('input[name=showOnOfflineForm]:checked').val();
if (enabled !== '1' && enabled !== '0') {
return toastr.error(t('Please_select_enabled_yes_or_no'));
@@ -49,6 +55,10 @@ Template.livechatDepartmentForm.events({
return toastr.error(t('Please_fill_a_name'));
}
+ if (email.trim() === '' && showOnOfflineForm === '1') {
+ return toastr.error(t('Please_fill_an_email'));
+ }
+
const oldBtnValue = $btn.html();
$btn.html(t('Saving'));
@@ -57,6 +67,8 @@ Template.livechatDepartmentForm.events({
name: name.trim(),
description: description.trim(),
showOnRegistration: showOnRegistration === '1',
+ showOnOfflineForm: showOnOfflineForm === '1',
+ email: email.trim(),
};
const departmentAgents = [];
diff --git a/packages/rocketchat-livechat/client/views/app/livechatDepartments.html b/app/livechat/client/views/app/livechatDepartments.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatDepartments.html
rename to app/livechat/client/views/app/livechatDepartments.html
diff --git a/app/livechat/client/views/app/livechatDepartments.js b/app/livechat/client/views/app/livechatDepartments.js
new file mode 100644
index 000000000000..49400dd8bd34
--- /dev/null
+++ b/app/livechat/client/views/app/livechatDepartments.js
@@ -0,0 +1,53 @@
+import { Meteor } from 'meteor/meteor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
+import { modal } from '../../../../ui-utils';
+import { t, handleError } from '../../../../utils';
+import { LivechatDepartment } from '../../collections/LivechatDepartment';
+import './livechatDepartments.html';
+
+Template.livechatDepartments.helpers({
+ departments() {
+ return LivechatDepartment.find();
+ },
+});
+
+Template.livechatDepartments.events({
+ 'click .remove-department'(e/* , instance*/) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ modal.open({
+ title: t('Are_you_sure'),
+ type: 'warning',
+ showCancelButton: true,
+ confirmButtonColor: '#DD6B55',
+ confirmButtonText: t('Yes'),
+ cancelButtonText: t('Cancel'),
+ closeOnConfirm: false,
+ html: false,
+ }, () => {
+ Meteor.call('livechat:removeDepartment', this._id, function(error/* , result*/) {
+ if (error) {
+ return handleError(error);
+ }
+ modal.open({
+ title: t('Removed'),
+ text: t('Department_removed'),
+ type: 'success',
+ timer: 1000,
+ showConfirmButton: false,
+ });
+ });
+ });
+ },
+
+ 'click .department-info'(e/* , instance*/) {
+ e.preventDefault();
+ FlowRouter.go('livechat-department-edit', { _id: this._id });
+ },
+});
+
+Template.livechatDepartments.onCreated(function() {
+ this.subscribe('livechat:departments');
+});
diff --git a/app/livechat/client/views/app/livechatInstallation.html b/app/livechat/client/views/app/livechatInstallation.html
new file mode 100644
index 000000000000..3aced66ab596
--- /dev/null
+++ b/app/livechat/client/views/app/livechatInstallation.html
@@ -0,0 +1,18 @@
+
+ {{#requiresPermission 'view-livechat-manager'}}
+ {{{_ "To_install_the_new_version_of_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site"}}}
+
+
+
+
+
+
+ {{{_ "To_install_RocketChat_Livechat_in_your_website_copy_paste_this_code_above_the_last_body_tag_on_your_site"}}}
+
+
+
+
+
+
+ {{/requiresPermission}}
+
diff --git a/app/livechat/client/views/app/livechatInstallation.js b/app/livechat/client/views/app/livechatInstallation.js
new file mode 100644
index 000000000000..2e468c95f1d8
--- /dev/null
+++ b/app/livechat/client/views/app/livechatInstallation.js
@@ -0,0 +1,36 @@
+import { Template } from 'meteor/templating';
+import { settings } from '../../../../settings';
+import s from 'underscore.string';
+import './livechatInstallation.html';
+
+const latestVersion = '1.0.0';
+
+Template.livechatInstallation.helpers({
+ oldScript() {
+ const siteUrl = s.rtrim(settings.get('Site_Url'), '/');
+ return `
+
+`;
+ },
+
+ script() {
+ const siteUrl = s.rtrim(settings.get('Site_Url'), '/');
+ return `
+
+`;
+ },
+});
diff --git a/packages/rocketchat-livechat/client/views/app/livechatNotSubscribed.html b/app/livechat/client/views/app/livechatNotSubscribed.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatNotSubscribed.html
rename to app/livechat/client/views/app/livechatNotSubscribed.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatOfficeHours.html b/app/livechat/client/views/app/livechatOfficeHours.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatOfficeHours.html
rename to app/livechat/client/views/app/livechatOfficeHours.html
diff --git a/app/livechat/client/views/app/livechatOfficeHours.js b/app/livechat/client/views/app/livechatOfficeHours.js
new file mode 100644
index 000000000000..04844d35e897
--- /dev/null
+++ b/app/livechat/client/views/app/livechatOfficeHours.js
@@ -0,0 +1,165 @@
+import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { t, handleError } from '../../../../utils';
+import { settings } from '../../../../settings';
+import { LivechatOfficeHour } from '../../collections/livechatOfficeHour';
+import toastr from 'toastr';
+import moment from 'moment';
+import './livechatOfficeHours.html';
+
+Template.livechatOfficeHours.helpers({
+ days() {
+ return LivechatOfficeHour.find({}, { sort: { code: 1 } });
+ },
+ startName(day) {
+ return `${ day.day }_start`;
+ },
+ finishName(day) {
+ return `${ day.day }_finish`;
+ },
+ openName(day) {
+ return `${ day.day }_open`;
+ },
+ start(day) {
+ return Template.instance().dayVars[day.day].start.get();
+ },
+ finish(day) {
+ return Template.instance().dayVars[day.day].finish.get();
+
+ },
+ name(day) {
+ return TAPi18n.__(day.day);
+ },
+ open(day) {
+ return Template.instance().dayVars[day.day].open.get();
+ },
+ enableOfficeHoursTrueChecked() {
+ if (Template.instance().enableOfficeHours.get()) {
+ return 'checked';
+ }
+ },
+ enableOfficeHoursFalseChecked() {
+ if (!Template.instance().enableOfficeHours.get()) {
+ return 'checked';
+ }
+ },
+});
+
+Template.livechatOfficeHours.events({
+ 'change .preview-settings, keydown .preview-settings'(e, instance) {
+ const temp = e.currentTarget.name.split('_');
+
+ const newTime = moment(e.currentTarget.value, 'HH:mm');
+
+ // check if start and stop do not cross
+ if (temp[1] === 'start') {
+ if (newTime.isSameOrBefore(moment(instance.dayVars[temp[0]].finish.get(), 'HH:mm'))) {
+ instance.dayVars[temp[0]].start.set(e.currentTarget.value);
+ } else {
+ e.currentTarget.value = instance.dayVars[temp[0]].start.get();
+ }
+ } else if (temp[1] === 'finish') {
+ if (newTime.isSameOrAfter(moment(instance.dayVars[temp[0]].start.get(), 'HH:mm'))) {
+ instance.dayVars[temp[0]].finish.set(e.currentTarget.value);
+ } else {
+ e.currentTarget.value = instance.dayVars[temp[0]].finish.get();
+ }
+ }
+ },
+ 'change .dayOpenCheck input'(e, instance) {
+ const temp = e.currentTarget.name.split('_');
+ instance.dayVars[temp[0]][temp[1]].set(e.target.checked);
+ },
+ 'change .preview-settings, keyup .preview-settings'(e, instance) {
+ let { value } = e.currentTarget;
+ if (e.currentTarget.type === 'radio') {
+ value = value === 'true';
+ instance[e.currentTarget.name].set(value);
+ }
+ },
+ 'submit .rocket-form'(e, instance) {
+ e.preventDefault();
+
+ // convert all times to utc then update them in db
+ for (const d in instance.dayVars) {
+ if (instance.dayVars.hasOwnProperty(d)) {
+ const day = instance.dayVars[d];
+ const start_utc = moment(day.start.get(), 'HH:mm').utc().format('HH:mm');
+ const finish_utc = moment(day.finish.get(), 'HH:mm').utc().format('HH:mm');
+
+ Meteor.call('livechat:saveOfficeHours', d, start_utc, finish_utc, day.open.get(), function(err /* ,result*/) {
+ if (err) {
+ return handleError(err);
+ }
+ });
+ }
+ }
+
+ settings.set('Livechat_enable_office_hours', instance.enableOfficeHours.get(), (err/* , success*/) => {
+ if (err) {
+ return handleError(err);
+ }
+ toastr.success(t('Office_hours_updated'));
+ });
+ },
+});
+
+Template.livechatOfficeHours.onCreated(function() {
+ this.dayVars = {
+ Monday: {
+ start: new ReactiveVar('08:00'),
+ finish: new ReactiveVar('20:00'),
+ open: new ReactiveVar(true),
+ },
+ Tuesday: {
+ start: new ReactiveVar('00:00'),
+ finish: new ReactiveVar('00:00'),
+ open: new ReactiveVar(true),
+ },
+ Wednesday: {
+ start: new ReactiveVar('00:00'),
+ finish: new ReactiveVar('00:00'),
+ open: new ReactiveVar(true),
+ },
+ Thursday: {
+ start: new ReactiveVar('00:00'),
+ finish: new ReactiveVar('00:00'),
+ open: new ReactiveVar(true),
+ },
+ Friday: {
+ start: new ReactiveVar('00:00'),
+ finish: new ReactiveVar('00:00'),
+ open: new ReactiveVar(true),
+ },
+ Saturday: {
+ start: new ReactiveVar('00:00'),
+ finish: new ReactiveVar('00:00'),
+ open: new ReactiveVar(false),
+ },
+ Sunday: {
+ start: new ReactiveVar('00:00'),
+ finish: new ReactiveVar('00:00'),
+ open: new ReactiveVar(false),
+ },
+ };
+
+ this.autorun(() => {
+ this.subscribe('livechat:officeHour');
+
+ if (this.subscriptionsReady()) {
+ LivechatOfficeHour.find().forEach(function(d) {
+ Template.instance().dayVars[d.day].start.set(moment.utc(d.start, 'HH:mm').local().format('HH:mm'));
+ Template.instance().dayVars[d.day].finish.set(moment.utc(d.finish, 'HH:mm').local().format('HH:mm'));
+ Template.instance().dayVars[d.day].open.set(d.open);
+ });
+ }
+ });
+
+ this.enableOfficeHours = new ReactiveVar(null);
+
+ this.autorun(() => {
+ this.enableOfficeHours.set(settings.get('Livechat_enable_office_hours'));
+ });
+});
diff --git a/packages/rocketchat-livechat/client/views/app/livechatQueue.html b/app/livechat/client/views/app/livechatQueue.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatQueue.html
rename to app/livechat/client/views/app/livechatQueue.html
diff --git a/app/livechat/client/views/app/livechatQueue.js b/app/livechat/client/views/app/livechatQueue.js
new file mode 100644
index 000000000000..7050de8e0b1e
--- /dev/null
+++ b/app/livechat/client/views/app/livechatQueue.js
@@ -0,0 +1,71 @@
+import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+import { settings } from '../../../../settings';
+import { hasRole } from '../../../../authorization';
+import { Users } from '../../../../models';
+import { LivechatDepartment } from '../../collections/LivechatDepartment';
+import { LivechatQueueUser } from '../../collections/LivechatQueueUser';
+import { AgentUsers } from '../../collections/AgentUsers';
+import './livechatQueue.html';
+
+Template.livechatQueue.helpers({
+ departments() {
+ return LivechatDepartment.find({
+ enabled: true,
+ }, {
+ sort: {
+ name: 1,
+ },
+ });
+ },
+
+ users() {
+ const users = [];
+
+ const showOffline = Template.instance().showOffline.get();
+
+ LivechatQueueUser.find({
+ departmentId: this._id,
+ }, {
+ sort: {
+ count: 1,
+ order: 1,
+ username: 1,
+ },
+ }).forEach((user) => {
+ const options = { fields: { _id: 1 } };
+ const userFilter = { _id: user.agentId, status: { $ne: 'offline' } };
+ const agentFilter = { _id: user.agentId, statusLivechat: 'available' };
+
+ if (showOffline[this._id] || (Meteor.users.findOne(userFilter, options) && AgentUsers.findOne(agentFilter, options))) {
+ users.push(user);
+ }
+ });
+
+ return users;
+ },
+
+ hasPermission() {
+ const user = Users.findOne(Meteor.userId(), { fields: { statusLivechat: 1 } });
+ return hasRole(Meteor.userId(), 'livechat-manager') || (user.statusLivechat === 'available' && settings.get('Livechat_show_queue_list_link'));
+ },
+});
+
+Template.livechatQueue.events({
+ 'click .show-offline'(event, instance) {
+ const showOffline = instance.showOffline.get();
+
+ showOffline[this._id] = event.currentTarget.checked;
+
+ instance.showOffline.set(showOffline);
+ },
+});
+
+Template.livechatQueue.onCreated(function() {
+ this.showOffline = new ReactiveVar({});
+
+ this.subscribe('livechat:queue');
+ this.subscribe('livechat:agents');
+ this.subscribe('livechat:departments');
+});
diff --git a/app/livechat/client/views/app/livechatReadOnly.html b/app/livechat/client/views/app/livechatReadOnly.html
new file mode 100644
index 000000000000..9b2f6d484a2b
--- /dev/null
+++ b/app/livechat/client/views/app/livechatReadOnly.html
@@ -0,0 +1,16 @@
+
+ {{#if roomOpen}}
+ {{#if guestPool}}
+ {{#if inquiryOpen}}
+
+ {{{_ "you_are_in_preview_mode_of_incoming_livechat"}}}
+
+
+ {{else}}
+ {{_ "room_is_read_only"}}
+ {{/if}}
+ {{/if}}
+ {{else}}
+ {{_ "This_conversation_is_already_closed"}}
+ {{/if}}
+
diff --git a/app/livechat/client/views/app/livechatReadOnly.js b/app/livechat/client/views/app/livechatReadOnly.js
new file mode 100644
index 000000000000..7f1cf2403fd9
--- /dev/null
+++ b/app/livechat/client/views/app/livechatReadOnly.js
@@ -0,0 +1,56 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { ChatRoom } from '../../../../models';
+import { LivechatInquiry } from '../../../lib/LivechatInquiry';
+import { call } from '../../../../ui-utils/client';
+import { settings } from '../../../../settings';
+import './livechatReadOnly.html';
+
+Template.livechatReadOnly.helpers({
+ inquiryOpen() {
+ const inquiry = Template.instance().inquiry.get();
+ return inquiry || FlowRouter.go('/home');
+ },
+
+ roomOpen() {
+ const room = Template.instance().room.get();
+ return room && room.open === true;
+ },
+
+ guestPool() {
+ return settings.get('Livechat_Routing_Method') === 'Guest_Pool';
+ },
+});
+
+Template.livechatReadOnly.events({
+ async 'click .js-take-it'(event, instance) {
+ event.preventDefault();
+ event.stopPropagation();
+
+ const inquiry = instance.inquiry.get();
+ const { _id } = inquiry;
+ await call('livechat:takeInquiry', _id);
+ },
+});
+
+Template.livechatReadOnly.onCreated(function() {
+ this.rid = Template.currentData().rid;
+ this.room = new ReactiveVar();
+ this.inquiry = new ReactiveVar();
+
+ this.autorun(() => {
+ const inquiry = LivechatInquiry.findOne({ agents: Meteor.userId(), status: 'open', rid: this.rid });
+ this.inquiry.set(inquiry);
+
+ if (inquiry) {
+ this.subscribe('livechat:inquiry', inquiry._id);
+ }
+ });
+
+ this.autorun(() => {
+ this.room.set(ChatRoom.findOne({ _id: Template.currentData().rid }, { fields: { open: 1 } }));
+ });
+
+});
diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggers.html b/app/livechat/client/views/app/livechatTriggers.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatTriggers.html
rename to app/livechat/client/views/app/livechatTriggers.html
diff --git a/app/livechat/client/views/app/livechatTriggers.js b/app/livechat/client/views/app/livechatTriggers.js
new file mode 100644
index 000000000000..0b690001e558
--- /dev/null
+++ b/app/livechat/client/views/app/livechatTriggers.js
@@ -0,0 +1,82 @@
+import { Meteor } from 'meteor/meteor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Template } from 'meteor/templating';
+import { modal } from '../../../../ui-utils';
+import { t, handleError } from '../../../../utils';
+import { LivechatTrigger } from '../../collections/LivechatTrigger';
+import './livechatTriggers.html';
+
+Template.livechatTriggers.helpers({
+ triggers() {
+ return LivechatTrigger.find();
+ },
+});
+
+Template.livechatTriggers.events({
+ 'click .remove-trigger'(e/* , instance*/) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ modal.open({
+ title: t('Are_you_sure'),
+ type: 'warning',
+ showCancelButton: true,
+ confirmButtonColor: '#DD6B55',
+ confirmButtonText: t('Yes'),
+ cancelButtonText: t('Cancel'),
+ closeOnConfirm: false,
+ html: false,
+ }, () => {
+ Meteor.call('livechat:removeTrigger', this._id, function(error/* , result*/) {
+ if (error) {
+ return handleError(error);
+ }
+ modal.open({
+ title: t('Removed'),
+ text: t('Trigger_removed'),
+ type: 'success',
+ timer: 1000,
+ showConfirmButton: false,
+ });
+ });
+ });
+ },
+
+ 'click .trigger-info'(e/* , instance*/) {
+ e.preventDefault();
+ FlowRouter.go('livechat-trigger-edit', { _id: this._id });
+ },
+
+ 'click .delete-trigger'(e/* , instance*/) {
+ e.preventDefault();
+
+ modal.open({
+ title: t('Are_you_sure'),
+ type: 'warning',
+ showCancelButton: true,
+ confirmButtonColor: '#DD6B55',
+ confirmButtonText: t('Yes'),
+ cancelButtonText: t('Cancel'),
+ closeOnConfirm: false,
+ html: false,
+ }, () => {
+ Meteor.call('livechat:removeTrigger', this._id, function(error/* , result*/) {
+ if (error) {
+ return handleError(error);
+ }
+
+ modal.open({
+ title: t('Removed'),
+ text: t('Trigger_removed'),
+ type: 'success',
+ timer: 1000,
+ showConfirmButton: false,
+ });
+ });
+ });
+ },
+});
+
+Template.livechatTriggers.onCreated(function() {
+ this.subscribe('livechat:triggers');
+});
diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.html b/app/livechat/client/views/app/livechatTriggersForm.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatTriggersForm.html
rename to app/livechat/client/views/app/livechatTriggersForm.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js b/app/livechat/client/views/app/livechatTriggersForm.js
similarity index 96%
rename from packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js
rename to app/livechat/client/views/app/livechatTriggersForm.js
index 5955bd3d8a9a..fbd4a5ebeb1f 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatTriggersForm.js
+++ b/app/livechat/client/views/app/livechatTriggersForm.js
@@ -1,10 +1,10 @@
import { Meteor } from 'meteor/meteor';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { t, handleError } from '../../../../utils';
import { LivechatTrigger } from '../../collections/LivechatTrigger';
import toastr from 'toastr';
+import './livechatTriggersForm.html';
Template.livechatTriggersForm.helpers({
name() {
diff --git a/packages/rocketchat-livechat/client/views/app/livechatUsers.html b/app/livechat/client/views/app/livechatUsers.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/livechatUsers.html
rename to app/livechat/client/views/app/livechatUsers.html
diff --git a/packages/rocketchat-livechat/client/views/app/livechatUsers.js b/app/livechat/client/views/app/livechatUsers.js
similarity index 96%
rename from packages/rocketchat-livechat/client/views/app/livechatUsers.js
rename to app/livechat/client/views/app/livechatUsers.js
index 8e58dd89d114..df35acd776c2 100644
--- a/packages/rocketchat-livechat/client/views/app/livechatUsers.js
+++ b/app/livechat/client/views/app/livechatUsers.js
@@ -1,12 +1,13 @@
import { Meteor } from 'meteor/meteor';
import { Mongo } from 'meteor/mongo';
import { Template } from 'meteor/templating';
-import { modal } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
-import { handleError } from 'meteor/rocketchat:lib';
+import { modal } from '../../../../ui-utils';
+import { t, handleError } from '../../../../utils';
import { AgentUsers } from '../../collections/AgentUsers';
import _ from 'underscore';
import toastr from 'toastr';
+import './livechatUsers.html';
+
let ManagerUsers;
Meteor.startup(function() {
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.html b/app/livechat/client/views/app/tabbar/externalSearch.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.html
rename to app/livechat/client/views/app/tabbar/externalSearch.html
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js b/app/livechat/client/views/app/tabbar/externalSearch.js
similarity index 75%
rename from packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js
rename to app/livechat/client/views/app/tabbar/externalSearch.js
index e5146f59e9eb..75b844e6ade5 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/externalSearch.js
+++ b/app/livechat/client/views/app/tabbar/externalSearch.js
@@ -1,9 +1,10 @@
import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { LivechatExternalMessage } from '../../../../lib/LivechatExternalMessage';
+import './externalSearch.html';
Template.externalSearch.helpers({
messages() {
- return RocketChat.models.LivechatExternalMessage.findByRoomId(this.rid, { ts: 1 });
+ return LivechatExternalMessage.findByRoomId(this.rid, { ts: 1 });
},
});
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.html b/app/livechat/client/views/app/tabbar/visitorEdit.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.html
rename to app/livechat/client/views/app/tabbar/visitorEdit.html
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js b/app/livechat/client/views/app/tabbar/visitorEdit.js
similarity index 94%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js
rename to app/livechat/client/views/app/tabbar/visitorEdit.js
index 139c1b549c91..55acc81f09cb 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorEdit.js
+++ b/app/livechat/client/views/app/tabbar/visitorEdit.js
@@ -1,10 +1,11 @@
import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Template } from 'meteor/templating';
-import { ChatRoom } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
+import { ChatRoom } from '../../../../../models';
+import { t } from '../../../../../utils';
import { LivechatVisitor } from '../../../collections/LivechatVisitor';
import toastr from 'toastr';
+import './visitorEdit.html';
Template.visitorEdit.helpers({
visitor() {
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.html b/app/livechat/client/views/app/tabbar/visitorForward.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.html
rename to app/livechat/client/views/app/tabbar/visitorForward.html
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js b/app/livechat/client/views/app/tabbar/visitorForward.js
similarity index 95%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js
rename to app/livechat/client/views/app/tabbar/visitorForward.js
index 6466ecd3354d..3b8dda292e00 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorForward.js
+++ b/app/livechat/client/views/app/tabbar/visitorForward.js
@@ -2,11 +2,12 @@ import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { FlowRouter } from 'meteor/kadira:flow-router';
import { Template } from 'meteor/templating';
-import { ChatRoom } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
+import { ChatRoom } from '../../../../../models';
+import { t } from '../../../../../utils';
import { LivechatDepartment } from '../../../collections/LivechatDepartment';
import { AgentUsers } from '../../../collections/AgentUsers';
import toastr from 'toastr';
+import './visitorForward.html';
Template.visitorForward.helpers({
visitor() {
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.html b/app/livechat/client/views/app/tabbar/visitorHistory.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorHistory.html
rename to app/livechat/client/views/app/tabbar/visitorHistory.html
diff --git a/app/livechat/client/views/app/tabbar/visitorHistory.js b/app/livechat/client/views/app/tabbar/visitorHistory.js
new file mode 100644
index 000000000000..cb7760a6a872
--- /dev/null
+++ b/app/livechat/client/views/app/tabbar/visitorHistory.js
@@ -0,0 +1,49 @@
+import { ChatRoom } from '../../../../../models';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { Template } from 'meteor/templating';
+import { Mongo } from 'meteor/mongo';
+import moment from 'moment';
+import './visitorHistory.html';
+
+const visitorHistory = new Mongo.Collection('visitor_history');
+
+Template.visitorHistory.helpers({
+ historyLoaded() {
+ return !Template.instance().loadHistory.ready();
+ },
+
+ previousChats() {
+ return visitorHistory.find({
+ _id: { $ne: this.rid },
+ 'v._id': Template.instance().visitorId.get(),
+ }, {
+ sort: {
+ ts: -1,
+ },
+ });
+ },
+
+ title() {
+ let title = moment(this.ts).format('L LTS');
+
+ if (this.label) {
+ title += ` - ${ this.label }`;
+ }
+
+ return title;
+ },
+});
+
+Template.visitorHistory.onCreated(function() {
+ const currentData = Template.currentData();
+ this.visitorId = new ReactiveVar();
+
+ this.autorun(() => {
+ const room = ChatRoom.findOne({ _id: Template.currentData().rid });
+ this.visitorId.set(room.v._id);
+ });
+
+ if (currentData && currentData.rid) {
+ this.loadHistory = this.subscribe('livechat:visitorHistory', { rid: currentData.rid });
+ }
+});
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.html b/app/livechat/client/views/app/tabbar/visitorInfo.html
similarity index 89%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.html
rename to app/livechat/client/views/app/tabbar/visitorInfo.html
index 9f5297ffd4cf..b6649092fb82 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.html
+++ b/app/livechat/client/views/app/tabbar/visitorInfo.html
@@ -38,6 +38,14 @@
{{username}}
{{/with}}
+
+ {{#with department}}
+
+
+ {{#if name}} - {{_ "Department"}}: {{name}}
{{/if}}
+
+
+ {{/with}}
{{#if canSeeButtons}}
@@ -46,10 +54,9 @@
{{username}}
{{#if roomOpen}}
- {{/if}}
-
- {{#if guestPool}}
-
+ {{#if guestPool}}
+
+ {{/if}}
{{/if}}
{{/if}}
diff --git a/app/livechat/client/views/app/tabbar/visitorInfo.js b/app/livechat/client/views/app/tabbar/visitorInfo.js
new file mode 100644
index 000000000000..c3edee3358ba
--- /dev/null
+++ b/app/livechat/client/views/app/tabbar/visitorInfo.js
@@ -0,0 +1,275 @@
+import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Session } from 'meteor/session';
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { modal } from '../../../../../ui-utils';
+import { ChatRoom, Rooms, Subscriptions } from '../../../../../models';
+import { settings } from '../../../../../settings';
+import { t, handleError, roomTypes } from '../../../../../utils';
+import { hasRole } from '../../../../../authorization';
+import { LivechatVisitor } from '../../../collections/LivechatVisitor';
+import { LivechatDepartment } from '../../../collections/LivechatDepartment';
+import _ from 'underscore';
+import s from 'underscore.string';
+import moment from 'moment';
+import UAParser from 'ua-parser-js';
+import './visitorInfo.html';
+
+Template.visitorInfo.helpers({
+ user() {
+ const user = Template.instance().user.get();
+ if (user && user.userAgent) {
+ const ua = new UAParser();
+ ua.setUA(user.userAgent);
+
+ user.os = `${ ua.getOS().name } ${ ua.getOS().version }`;
+ if (['Mac OS', 'iOS'].indexOf(ua.getOS().name) !== -1) {
+ user.osIcon = 'icon-apple';
+ } else {
+ user.osIcon = `icon-${ ua.getOS().name.toLowerCase() }`;
+ }
+ user.browser = `${ ua.getBrowser().name } ${ ua.getBrowser().version }`;
+ user.browserIcon = `icon-${ ua.getBrowser().name.toLowerCase() }`;
+
+ user.status = roomTypes.getUserStatus('l', this.rid) || 'offline';
+ }
+ return user;
+ },
+
+ room() {
+ return ChatRoom.findOne({ _id: this.rid });
+ },
+
+ department() {
+ return LivechatDepartment.findOne({ _id: Template.instance().departmentId.get() });
+ },
+
+ joinTags() {
+ return this.tags && this.tags.join(', ');
+ },
+
+ customFields() {
+ const fields = [];
+ let livechatData = {};
+ const user = Template.instance().user.get();
+ if (user) {
+ livechatData = _.extend(livechatData, user.livechatData);
+ }
+
+ const data = Template.currentData();
+ if (data && data.rid) {
+ const room = Rooms.findOne(data.rid);
+ if (room) {
+ livechatData = _.extend(livechatData, room.livechatData);
+ }
+ }
+
+ if (!_.isEmpty(livechatData)) {
+ for (const _id in livechatData) {
+ if (livechatData.hasOwnProperty(_id)) {
+ const customFields = Template.instance().customFields.get();
+ if (customFields) {
+ const field = _.findWhere(customFields, { _id });
+ if (field && field.visibility !== 'hidden') {
+ fields.push({ label: field.label, value: livechatData[_id] });
+ }
+ }
+ }
+ }
+ return fields;
+ }
+ },
+
+ createdAt() {
+ if (!this.createdAt) {
+ return '';
+ }
+ return moment(this.createdAt).format('L LTS');
+ },
+
+ lastLogin() {
+ if (!this.lastLogin) {
+ return '';
+ }
+ return moment(this.lastLogin).format('L LTS');
+ },
+
+ editing() {
+ return Template.instance().action.get() === 'edit';
+ },
+
+ forwarding() {
+ return Template.instance().action.get() === 'forward';
+ },
+
+ editDetails() {
+ const instance = Template.instance();
+ const user = instance.user.get();
+ return {
+ visitorId: user ? user._id : null,
+ roomId: this.rid,
+ save() {
+ instance.action.set();
+ },
+ cancel() {
+ instance.action.set();
+ },
+ };
+ },
+
+ forwardDetails() {
+ const instance = Template.instance();
+ const user = instance.user.get();
+ return {
+ visitorId: user ? user._id : null,
+ roomId: this.rid,
+ save() {
+ instance.action.set();
+ },
+ cancel() {
+ instance.action.set();
+ },
+ };
+ },
+
+ roomOpen() {
+ const room = ChatRoom.findOne({ _id: this.rid });
+
+ return room.open;
+ },
+
+ guestPool() {
+ return settings.get('Livechat_Routing_Method') === 'Guest_Pool';
+ },
+
+ showDetail() {
+ if (Template.instance().action.get()) {
+ return 'hidden';
+ }
+ },
+
+ canSeeButtons() {
+ if (hasRole(Meteor.userId(), 'livechat-manager')) {
+ return true;
+ }
+
+ const data = Template.currentData();
+ if (data && data.rid) {
+ const subscription = Subscriptions.findOne({ rid: data.rid });
+ return subscription !== undefined;
+ }
+ return false;
+ },
+});
+
+Template.visitorInfo.events({
+ 'click .edit-livechat'(event, instance) {
+ event.preventDefault();
+
+ instance.action.set('edit');
+ },
+ 'click .close-livechat'(event) {
+ event.preventDefault();
+
+ const closeRoom = (comment) => Meteor.call('livechat:closeRoom', this.rid, comment, function(error/* , result*/) {
+ if (error) {
+ return handleError(error);
+ }
+ modal.open({
+ title: t('Chat_closed'),
+ text: t('Chat_closed_successfully'),
+ type: 'success',
+ timer: 1000,
+ showConfirmButton: false,
+ });
+ });
+
+ if (!settings.get('Livechat_request_comment_when_closing_conversation')) {
+ const comment = TAPi18n.__('Chat_closed_by_agent');
+ return closeRoom(comment);
+ }
+
+ // Setting for Ask_for_conversation_finished_message is set to true
+ modal.open({
+ title: t('Closing_chat'),
+ type: 'input',
+ inputPlaceholder: t('Please_add_a_comment'),
+ showCancelButton: true,
+ closeOnConfirm: false,
+ }, (inputValue) => {
+ if (!inputValue) {
+ modal.showInputError(t('Please_add_a_comment_to_close_the_room'));
+ return false;
+ }
+
+ if (s.trim(inputValue) === '') {
+ modal.showInputError(t('Please_add_a_comment_to_close_the_room'));
+ return false;
+ }
+
+ return closeRoom(inputValue);
+
+ });
+ },
+
+ 'click .return-inquiry'(event) {
+ event.preventDefault();
+
+ modal.open({
+ title: t('Would_you_like_to_return_the_inquiry'),
+ type: 'warning',
+ showCancelButton: true,
+ confirmButtonColor: '#3085d6',
+ cancelButtonColor: '#d33',
+ confirmButtonText: t('Yes'),
+ }, () => {
+ Meteor.call('livechat:returnAsInquiry', this.rid, function(error/* , result*/) {
+ if (error) {
+ console.log(error);
+ } else {
+ Session.set('openedRoom');
+ FlowRouter.go('/home');
+ }
+ });
+ });
+ },
+
+ 'click .forward-livechat'(event, instance) {
+ event.preventDefault();
+
+ instance.action.set('forward');
+ },
+});
+
+Template.visitorInfo.onCreated(function() {
+ this.visitorId = new ReactiveVar(null);
+ this.customFields = new ReactiveVar([]);
+ this.action = new ReactiveVar();
+ this.user = new ReactiveVar();
+ this.departmentId = new ReactiveVar(null);
+
+ Meteor.call('livechat:getCustomFields', (err, customFields) => {
+ if (customFields) {
+ this.customFields.set(customFields);
+ }
+ });
+
+ const currentData = Template.currentData();
+
+ if (currentData && currentData.rid) {
+ this.autorun(() => {
+ const room = Rooms.findOne({ _id: currentData.rid });
+ this.visitorId.set(room && room.v && room.v._id);
+ this.departmentId.set(room && room.departmentId);
+ });
+
+ this.subscribe('livechat:visitorInfo', { rid: currentData.rid });
+ this.subscribe('livechat:departments', this.departmentId.get());
+ }
+
+ this.autorun(() => {
+ this.user.set(LivechatVisitor.findOne({ _id: this.visitorId.get() }));
+ });
+});
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.html b/app/livechat/client/views/app/tabbar/visitorNavigation.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.html
rename to app/livechat/client/views/app/tabbar/visitorNavigation.html
diff --git a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js b/app/livechat/client/views/app/tabbar/visitorNavigation.js
similarity index 87%
rename from packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js
rename to app/livechat/client/views/app/tabbar/visitorNavigation.js
index c5007719fec5..c0c8a59d134c 100644
--- a/packages/rocketchat-livechat/client/views/app/tabbar/visitorNavigation.js
+++ b/app/livechat/client/views/app/tabbar/visitorNavigation.js
@@ -1,8 +1,9 @@
import { Mongo } from 'meteor/mongo';
import { Template } from 'meteor/templating';
-import { ChatRoom } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
+import { ChatRoom } from '../../../../../models';
+import { t } from '../../../../../utils';
import moment from 'moment';
+import './visitorNavigation.html';
const visitorNavigationHistory = new Mongo.Collection('visitor_navigation_history');
diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.html b/app/livechat/client/views/app/triggers/livechatTriggerAction.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.html
rename to app/livechat/client/views/app/triggers/livechatTriggerAction.html
diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js b/app/livechat/client/views/app/triggers/livechatTriggerAction.js
similarity index 87%
rename from packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js
rename to app/livechat/client/views/app/triggers/livechatTriggerAction.js
index 8667a60312e6..527a2ed9011b 100644
--- a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerAction.js
+++ b/app/livechat/client/views/app/triggers/livechatTriggerAction.js
@@ -1,6 +1,7 @@
import { ReactiveVar } from 'meteor/reactive-var';
import { Template } from 'meteor/templating';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from '../../../../../settings';
+import './livechatTriggerAction.html';
Template.livechatTriggerAction.helpers({
hiddenValue(current) {
@@ -18,7 +19,7 @@ Template.livechatTriggerAction.helpers({
return !!(this.params && this.params.sender === current);
},
disableIfGuestPool() {
- return RocketChat.settings.get('Livechat_Routing_Method') === 'Guest_Pool';
+ return settings.get('Livechat_Routing_Method') === 'Guest_Pool';
},
});
diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.html b/app/livechat/client/views/app/triggers/livechatTriggerCondition.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.html
rename to app/livechat/client/views/app/triggers/livechatTriggerCondition.html
diff --git a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.js b/app/livechat/client/views/app/triggers/livechatTriggerCondition.js
similarity index 95%
rename from packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.js
rename to app/livechat/client/views/app/triggers/livechatTriggerCondition.js
index 5e0aa9b068c7..6a6490853ce7 100644
--- a/packages/rocketchat-livechat/client/views/app/triggers/livechatTriggerCondition.js
+++ b/app/livechat/client/views/app/triggers/livechatTriggerCondition.js
@@ -1,4 +1,5 @@
import { Template } from 'meteor/templating';
+import './livechatTriggerCondition.html';
Template.livechatTriggerCondition.helpers({
hiddenValue(current) {
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechat.html b/app/livechat/client/views/sideNav/livechat.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/sideNav/livechat.html
rename to app/livechat/client/views/sideNav/livechat.html
diff --git a/app/livechat/client/views/sideNav/livechat.js b/app/livechat/client/views/sideNav/livechat.js
new file mode 100644
index 000000000000..a49ed44d5952
--- /dev/null
+++ b/app/livechat/client/views/sideNav/livechat.js
@@ -0,0 +1,127 @@
+import { Meteor } from 'meteor/meteor';
+import { ReactiveVar } from 'meteor/reactive-var';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { Session } from 'meteor/session';
+import { Template } from 'meteor/templating';
+import { ChatSubscription, Users } from '../../../../models';
+import { KonchatNotification } from '../../../../ui';
+import { settings } from '../../../../settings';
+import { hasRole } from '../../../../authorization';
+import { t, handleError, getUserPreference } from '../../../../utils';
+import { LivechatInquiry } from '../../../lib/LivechatInquiry';
+import './livechat.html';
+
+Template.livechat.helpers({
+ isActive() {
+ const query = {
+ t: 'l',
+ f: { $ne: true },
+ open: true,
+ rid: Session.get('openedRoom'),
+ };
+
+ const options = { fields: { _id: 1 } };
+
+ if (ChatSubscription.findOne(query, options)) {
+ return 'active';
+ }
+ },
+
+ rooms() {
+ const query = {
+ t: 'l',
+ open: true,
+ };
+
+ const user = Users.findOne(Meteor.userId(), {
+ fields: { 'settings.preferences.sidebarShowUnread': 1 },
+ });
+
+ if (getUserPreference(user, 'sidebarShowUnread')) {
+ query.alert = { $ne: true };
+ }
+
+ return ChatSubscription.find(query, {
+ sort: {
+ t: 1,
+ fname: 1,
+ },
+ });
+ },
+
+ inquiries() {
+ // get all inquiries of the department
+ const inqs = LivechatInquiry.find({
+ agents: Meteor.userId(),
+ status: 'open',
+ }, {
+ sort: {
+ ts: 1,
+ },
+ });
+
+ // for notification sound
+ inqs.forEach((inq) => {
+ KonchatNotification.newRoom(inq.rid);
+ });
+
+ return inqs;
+ },
+
+ guestPool() {
+ return settings.get('Livechat_Routing_Method') === 'Guest_Pool';
+ },
+
+ available() {
+ const statusLivechat = Template.instance().statusLivechat.get();
+
+ return {
+ status: statusLivechat === 'available' ? 'status-online' : '',
+ icon: statusLivechat === 'available' ? 'icon-toggle-on' : 'icon-toggle-off',
+ hint: statusLivechat === 'available' ? t('Available') : t('Not_Available'),
+ };
+ },
+
+ isLivechatAvailable() {
+ return Template.instance().statusLivechat.get() === 'available';
+ },
+
+ showQueueLink() {
+ if (settings.get('Livechat_Routing_Method') !== 'Least_Amount') {
+ return false;
+ }
+ return hasRole(Meteor.userId(), 'livechat-manager') || (Template.instance().statusLivechat.get() === 'available' && settings.get('Livechat_show_queue_list_link'));
+ },
+
+ activeLivechatQueue() {
+ FlowRouter.watchPathChange();
+ if (FlowRouter.current().route.name === 'livechat-queue') {
+ return 'active';
+ }
+ },
+});
+
+Template.livechat.events({
+ 'click .livechat-status'() {
+ Meteor.call('livechat:changeLivechatStatus', (err /* , results*/) => {
+ if (err) {
+ return handleError(err);
+ }
+ });
+ },
+});
+
+Template.livechat.onCreated(function() {
+ this.statusLivechat = new ReactiveVar();
+
+ this.autorun(() => {
+ if (Meteor.userId()) {
+ const user = Users.findOne(Meteor.userId(), { fields: { statusLivechat: 1 } });
+ this.statusLivechat.set(user.statusLivechat);
+ } else {
+ this.statusLivechat.set();
+ }
+ });
+
+ this.subscribe('livechat:inquiry');
+});
diff --git a/packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html b/app/livechat/client/views/sideNav/livechatFlex.html
similarity index 100%
rename from packages/rocketchat-livechat/client/views/sideNav/livechatFlex.html
rename to app/livechat/client/views/sideNav/livechatFlex.html
diff --git a/app/livechat/client/views/sideNav/livechatFlex.js b/app/livechat/client/views/sideNav/livechatFlex.js
new file mode 100644
index 000000000000..6848f07f9316
--- /dev/null
+++ b/app/livechat/client/views/sideNav/livechatFlex.js
@@ -0,0 +1,24 @@
+import { Template } from 'meteor/templating';
+import { SideNav, Layout } from '../../../../ui-utils';
+import { t } from '../../../../utils';
+import './livechatFlex.html';
+
+Template.livechatFlex.helpers({
+ menuItem(name, icon, section) {
+ return {
+ name: t(name),
+ icon,
+ pathSection: section,
+ darken: true,
+ };
+ },
+ embeddedVersion() {
+ return Layout.isEmbedded();
+ },
+});
+
+Template.livechatFlex.events({
+ 'click [data-action="close"]'() {
+ SideNav.closeFlex();
+ },
+});
diff --git a/app/livechat/imports/server/rest/departments.js b/app/livechat/imports/server/rest/departments.js
new file mode 100644
index 000000000000..337c4d523ed3
--- /dev/null
+++ b/app/livechat/imports/server/rest/departments.js
@@ -0,0 +1,109 @@
+import { check } from 'meteor/check';
+import { API } from '../../../../api';
+import { hasPermission } from '../../../../authorization';
+import { LivechatDepartment, LivechatDepartmentAgents } from '../../../../models';
+import { Livechat } from '../../../server/lib/Livechat';
+
+API.v1.addRoute('livechat/department', { authRequired: true }, {
+ get() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+
+ return API.v1.success({
+ departments: LivechatDepartment.find().fetch(),
+ });
+ },
+ post() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+
+ try {
+ check(this.bodyParams, {
+ department: Object,
+ agents: Array,
+ });
+
+ const department = Livechat.saveDepartment(null, this.bodyParams.department, this.bodyParams.agents);
+
+ if (department) {
+ return API.v1.success({
+ department,
+ agents: LivechatDepartmentAgents.find({ departmentId: department._id }).fetch(),
+ });
+ }
+
+ API.v1.failure();
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/department/:_id', { authRequired: true }, {
+ get() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+
+ try {
+ check(this.urlParams, {
+ _id: String,
+ });
+
+ return API.v1.success({
+ department: LivechatDepartment.findOneById(this.urlParams._id),
+ agents: LivechatDepartmentAgents.find({ departmentId: this.urlParams._id }).fetch(),
+ });
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+ put() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+
+ try {
+ check(this.urlParams, {
+ _id: String,
+ });
+
+ check(this.bodyParams, {
+ department: Object,
+ agents: Array,
+ });
+
+ if (Livechat.saveDepartment(this.urlParams._id, this.bodyParams.department, this.bodyParams.agents)) {
+ return API.v1.success({
+ department: LivechatDepartment.findOneById(this.urlParams._id),
+ agents: LivechatDepartmentAgents.find({ departmentId: this.urlParams._id }).fetch(),
+ });
+ }
+
+ return API.v1.failure();
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+ delete() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+
+ try {
+ check(this.urlParams, {
+ _id: String,
+ });
+
+ if (Livechat.removeDepartment(this.urlParams._id)) {
+ return API.v1.success();
+ }
+
+ return API.v1.failure();
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+});
diff --git a/app/livechat/imports/server/rest/facebook.js b/app/livechat/imports/server/rest/facebook.js
new file mode 100644
index 000000000000..9637f3869522
--- /dev/null
+++ b/app/livechat/imports/server/rest/facebook.js
@@ -0,0 +1,94 @@
+import crypto from 'crypto';
+import { Random } from 'meteor/random';
+import { API } from '../../../../api';
+import { Rooms, Users, LivechatVisitors } from '../../../../models';
+import { settings } from '../../../../settings';
+import { Livechat } from '../../../server/lib/Livechat';
+
+/**
+ * @api {post} /livechat/facebook Send Facebook message
+ * @apiName Facebook
+ * @apiGroup Livechat
+ *
+ * @apiParam {String} mid Facebook message id
+ * @apiParam {String} page Facebook pages id
+ * @apiParam {String} token Facebook user's token
+ * @apiParam {String} first_name Facebook user's first name
+ * @apiParam {String} last_name Facebook user's last name
+ * @apiParam {String} [text] Facebook message text
+ * @apiParam {String} [attachments] Facebook message attachments
+ */
+API.v1.addRoute('livechat/facebook', {
+ post() {
+ if (!this.bodyParams.text && !this.bodyParams.attachments) {
+ return {
+ success: false,
+ };
+ }
+
+ if (!this.request.headers['x-hub-signature']) {
+ return {
+ success: false,
+ };
+ }
+
+ if (!settings.get('Livechat_Facebook_Enabled')) {
+ return {
+ success: false,
+ error: 'Integration disabled',
+ };
+ }
+
+ // validate if request come from omni
+ const signature = crypto.createHmac('sha1', settings.get('Livechat_Facebook_API_Secret')).update(JSON.stringify(this.request.body)).digest('hex');
+ if (this.request.headers['x-hub-signature'] !== `sha1=${ signature }`) {
+ return {
+ success: false,
+ error: 'Invalid signature',
+ };
+ }
+
+ const sendMessage = {
+ message: {
+ _id: this.bodyParams.mid,
+ },
+ roomInfo: {
+ facebook: {
+ page: this.bodyParams.page,
+ },
+ },
+ };
+ let visitor = LivechatVisitors.getVisitorByToken(this.bodyParams.token);
+ if (visitor) {
+ const rooms = Rooms.findOpenByVisitorToken(visitor.token).fetch();
+ if (rooms && rooms.length > 0) {
+ sendMessage.message.rid = rooms[0]._id;
+ } else {
+ sendMessage.message.rid = Random.id();
+ }
+ sendMessage.message.token = visitor.token;
+ } else {
+ sendMessage.message.rid = Random.id();
+ sendMessage.message.token = this.bodyParams.token;
+
+ const userId = Livechat.registerGuest({
+ token: sendMessage.message.token,
+ name: `${ this.bodyParams.first_name } ${ this.bodyParams.last_name }`,
+ });
+
+ visitor = Users.findOneById(userId);
+ }
+
+ sendMessage.message.msg = this.bodyParams.text;
+ sendMessage.guest = visitor;
+
+ try {
+ return {
+ sucess: true,
+ message: Livechat.sendMessage(sendMessage),
+ };
+ } catch (e) {
+ console.error('Error using Facebook ->', e);
+ }
+ },
+});
diff --git a/packages/rocketchat-livechat/imports/server/rest/sms.js b/app/livechat/imports/server/rest/sms.js
similarity index 79%
rename from packages/rocketchat-livechat/imports/server/rest/sms.js
rename to app/livechat/imports/server/rest/sms.js
index 4924d9b5cdfb..5eec0dd39b5e 100644
--- a/packages/rocketchat-livechat/imports/server/rest/sms.js
+++ b/app/livechat/imports/server/rest/sms.js
@@ -1,11 +1,13 @@
import { Meteor } from 'meteor/meteor';
import { Random } from 'meteor/random';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import LivechatVisitors from '../../../server/models/LivechatVisitors';
+import { Rooms, LivechatVisitors } from '../../../../models';
+import { API } from '../../../../api';
+import { SMS } from '../../../../sms';
+import { Livechat } from '../../../server/lib/Livechat';
-RocketChat.API.v1.addRoute('livechat/sms-incoming/:service', {
+API.v1.addRoute('livechat/sms-incoming/:service', {
post() {
- const SMSService = RocketChat.SMS.getService(this.urlParams.service);
+ const SMSService = SMS.getService(this.urlParams.service);
const sms = SMSService.parse(this.bodyParams);
@@ -23,7 +25,7 @@ RocketChat.API.v1.addRoute('livechat/sms-incoming/:service', {
};
if (visitor) {
- const rooms = RocketChat.models.Rooms.findOpenByVisitorToken(visitor.token).fetch();
+ const rooms = Rooms.findOpenByVisitorToken(visitor.token).fetch();
if (rooms && rooms.length > 0) {
sendMessage.message.rid = rooms[0]._id;
@@ -35,7 +37,7 @@ RocketChat.API.v1.addRoute('livechat/sms-incoming/:service', {
sendMessage.message.rid = Random.id();
sendMessage.message.token = Random.id();
- const visitorId = RocketChat.Livechat.registerGuest({
+ const visitorId = Livechat.registerGuest({
username: sms.from.replace(/[^0-9]/g, ''),
token: sendMessage.message.token,
phone: {
@@ -71,7 +73,7 @@ RocketChat.API.v1.addRoute('livechat/sms-incoming/:service', {
});
try {
- const message = SMSService.response.call(this, RocketChat.Livechat.sendMessage(sendMessage));
+ const message = SMSService.response.call(this, Livechat.sendMessage(sendMessage));
Meteor.defer(() => {
if (sms.extra) {
diff --git a/app/livechat/imports/server/rest/upload.js b/app/livechat/imports/server/rest/upload.js
new file mode 100644
index 000000000000..6ec96c1d494b
--- /dev/null
+++ b/app/livechat/imports/server/rest/upload.js
@@ -0,0 +1,103 @@
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../../../settings';
+import { Settings, Rooms, LivechatVisitors } from '../../../../models';
+import { fileUploadIsValidContentType } from '../../../../utils';
+import { FileUpload } from '../../../../file-upload';
+import { API } from '../../../../api';
+import Busboy from 'busboy';
+import filesize from 'filesize';
+let maxFileSize;
+
+settings.get('FileUpload_MaxFileSize', function(key, value) {
+ try {
+ maxFileSize = parseInt(value);
+ } catch (e) {
+ maxFileSize = Settings.findOneById('FileUpload_MaxFileSize').packageValue;
+ }
+});
+
+API.v1.addRoute('livechat/upload/:rid', {
+ post() {
+ if (!this.request.headers['x-visitor-token']) {
+ return API.v1.unauthorized();
+ }
+
+ const visitorToken = this.request.headers['x-visitor-token'];
+ const visitor = LivechatVisitors.getVisitorByToken(visitorToken);
+
+ if (!visitor) {
+ return API.v1.unauthorized();
+ }
+
+ const room = Rooms.findOneOpenByRoomIdAndVisitorToken(this.urlParams.rid, visitorToken);
+ if (!room) {
+ return API.v1.unauthorized();
+ }
+
+ const busboy = new Busboy({ headers: this.request.headers });
+ const files = [];
+ const fields = {};
+
+ Meteor.wrapAsync((callback) => {
+ busboy.on('file', (fieldname, file, filename, encoding, mimetype) => {
+ if (fieldname !== 'file') {
+ return files.push(new Meteor.Error('invalid-field'));
+ }
+
+ const fileDate = [];
+ file.on('data', (data) => fileDate.push(data));
+
+ file.on('end', () => {
+ files.push({ fieldname, file, filename, encoding, mimetype, fileBuffer: Buffer.concat(fileDate) });
+ });
+ });
+
+ busboy.on('field', (fieldname, value) => fields[fieldname] = value);
+
+ busboy.on('finish', Meteor.bindEnvironment(() => callback()));
+
+ this.request.pipe(busboy);
+ })();
+
+ if (files.length === 0) {
+ return API.v1.failure('File required');
+ }
+
+ if (files.length > 1) {
+ return API.v1.failure('Just 1 file is allowed');
+ }
+
+ const file = files[0];
+
+ if (!fileUploadIsValidContentType(file.mimetype)) {
+ return API.v1.failure({
+ reason: 'error-type-not-allowed',
+ });
+ }
+
+ // -1 maxFileSize means there is no limit
+ if (maxFileSize > -1 && file.fileBuffer.length > maxFileSize) {
+ return API.v1.failure({
+ reason: 'error-size-not-allowed',
+ sizeAllowed: filesize(maxFileSize),
+ });
+ }
+
+ const fileStore = FileUpload.getStore('Uploads');
+
+ const details = {
+ name: file.filename,
+ size: file.fileBuffer.length,
+ type: file.mimetype,
+ rid: this.urlParams.rid,
+ visitorToken,
+ };
+
+ const uploadedFile = Meteor.wrapAsync(fileStore.insert.bind(fileStore))(details, file.fileBuffer);
+
+ uploadedFile.description = fields.description;
+
+ delete fields.description;
+ API.v1.success(Meteor.call('sendFileLivechatMessage', this.urlParams.rid, visitorToken, uploadedFile, fields));
+ },
+});
diff --git a/app/livechat/imports/server/rest/users.js b/app/livechat/imports/server/rest/users.js
new file mode 100644
index 000000000000..6da74562a86f
--- /dev/null
+++ b/app/livechat/imports/server/rest/users.js
@@ -0,0 +1,146 @@
+import { check } from 'meteor/check';
+import { hasPermission, getUsersInRole } from '../../../../authorization';
+import { API } from '../../../../api';
+import { Users } from '../../../../models';
+import { Livechat } from '../../../server/lib/Livechat';
+import _ from 'underscore';
+
+API.v1.addRoute('livechat/users/:type', { authRequired: true }, {
+ get() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+
+ try {
+ check(this.urlParams, {
+ type: String,
+ });
+
+ let role;
+ if (this.urlParams.type === 'agent') {
+ role = 'livechat-agent';
+ } else if (this.urlParams.type === 'manager') {
+ role = 'livechat-manager';
+ } else {
+ throw 'Invalid type';
+ }
+
+ const users = getUsersInRole(role);
+
+ return API.v1.success({
+ users: users.fetch().map((user) => _.pick(user, '_id', 'username', 'name', 'status', 'statusLivechat')),
+ });
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+ post() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+ try {
+ check(this.urlParams, {
+ type: String,
+ });
+
+ check(this.bodyParams, {
+ username: String,
+ });
+
+ if (this.urlParams.type === 'agent') {
+ const user = Livechat.addAgent(this.bodyParams.username);
+ if (user) {
+ return API.v1.success({ user });
+ }
+ } else if (this.urlParams.type === 'manager') {
+ const user = Livechat.addManager(this.bodyParams.username);
+ if (user) {
+ return API.v1.success({ user });
+ }
+ } else {
+ throw 'Invalid type';
+ }
+
+ return API.v1.failure();
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/users/:type/:_id', { authRequired: true }, {
+ get() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+
+ try {
+ check(this.urlParams, {
+ type: String,
+ _id: String,
+ });
+
+ const user = Users.findOneById(this.urlParams._id);
+
+ if (!user) {
+ return API.v1.failure('User not found');
+ }
+
+ let role;
+
+ if (this.urlParams.type === 'agent') {
+ role = 'livechat-agent';
+ } else if (this.urlParams.type === 'manager') {
+ role = 'livechat-manager';
+ } else {
+ throw 'Invalid type';
+ }
+
+ if (user.roles.indexOf(role) !== -1) {
+ return API.v1.success({
+ user: _.pick(user, '_id', 'username'),
+ });
+ }
+
+ return API.v1.success({
+ user: null,
+ });
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+ delete() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+
+ try {
+ check(this.urlParams, {
+ type: String,
+ _id: String,
+ });
+
+ const user = Users.findOneById(this.urlParams._id);
+
+ if (!user) {
+ return API.v1.failure();
+ }
+
+ if (this.urlParams.type === 'agent') {
+ if (Livechat.removeAgent(user.username)) {
+ return API.v1.success();
+ }
+ } else if (this.urlParams.type === 'manager') {
+ if (Livechat.removeManager(user.username)) {
+ return API.v1.success();
+ }
+ } else {
+ throw 'Invalid type';
+ }
+
+ return API.v1.failure();
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+});
diff --git a/app/livechat/lib/Assets.js b/app/livechat/lib/Assets.js
new file mode 100644
index 000000000000..c7252b5406ae
--- /dev/null
+++ b/app/livechat/lib/Assets.js
@@ -0,0 +1,29 @@
+import { Autoupdate } from 'meteor/autoupdate';
+
+export const addServerUrlToIndex = (file) => file.replace('', ``);
+
+export const addServerUrlToHead = (head) => {
+ let baseUrl;
+ if (__meteor_runtime_config__.ROOT_URL_PATH_PREFIX && __meteor_runtime_config__.ROOT_URL_PATH_PREFIX.trim() !== '') {
+ baseUrl = __meteor_runtime_config__.ROOT_URL_PATH_PREFIX;
+ } else {
+ baseUrl = '/';
+ }
+ if (/\/$/.test(baseUrl) === false) {
+ baseUrl += '/';
+ }
+
+ return `
+
+
+
+
+ ${ head }
+
+
+
+
+ `;
+};
diff --git a/app/livechat/lib/LivechatExternalMessage.js b/app/livechat/lib/LivechatExternalMessage.js
new file mode 100644
index 000000000000..b391143680a9
--- /dev/null
+++ b/app/livechat/lib/LivechatExternalMessage.js
@@ -0,0 +1,21 @@
+import { Meteor } from 'meteor/meteor';
+import { Base } from '../../models';
+
+class LivechatExternalMessageClass extends Base {
+ constructor() {
+ super('livechat_external_message');
+
+ if (Meteor.isClient) {
+ this._initModel('livechat_external_message');
+ }
+ }
+
+ // FIND
+ findByRoomId(roomId, sort = { ts: -1 }) {
+ const query = { rid: roomId };
+
+ return this.find(query, { sort });
+ }
+}
+
+export const LivechatExternalMessage = new LivechatExternalMessageClass();
diff --git a/packages/rocketchat-livechat/lib/LivechatInquiry.js b/app/livechat/lib/LivechatInquiry.js
similarity index 89%
rename from packages/rocketchat-livechat/lib/LivechatInquiry.js
rename to app/livechat/lib/LivechatInquiry.js
index 80e3685c6da4..9da291e925ef 100644
--- a/packages/rocketchat-livechat/lib/LivechatInquiry.js
+++ b/app/livechat/lib/LivechatInquiry.js
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Base } from '../../models';
import { Mongo } from 'meteor/mongo';
export let LivechatInquiry;
@@ -9,7 +9,7 @@ if (Meteor.isClient) {
}
if (Meteor.isServer) {
- class LivechatInquiryClass extends RocketChat.models._Base {
+ class LivechatInquiryClass extends Base {
constructor() {
super('livechat_inquiry');
@@ -101,6 +101,5 @@ if (Meteor.isServer) {
}
}
- RocketChat.models.LivechatInquiry = new LivechatInquiryClass();
- LivechatInquiry = RocketChat.models.LivechatInquiry;
+ LivechatInquiry = new LivechatInquiryClass();
}
diff --git a/app/livechat/lib/LivechatRoomType.js b/app/livechat/lib/LivechatRoomType.js
new file mode 100644
index 000000000000..3bcf75289988
--- /dev/null
+++ b/app/livechat/lib/LivechatRoomType.js
@@ -0,0 +1,106 @@
+import { Session } from 'meteor/session';
+import { ChatRoom } from '../../models';
+import { settings } from '../../settings';
+import { hasPermission } from '../../authorization';
+import { openRoom } from '../../ui-utils';
+import { RoomSettingsEnum, UiTextContext, RoomTypeRouteConfig, RoomTypeConfig } from '../../utils';
+import { LivechatInquiry } from './LivechatInquiry';
+import { getAvatarURL } from '../../utils/lib/getAvatarURL';
+
+class LivechatRoomRoute extends RoomTypeRouteConfig {
+ constructor() {
+ super({
+ name: 'live',
+ path: '/live/:id',
+ });
+ }
+
+ action(params) {
+ openRoom('l', params.id);
+ }
+
+ link(sub) {
+ return {
+ id: sub.rid,
+ };
+ }
+}
+
+export default class LivechatRoomType extends RoomTypeConfig {
+ constructor() {
+ super({
+ identifier: 'l',
+ order: 5,
+ icon: 'livechat',
+ label: 'Livechat',
+ route: new LivechatRoomRoute(),
+ });
+
+ this.notSubscribedTpl = 'livechatNotSubscribed';
+ this.readOnlyTpl = 'livechatReadOnly';
+ }
+
+ findRoom(identifier) {
+ return ChatRoom.findOne({ _id: identifier });
+ }
+
+ roomName(roomData) {
+ return roomData.name || roomData.fname || roomData.label;
+ }
+
+ condition() {
+ return settings.get('Livechat_enabled') && hasPermission('view-l-room');
+ }
+
+ canSendMessage(rid) {
+ const room = ChatRoom.findOne({ _id: rid }, { fields: { open: 1 } });
+ return room && room.open === true;
+ }
+
+ getUserStatus(rid) {
+ const room = Session.get(`roomData${ rid }`);
+ if (room) {
+ return room.v && room.v.status;
+ }
+ const inquiry = LivechatInquiry.findOne({ rid });
+ return inquiry && inquiry.v && inquiry.v.status;
+ }
+
+ allowRoomSettingChange(room, setting) {
+ switch (setting) {
+ case RoomSettingsEnum.JOIN_CODE:
+ return false;
+ default:
+ return true;
+ }
+ }
+
+ getUiText(context) {
+ switch (context) {
+ case UiTextContext.HIDE_WARNING:
+ return 'Hide_Livechat_Warning';
+ case UiTextContext.LEAVE_WARNING:
+ return 'Hide_Livechat_Warning';
+ default:
+ return '';
+ }
+ }
+
+ readOnly(rid, user) {
+ const room = ChatRoom.findOne({ _id: rid }, { fields: { open: 1, servedBy: 1 } });
+ if (!room || !room.open) {
+ return true;
+ }
+
+ const inquiry = LivechatInquiry.findOne({ rid }, { fields: { status: 1 } });
+ if (inquiry && inquiry.status === 'open') {
+ return true;
+ }
+
+ return (!room.servedBy || room.servedBy._id !== user._id) && !hasPermission('view-livechat-rooms');
+ }
+
+ getAvatarPath(roomData) {
+ return getAvatarURL({ username: `@${ this.roomName(roomData) }` });
+ }
+}
diff --git a/app/livechat/lib/messageTypes.js b/app/livechat/lib/messageTypes.js
new file mode 100644
index 000000000000..aeb53a6d5ae5
--- /dev/null
+++ b/app/livechat/lib/messageTypes.js
@@ -0,0 +1,54 @@
+import { Meteor } from 'meteor/meteor';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { MessageTypes } from '../../ui-utils';
+import { actionLinks } from '../../action-links';
+import { Notifications } from '../../notifications';
+import { Messages, Rooms } from '../../models';
+import { settings } from '../../settings';
+import { Livechat } from 'meteor/rocketchat:livechat';
+
+MessageTypes.registerType({
+ id: 'livechat_navigation_history',
+ system: true,
+ message: 'New_visitor_navigation',
+ data(message) {
+ if (!message.navigation || !message.navigation.page) {
+ return;
+ }
+ return {
+ history: `${ (message.navigation.page.title ? `${ message.navigation.page.title } - ` : '') + message.navigation.page.location.href }`,
+ };
+ },
+});
+
+MessageTypes.registerType({
+ id: 'livechat_video_call',
+ system: true,
+ message: 'New_videocall_request',
+});
+
+actionLinks.register('createLivechatCall', function(message, params, instance) {
+ if (Meteor.isClient) {
+ instance.tabBar.open('video');
+ }
+});
+
+actionLinks.register('denyLivechatCall', function(message/* , params*/) {
+ if (Meteor.isServer) {
+ const user = Meteor.user();
+
+ Messages.createWithTypeRoomIdMessageAndUser('command', message.rid, 'endCall', user);
+ Notifications.notifyRoom(message.rid, 'deleteMessage', { _id: message._id });
+
+ const language = user.language || settings.get('Language') || 'en';
+
+ Livechat.closeRoom({
+ user,
+ room: Rooms.findOneById(message.rid),
+ comment: TAPi18n.__('Videocall_declined', { lng: language }),
+ });
+ Meteor.defer(() => {
+ Messages.setHiddenById(message._id);
+ });
+ }
+});
diff --git a/app/livechat/server/agentStatus.js b/app/livechat/server/agentStatus.js
new file mode 100644
index 000000000000..f9e499ffa47b
--- /dev/null
+++ b/app/livechat/server/agentStatus.js
@@ -0,0 +1,9 @@
+import { hasRole } from '../../authorization';
+import { UserPresenceMonitor } from 'meteor/konecty:user-presence';
+import { Livechat } from './lib/Livechat';
+
+UserPresenceMonitor.onSetUserStatus((user, status) => {
+ if (hasRole(user._id, 'livechat-manager') || hasRole(user._id, 'livechat-agent')) {
+ Livechat.notifyAgentStatusChanged(user._id, status);
+ }
+});
diff --git a/packages/rocketchat-livechat/server/api.js b/app/livechat/server/api.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api.js
rename to app/livechat/server/api.js
diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js
new file mode 100644
index 000000000000..a9be66be2974
--- /dev/null
+++ b/app/livechat/server/api/lib/livechat.js
@@ -0,0 +1,142 @@
+import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+import { Users, Rooms, LivechatVisitors, LivechatDepartment, LivechatTrigger } from '../../../../models';
+import _ from 'underscore';
+import { Livechat } from '../../lib/Livechat';
+import { settings as rcSettings } from '../../../../settings';
+
+export function online() {
+ const onlineAgents = Livechat.getOnlineAgents();
+ return (onlineAgents && onlineAgents.count() > 0) || rcSettings.get('Livechat_guest_pool_with_no_agents');
+}
+
+export function findTriggers() {
+ return LivechatTrigger.findEnabled().fetch().map((trigger) => _.pick(trigger, '_id', 'actions', 'conditions', 'runOnce'));
+}
+
+export function findDepartments() {
+ return LivechatDepartment.findEnabledWithAgents().fetch().map((department) => _.pick(department, '_id', 'name', 'showOnRegistration', 'showOnOfflineForm'));
+}
+
+export function findGuest(token) {
+ return LivechatVisitors.getVisitorByToken(token, {
+ fields: {
+ name: 1,
+ username: 1,
+ token: 1,
+ visitorEmails: 1,
+ department: 1,
+ },
+ });
+}
+
+export function findRoom(token, rid) {
+ const fields = {
+ t: 1,
+ departmentId: 1,
+ servedBy: 1,
+ open: 1,
+ v: 1,
+ };
+
+ if (!rid) {
+ return Rooms.findLivechatByVisitorToken(token, fields);
+ }
+
+ return Rooms.findLivechatByIdAndVisitorToken(rid, token, fields);
+}
+
+export function findOpenRoom(token, departmentId) {
+ const options = {
+ fields: {
+ departmentId: 1,
+ servedBy: 1,
+ open: 1,
+ },
+ };
+
+ let room;
+ const rooms = departmentId ? Rooms.findOpenByVisitorTokenAndDepartmentId(token, departmentId, options).fetch() : Rooms.findOpenByVisitorToken(token, options).fetch();
+ if (rooms && rooms.length > 0) {
+ room = rooms[0];
+ }
+
+ return room;
+}
+
+export function getRoom({ guest, rid, roomInfo, agent }) {
+ const token = guest && guest.token;
+
+ const message = {
+ _id: Random.id(),
+ rid,
+ msg: '',
+ token,
+ ts: new Date(),
+ };
+
+ return Livechat.getRoom(guest, message, roomInfo, agent);
+}
+
+export function findAgent(agentId) {
+ return Users.getAgentInfo(agentId);
+}
+
+export function normalizeHttpHeaderData(headers = {}) {
+ const httpHeaders = Object.assign({}, headers);
+ return { httpHeaders };
+}
+export function settings() {
+ const initSettings = Livechat.getInitSettings();
+ const triggers = findTriggers();
+ const departments = findDepartments();
+ const sound = `${ Meteor.absoluteUrl() }sounds/chime.mp3`;
+
+ return {
+ enabled: initSettings.Livechat_enabled,
+ settings: {
+ registrationForm: initSettings.Livechat_registration_form,
+ allowSwitchingDepartments: initSettings.Livechat_allow_switching_departments,
+ nameFieldRegistrationForm: initSettings.Livechat_name_field_registration_form,
+ emailFieldRegistrationForm: initSettings.Livechat_email_field_registration_form,
+ displayOfflineForm: initSettings.Livechat_display_offline_form,
+ videoCall: initSettings.Livechat_videocall_enabled === true && initSettings.Jitsi_Enabled === true,
+ fileUpload: initSettings.Livechat_fileupload_enabled && initSettings.FileUpload_Enabled,
+ language: initSettings.Language,
+ transcript: initSettings.Livechat_enable_transcript,
+ historyMonitorType: initSettings.Livechat_history_monitor_type,
+ forceAcceptDataProcessingConsent: initSettings.Livechat_force_accept_data_processing_consent,
+ showConnecting: initSettings.Livechat_Show_Connecting,
+ },
+ theme: {
+ title: initSettings.Livechat_title,
+ color: initSettings.Livechat_title_color,
+ offlineTitle: initSettings.Livechat_offline_title,
+ offlineColor: initSettings.Livechat_offline_title_color,
+ actionLinks: [
+ { icon: 'icon-videocam', i18nLabel: 'Accept', method_id: 'createLivechatCall', params: '' },
+ { icon: 'icon-cancel', i18nLabel: 'Decline', method_id: 'denyLivechatCall', params: '' },
+ ],
+ },
+ messages: {
+ offlineMessage: initSettings.Livechat_offline_message,
+ offlineSuccessMessage: initSettings.Livechat_offline_success_message,
+ offlineUnavailableMessage: initSettings.Livechat_offline_form_unavailable,
+ conversationFinishedMessage: initSettings.Livechat_conversation_finished_message,
+ transcriptMessage: initSettings.Livechat_transcript_message,
+ registrationFormMessage: initSettings.Livechat_registration_form_message,
+ dataProcessingConsentText: initSettings.Livechat_data_processing_consent_text,
+ },
+ survey: {
+ items: ['satisfaction', 'agentKnowledge', 'agentResposiveness', 'agentFriendliness'],
+ values: ['1', '2', '3', '4', '5'],
+ },
+ triggers,
+ departments,
+ resources: {
+ sound,
+ },
+ };
+}
+
+
diff --git a/packages/rocketchat-livechat/server/api/rest.js b/app/livechat/server/api/rest.js
similarity index 100%
rename from packages/rocketchat-livechat/server/api/rest.js
rename to app/livechat/server/api/rest.js
diff --git a/app/livechat/server/api/v1/agent.js b/app/livechat/server/api/v1/agent.js
new file mode 100644
index 000000000000..ec091fa43b32
--- /dev/null
+++ b/app/livechat/server/api/v1/agent.js
@@ -0,0 +1,77 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { API } from '../../../../api';
+import { findRoom, findGuest, findAgent, findOpenRoom } from '../lib/livechat';
+import { Livechat } from '../../lib/Livechat';
+
+API.v1.addRoute('livechat/agent.info/:rid/:token', {
+ get() {
+ try {
+ check(this.urlParams, {
+ rid: String,
+ token: String,
+ });
+
+ const visitor = findGuest(this.urlParams.token);
+ if (!visitor) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const room = findRoom(this.urlParams.token, this.urlParams.rid);
+ if (!room) {
+ throw new Meteor.Error('invalid-room');
+ }
+
+ const agent = room && room.servedBy && findAgent(room.servedBy._id);
+ if (!agent) {
+ throw new Meteor.Error('invalid-agent');
+ }
+
+ return API.v1.success({ agent });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/agent.next/:token', {
+ get() {
+ try {
+ check(this.urlParams, {
+ token: String,
+ });
+
+ check(this.queryParams, {
+ department: Match.Maybe(String),
+ });
+
+ const { token } = this.urlParams;
+ const room = findOpenRoom(token);
+ if (room) {
+ return API.v1.success();
+ }
+
+ let { department } = this.queryParams;
+ if (!department) {
+ const requireDeparment = Livechat.getRequiredDepartment();
+ if (requireDeparment) {
+ department = requireDeparment._id;
+ }
+ }
+
+ const agentData = Livechat.getNextAgent(department);
+ if (!agentData) {
+ throw new Meteor.Error('agent-not-found');
+ }
+
+ const agent = findAgent(agentData.agentId);
+ if (!agent) {
+ throw new Meteor.Error('invalid-agent');
+ }
+
+ return API.v1.success({ agent });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
diff --git a/app/livechat/server/api/v1/config.js b/app/livechat/server/api/v1/config.js
new file mode 100644
index 000000000000..23ef0330f101
--- /dev/null
+++ b/app/livechat/server/api/v1/config.js
@@ -0,0 +1,38 @@
+import { Users } from '../../../../models';
+import { API } from '../../../../api';
+import { findGuest, settings, online, findOpenRoom } from '../lib/livechat';
+import { Match, check } from 'meteor/check';
+
+API.v1.addRoute('livechat/config', {
+ get() {
+ try {
+ check(this.queryParams, {
+ token: Match.Maybe(String),
+ });
+
+ const config = settings();
+ if (!config.enabled) {
+ return API.v1.success({ config: { enabled: false } });
+ }
+
+ const status = online();
+
+ const { token } = this.queryParams;
+ const guest = token && findGuest(token);
+
+ let room;
+ let agent;
+
+ if (guest) {
+ room = findOpenRoom(token);
+ agent = room && room.servedBy && Users.getAgentInfo(room.servedBy._id);
+ }
+
+ Object.assign(config, { online: status, guest, room, agent });
+
+ return API.v1.success({ config });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
diff --git a/app/livechat/server/api/v1/customField.js b/app/livechat/server/api/v1/customField.js
new file mode 100644
index 000000000000..d210a0913cce
--- /dev/null
+++ b/app/livechat/server/api/v1/customField.js
@@ -0,0 +1,66 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { API } from '../../../../api';
+import { findGuest } from '../lib/livechat';
+import { Livechat } from '../../lib/Livechat';
+
+API.v1.addRoute('livechat/custom.field', {
+ post() {
+ try {
+ check(this.bodyParams, {
+ token: String,
+ key: String,
+ value: String,
+ overwrite: Boolean,
+ });
+
+ const { token, key, value, overwrite } = this.bodyParams;
+
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ if (!Livechat.setCustomFields({ token, key, value, overwrite })) {
+ return API.v1.failure();
+ }
+
+ return API.v1.success({ field: { key, value, overwrite } });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/custom.fields', {
+ post() {
+ check(this.bodyParams, {
+ token: String,
+ customFields: [
+ Match.ObjectIncluding({
+ key: String,
+ value: String,
+ overwrite: Boolean,
+ }),
+ ],
+ });
+
+ const { token } = this.bodyParams;
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const fields = this.bodyParams.customFields.map((customField) => {
+ const data = Object.assign({ token }, customField);
+ if (!Livechat.setCustomFields(data)) {
+ return API.v1.failure();
+ }
+
+ return { Key: customField.key, value: customField.value, overwrite: customField.overwrite };
+ });
+
+ return API.v1.success({ fields });
+ },
+});
+
diff --git a/app/livechat/server/api/v1/message.js b/app/livechat/server/api/v1/message.js
new file mode 100644
index 000000000000..d3f1c8ed0a9f
--- /dev/null
+++ b/app/livechat/server/api/v1/message.js
@@ -0,0 +1,303 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { Random } from 'meteor/random';
+import { Messages, Rooms, LivechatVisitors } from '../../../../models';
+import { hasPermission } from '../../../../authorization';
+import { API } from '../../../../api';
+import { loadMessageHistory } from '../../../../lib';
+import { findGuest, findRoom, normalizeHttpHeaderData } from '../lib/livechat';
+import { Livechat } from '../../lib/Livechat';
+
+API.v1.addRoute('livechat/message', {
+ post() {
+ try {
+ check(this.bodyParams, {
+ _id: Match.Maybe(String),
+ token: String,
+ rid: String,
+ msg: String,
+ agent: Match.Maybe({
+ agentId: String,
+ username: String,
+ }),
+ });
+
+ const { token, rid, agent, msg } = this.bodyParams;
+
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const room = findRoom(token, rid);
+ if (!room) {
+ throw new Meteor.Error('invalid-room');
+ }
+
+ if (!room.open) {
+ throw new Meteor.Error('room-closed');
+ }
+
+ const _id = this.bodyParams._id || Random.id();
+
+ const sendMessage = {
+ guest,
+ message: {
+ _id,
+ rid,
+ msg,
+ token,
+ },
+ agent,
+ };
+
+ const result = Livechat.sendMessage(sendMessage);
+ if (result) {
+ const message = Messages.findOneById(_id);
+ return API.v1.success({ message });
+ }
+
+ return API.v1.failure();
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/message/:_id', {
+ get() {
+ try {
+ check(this.urlParams, {
+ _id: String,
+ });
+
+ check(this.queryParams, {
+ token: String,
+ rid: String,
+ });
+
+ const { token, rid } = this.queryParams;
+ const { _id } = this.urlParams;
+
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const room = findRoom(token, rid);
+ if (!room) {
+ throw new Meteor.Error('invalid-room');
+ }
+
+ const message = Messages.findOneById(_id);
+ if (!message) {
+ throw new Meteor.Error('invalid-message');
+ }
+
+ return API.v1.success({ message });
+
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+
+ put() {
+ try {
+ check(this.urlParams, {
+ _id: String,
+ });
+
+ check(this.bodyParams, {
+ token: String,
+ rid: String,
+ msg: String,
+ });
+
+ const { token, rid } = this.bodyParams;
+ const { _id } = this.urlParams;
+
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const room = findRoom(token, rid);
+ if (!room) {
+ throw new Meteor.Error('invalid-room');
+ }
+
+ const msg = Messages.findOneById(_id);
+ if (!msg) {
+ throw new Meteor.Error('invalid-message');
+ }
+
+ const result = Livechat.updateMessage({ guest, message: { _id: msg._id, msg: this.bodyParams.msg } });
+ if (result) {
+ const message = Messages.findOneById(_id);
+ return API.v1.success({ message });
+ }
+
+ return API.v1.failure();
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+ delete() {
+ try {
+ check(this.urlParams, {
+ _id: String,
+ });
+
+ check(this.bodyParams, {
+ token: String,
+ rid: String,
+ });
+
+ const { token, rid } = this.bodyParams;
+ const { _id } = this.urlParams;
+
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const room = findRoom(token, rid);
+ if (!room) {
+ throw new Meteor.Error('invalid-room');
+ }
+
+ const message = Messages.findOneById(_id);
+ if (!message) {
+ throw new Meteor.Error('invalid-message');
+ }
+
+ const result = Livechat.deleteMessage({ guest, message });
+ if (result) {
+ return API.v1.success({
+ message: {
+ _id,
+ ts: new Date().toISOString(),
+ },
+ });
+ }
+
+ return API.v1.failure();
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/messages.history/:rid', {
+ get() {
+ try {
+ check(this.urlParams, {
+ rid: String,
+ });
+
+ const { rid } = this.urlParams;
+ const { token } = this.queryParams;
+
+ if (!token) {
+ throw new Meteor.Error('error-token-param-not-provided', 'The required "token" query param is missing.');
+ }
+
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const room = findRoom(token, rid);
+ if (!room) {
+ throw new Meteor.Error('invalid-room');
+ }
+
+ let ls = undefined;
+ if (this.queryParams.ls) {
+ ls = new Date(this.queryParams.ls);
+ }
+
+ let end = undefined;
+ if (this.queryParams.end) {
+ end = new Date(this.queryParams.end);
+ }
+
+ let limit = 20;
+ if (this.queryParams.limit) {
+ limit = parseInt(this.queryParams.limit);
+ }
+
+ const messages = loadMessageHistory({ userId: guest._id, rid, end, limit, ls });
+ return API.v1.success(messages);
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/messages', { authRequired: true }, {
+ post() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+
+ if (!this.bodyParams.visitor) {
+ return API.v1.failure('Body param "visitor" is required');
+ }
+ if (!this.bodyParams.visitor.token) {
+ return API.v1.failure('Body param "visitor.token" is required');
+ }
+ if (!this.bodyParams.messages) {
+ return API.v1.failure('Body param "messages" is required');
+ }
+ if (!(this.bodyParams.messages instanceof Array)) {
+ return API.v1.failure('Body param "messages" is not an array');
+ }
+ if (this.bodyParams.messages.length === 0) {
+ return API.v1.failure('Body param "messages" is empty');
+ }
+
+ const visitorToken = this.bodyParams.visitor.token;
+
+ let visitor = LivechatVisitors.getVisitorByToken(visitorToken);
+ let rid;
+ if (visitor) {
+ const rooms = Rooms.findOpenByVisitorToken(visitorToken).fetch();
+ if (rooms && rooms.length > 0) {
+ rid = rooms[0]._id;
+ } else {
+ rid = Random.id();
+ }
+ } else {
+ rid = Random.id();
+
+ const guest = this.bodyParams.visitor;
+ guest.connectionData = normalizeHttpHeaderData(this.request.headers);
+
+ const visitorId = Livechat.registerGuest(guest);
+ visitor = LivechatVisitors.findOneById(visitorId);
+ }
+
+ const sentMessages = this.bodyParams.messages.map((message) => {
+ const sendMessage = {
+ guest: visitor,
+ message: {
+ _id: Random.id(),
+ rid,
+ token: visitorToken,
+ msg: message.msg,
+ },
+ };
+ const sentMessage = Livechat.sendMessage(sendMessage);
+ return {
+ username: sentMessage.u.username,
+ msg: sentMessage.msg,
+ ts: sentMessage.ts,
+ };
+ });
+
+ return API.v1.success({
+ messages: sentMessages,
+ });
+ },
+});
diff --git a/app/livechat/server/api/v1/offlineMessage.js b/app/livechat/server/api/v1/offlineMessage.js
new file mode 100644
index 000000000000..8f97520933d0
--- /dev/null
+++ b/app/livechat/server/api/v1/offlineMessage.js
@@ -0,0 +1,26 @@
+import { Match, check } from 'meteor/check';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { API } from '../../../../api';
+import { Livechat } from '../../lib/Livechat';
+
+API.v1.addRoute('livechat/offline.message', {
+ post() {
+ try {
+ check(this.bodyParams, {
+ name: String,
+ email: String,
+ message: String,
+ department: Match.Maybe(String),
+ });
+
+ const { name, email, message, department } = this.bodyParams;
+ if (!Livechat.sendOfflineMessage({ name, email, message, department })) {
+ return API.v1.failure({ message: TAPi18n.__('Error_sending_livechat_offline_message') });
+ }
+
+ return API.v1.success({ message: TAPi18n.__('Livechat_offline_message_sent') });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
diff --git a/app/livechat/server/api/v1/pageVisited.js b/app/livechat/server/api/v1/pageVisited.js
new file mode 100644
index 000000000000..1182717e28b7
--- /dev/null
+++ b/app/livechat/server/api/v1/pageVisited.js
@@ -0,0 +1,46 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { API } from '../../../../api';
+import _ from 'underscore';
+import { findGuest, findRoom } from '../lib/livechat';
+import { Livechat } from '../../lib/Livechat';
+
+API.v1.addRoute('livechat/page.visited', {
+ post() {
+ try {
+ check(this.bodyParams, {
+ token: String,
+ rid: String,
+ pageInfo: Match.ObjectIncluding({
+ change: String,
+ title: String,
+ location: Match.ObjectIncluding({
+ href: String,
+ }),
+ }),
+ });
+
+ const { token, rid, pageInfo } = this.bodyParams;
+
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const room = findRoom(token, rid);
+ if (!room) {
+ throw new Meteor.Error('invalid-room');
+ }
+
+ const obj = Livechat.savePageHistory(token, rid, pageInfo);
+ if (obj) {
+ const page = _.pick(obj, 'msg', 'navigation');
+ return API.v1.success({ page });
+ }
+
+ return API.v1.success();
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
diff --git a/app/livechat/server/api/v1/room.js b/app/livechat/server/api/v1/room.js
new file mode 100644
index 000000000000..707d619d7150
--- /dev/null
+++ b/app/livechat/server/api/v1/room.js
@@ -0,0 +1,173 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { Random } from 'meteor/random';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { settings as rcSettings } from '../../../../settings';
+import { Messages, Rooms } from '../../../../models';
+import { API } from '../../../../api';
+import { findGuest, findRoom, getRoom, settings, findAgent } from '../lib/livechat';
+import { Livechat } from '../../lib/Livechat';
+
+API.v1.addRoute('livechat/room', {
+ get() {
+ try {
+ check(this.queryParams, {
+ token: String,
+ rid: Match.Maybe(String),
+ agentId: Match.Maybe(String),
+ });
+
+ const { token } = this.queryParams;
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ let agent;
+ const { agentId } = this.queryParams;
+ const agentObj = agentId && findAgent(agentId);
+ if (agentObj) {
+ const { username } = agentObj;
+ agent = Object.assign({}, { agentId, username });
+ }
+
+ const rid = this.queryParams.rid || Random.id();
+ const room = getRoom({ guest, rid, agent });
+
+ return API.v1.success(room);
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/room.close', {
+ post() {
+ try {
+ check(this.bodyParams, {
+ rid: String,
+ token: String,
+ });
+
+ const { rid, token } = this.bodyParams;
+
+ const visitor = findGuest(token);
+ if (!visitor) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const room = findRoom(token, rid);
+ if (!room) {
+ throw new Meteor.Error('invalid-room');
+ }
+
+ if (!room.open) {
+ throw new Meteor.Error('room-closed');
+ }
+
+ const language = rcSettings.get('Language') || 'en';
+ const comment = TAPi18n.__('Closed_by_visitor', { lng: language });
+
+ if (!Livechat.closeRoom({ visitor, room, comment })) {
+ return API.v1.failure();
+ }
+
+ return API.v1.success({ rid, comment });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/room.transfer', {
+ post() {
+ try {
+ check(this.bodyParams, {
+ rid: String,
+ token: String,
+ department: String,
+ });
+
+ const { rid, token, department } = this.bodyParams;
+
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ let room = findRoom(token, rid);
+ if (!room) {
+ throw new Meteor.Error('invalid-room');
+ }
+
+ // update visited page history to not expire
+ Messages.keepHistoryForToken(token);
+
+ if (!Livechat.transfer(room, guest, { roomId: rid, departmentId: department })) {
+ return API.v1.failure();
+ }
+
+ room = findRoom(token, rid);
+ return API.v1.success({ room });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/room.survey', {
+ post() {
+ try {
+ check(this.bodyParams, {
+ rid: String,
+ token: String,
+ data: [Match.ObjectIncluding({
+ name: String,
+ value: String,
+ })],
+ });
+
+ const { rid, token, data } = this.bodyParams;
+
+ const visitor = findGuest(token);
+ if (!visitor) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const room = findRoom(token, rid);
+ if (!room) {
+ throw new Meteor.Error('invalid-room');
+ }
+
+ const config = settings();
+ if (!config.survey || !config.survey.items || !config.survey.values) {
+ throw new Meteor.Error('invalid-livechat-config');
+ }
+
+ const updateData = {};
+ for (const item of data) {
+ if ((config.survey.items.includes(item.name) && config.survey.values.includes(item.value)) || item.name === 'additionalFeedback') {
+ updateData[item.name] = item.value;
+ }
+ }
+
+ if (Object.keys(updateData).length === 0) {
+ throw new Meteor.Error('invalid-data');
+ }
+
+ if (!Rooms.updateSurveyFeedbackById(room._id, updateData)) {
+ return API.v1.failure();
+ }
+
+ return API.v1.success({ rid, data: updateData });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/room.forward', { authRequired: true }, {
+ post() {
+ API.v1.success(Meteor.runAsUser(this.userId, () => Meteor.call('livechat:transfer', this.bodyParams)));
+ },
+});
diff --git a/app/livechat/server/api/v1/transcript.js b/app/livechat/server/api/v1/transcript.js
new file mode 100644
index 000000000000..c517d546a4e4
--- /dev/null
+++ b/app/livechat/server/api/v1/transcript.js
@@ -0,0 +1,25 @@
+import { check } from 'meteor/check';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { API } from '../../../../api';
+import { Livechat } from '../../lib/Livechat';
+
+API.v1.addRoute('livechat/transcript', {
+ post() {
+ try {
+ check(this.bodyParams, {
+ token: String,
+ rid: String,
+ email: String,
+ });
+
+ const { token, rid, email } = this.bodyParams;
+ if (!Livechat.sendTranscript({ token, rid, email })) {
+ return API.v1.failure({ message: TAPi18n.__('Error_sending_livechat_transcript') });
+ }
+
+ return API.v1.success({ message: TAPi18n.__('Livechat_transcript_sent') });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
diff --git a/app/livechat/server/api/v1/videoCall.js b/app/livechat/server/api/v1/videoCall.js
new file mode 100644
index 000000000000..7845b4ffe26f
--- /dev/null
+++ b/app/livechat/server/api/v1/videoCall.js
@@ -0,0 +1,52 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { Random } from 'meteor/random';
+import { Messages } from '../../../../models';
+import { settings as rcSettings } from '../../../../settings';
+import { API } from '../../../../api';
+import { findGuest, getRoom, settings } from '../lib/livechat';
+
+API.v1.addRoute('livechat/video.call/:token', {
+ get() {
+ try {
+ check(this.urlParams, {
+ token: String,
+ });
+
+ check(this.queryParams, {
+ rid: Match.Maybe(String),
+ });
+
+ const { token } = this.urlParams;
+
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const rid = this.queryParams.rid || Random.id();
+ const roomInfo = { jitsiTimeout: new Date(Date.now() + 3600 * 1000) };
+ const { room } = getRoom({ guest, rid, roomInfo });
+ const config = settings();
+ if (!config.theme || !config.theme.actionLinks) {
+ throw new Meteor.Error('invalid-livechat-config');
+ }
+
+ Messages.createWithTypeRoomIdMessageAndUser('livechat_video_call', room._id, '', guest, {
+ actionLinks: config.theme.actionLinks,
+ });
+
+ const videoCall = {
+ rid,
+ domain: rcSettings.get('Jitsi_Domain'),
+ provider: 'jitsi',
+ room: rcSettings.get('Jitsi_URL_Room_Prefix') + rcSettings.get('uniqueID') + rid,
+ timeout: new Date(Date.now() + 3600 * 1000),
+ };
+
+ return API.v1.success({ videoCall });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
diff --git a/app/livechat/server/api/v1/visitor.js b/app/livechat/server/api/v1/visitor.js
new file mode 100644
index 000000000000..f7adf1550db2
--- /dev/null
+++ b/app/livechat/server/api/v1/visitor.js
@@ -0,0 +1,152 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { Rooms, LivechatVisitors, LivechatCustomField } from '../../../../models';
+import { hasPermission } from '../../../../authorization';
+import { API } from '../../../../api';
+import { findGuest, normalizeHttpHeaderData } from '../lib/livechat';
+import { Livechat } from '../../lib/Livechat';
+
+API.v1.addRoute('livechat/visitor', {
+ post() {
+ try {
+ check(this.bodyParams, {
+ visitor: Match.ObjectIncluding({
+ token: String,
+ name: Match.Maybe(String),
+ email: Match.Maybe(String),
+ department: Match.Maybe(String),
+ phone: Match.Maybe(String),
+ username: Match.Maybe(String),
+ customFields: Match.Maybe([
+ Match.ObjectIncluding({
+ key: String,
+ value: String,
+ overwrite: Boolean,
+ }),
+ ]),
+ }),
+ });
+
+ const { token, customFields } = this.bodyParams.visitor;
+ const guest = this.bodyParams.visitor;
+
+ if (this.bodyParams.visitor.phone) {
+ guest.phone = { number: this.bodyParams.visitor.phone };
+ }
+
+ guest.connectionData = normalizeHttpHeaderData(this.request.headers);
+ const visitorId = Livechat.registerGuest(guest);
+
+ let visitor = LivechatVisitors.getVisitorByToken(token);
+ // If it's updating an existing visitor, it must also update the roomInfo
+ const cursor = Rooms.findOpenByVisitorToken(token);
+ cursor.forEach((room) => {
+ Livechat.saveRoomInfo(room, visitor);
+ });
+
+ if (customFields && customFields instanceof Array) {
+ customFields.forEach((field) => {
+ const customField = LivechatCustomField.findOneById(field.key);
+ if (!customField) {
+ return;
+ }
+ const { key, value, overwrite } = field;
+ if (customField.scope === 'visitor' && !LivechatVisitors.updateLivechatDataByToken(token, key, value, overwrite)) {
+ return API.v1.failure();
+ }
+ });
+ }
+
+ visitor = LivechatVisitors.findOneById(visitorId);
+ return API.v1.success({ visitor });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/visitor/:token', {
+ get() {
+ try {
+ check(this.urlParams, {
+ token: String,
+ });
+
+ const visitor = LivechatVisitors.getVisitorByToken(this.urlParams.token);
+ return API.v1.success({ visitor });
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+ delete() {
+ try {
+ check(this.urlParams, {
+ token: String,
+ });
+
+ const visitor = LivechatVisitors.getVisitorByToken(this.urlParams.token);
+ if (!visitor) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ const { _id } = visitor;
+ const result = Livechat.removeGuest(_id);
+ if (result) {
+ return API.v1.success({
+ visitor: {
+ _id,
+ ts: new Date().toISOString(),
+ },
+ });
+ }
+
+ return API.v1.failure();
+ } catch (e) {
+ return API.v1.failure(e.error);
+ }
+ },
+});
+
+API.v1.addRoute('livechat/visitor/:token/room', { authRequired: true }, {
+ get() {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return API.v1.unauthorized();
+ }
+
+ const rooms = Rooms.findOpenByVisitorToken(this.urlParams.token, {
+ fields: {
+ name: 1,
+ t: 1,
+ cl: 1,
+ u: 1,
+ usernames: 1,
+ servedBy: 1,
+ },
+ }).fetch();
+ return API.v1.success({ rooms });
+ },
+});
+
+API.v1.addRoute('livechat/visitor.status', {
+ post() {
+ try {
+ check(this.bodyParams, {
+ token: String,
+ status: String,
+ });
+
+ const { token, status } = this.bodyParams;
+
+ const guest = findGuest(token);
+ if (!guest) {
+ throw new Meteor.Error('invalid-token');
+ }
+
+ Livechat.notifyGuestStatusChanged(token, status);
+
+ return API.v1.success({ token, status });
+ } catch (e) {
+ return API.v1.failure(e);
+ }
+ },
+});
diff --git a/app/livechat/server/config.js b/app/livechat/server/config.js
new file mode 100644
index 000000000000..193ad780edce
--- /dev/null
+++ b/app/livechat/server/config.js
@@ -0,0 +1,430 @@
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../settings';
+
+Meteor.startup(function() {
+ settings.addGroup('Livechat');
+
+ settings.add('Livechat_enabled', false, { type: 'boolean', group: 'Livechat', public: true });
+
+ settings.add('Livechat_title', 'Rocket.Chat', { type: 'string', group: 'Livechat', public: true });
+ settings.add('Livechat_title_color', '#C1272D', {
+ type: 'color',
+ editor: 'color',
+ allowedTypes: ['color', 'expression'],
+ group: 'Livechat',
+ public: true,
+ });
+
+ settings.add('Livechat_display_offline_form', true, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ section: 'Offline',
+ i18nLabel: 'Display_offline_form',
+ });
+
+ settings.add('Livechat_validate_offline_email', true, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ section: 'Offline',
+ i18nLabel: 'Validate_email_address',
+ });
+
+ settings.add('Livechat_offline_form_unavailable', '', {
+ type: 'string',
+ group: 'Livechat',
+ public: true,
+ section: 'Offline',
+ i18nLabel: 'Offline_form_unavailable_message',
+ });
+
+ settings.add('Livechat_offline_title', 'Leave a message', {
+ type: 'string',
+ group: 'Livechat',
+ public: true,
+ section: 'Offline',
+ i18nLabel: 'Title',
+ });
+ settings.add('Livechat_offline_title_color', '#666666', {
+ type: 'color',
+ editor: 'color',
+ allowedTypes: ['color', 'expression'],
+ group: 'Livechat',
+ public: true,
+ section: 'Offline',
+ i18nLabel: 'Color',
+ });
+ settings.add('Livechat_offline_message', '', {
+ type: 'string',
+ group: 'Livechat',
+ public: true,
+ section: 'Offline',
+ i18nLabel: 'Instructions',
+ i18nDescription: 'Instructions_to_your_visitor_fill_the_form_to_send_a_message',
+ });
+ settings.add('Livechat_offline_email', '', {
+ type: 'string',
+ group: 'Livechat',
+ i18nLabel: 'Email_address_to_send_offline_messages',
+ section: 'Offline',
+ });
+ settings.add('Livechat_offline_success_message', '', {
+ type: 'string',
+ group: 'Livechat',
+ public: true,
+ section: 'Offline',
+ i18nLabel: 'Offline_success_message',
+ });
+
+ settings.add('Livechat_allow_switching_departments', true, { type: 'boolean', group: 'Livechat', public: true, i18nLabel: 'Allow_switching_departments' });
+ settings.add('Livechat_show_agent_email', true, { type: 'boolean', group: 'Livechat', public: true, i18nLabel: 'Show_agent_email' });
+
+ settings.add('Livechat_request_comment_when_closing_conversation', true, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Request_comment_when_closing_conversation',
+ });
+
+ settings.add('Livechat_conversation_finished_message', '', {
+ type: 'string',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Conversation_finished_message',
+ });
+
+ settings.add('Livechat_registration_form', true, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Show_preregistration_form',
+ });
+
+ settings.add('Livechat_name_field_registration_form', true, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Show_name_field',
+ });
+
+ settings.add('Livechat_email_field_registration_form', true, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Show_email_field',
+ });
+
+ settings.add('Livechat_guest_count', 1, { type: 'int', group: 'Livechat' });
+
+ settings.add('Livechat_Room_Count', 1, {
+ type: 'int',
+ group: 'Livechat',
+ i18nLabel: 'Livechat_room_count',
+ });
+
+ settings.add('Livechat_agent_leave_action', 'none', {
+ type: 'select',
+ group: 'Livechat',
+ values: [
+ { key: 'none', i18nLabel: 'None' },
+ { key: 'forward', i18nLabel: 'Forward' },
+ { key: 'close', i18nLabel: 'Close' },
+ ],
+ i18nLabel: 'How_to_handle_open_sessions_when_agent_goes_offline',
+ });
+
+ settings.add('Livechat_agent_leave_action_timeout', 60, {
+ type: 'int',
+ group: 'Livechat',
+ enableQuery: { _id: 'Livechat_agent_leave_action', value: { $ne: 'none' } },
+ i18nLabel: 'How_long_to_wait_after_agent_goes_offline',
+ i18nDescription: 'Time_in_seconds',
+ });
+
+ settings.add('Livechat_agent_leave_comment', '', {
+ type: 'string',
+ group: 'Livechat',
+ enableQuery: { _id: 'Livechat_agent_leave_action', value: 'close' },
+ i18nLabel: 'Comment_to_leave_on_closing_session',
+ });
+
+ settings.add('Livechat_webhookUrl', false, {
+ type: 'string',
+ group: 'Livechat',
+ section: 'CRM_Integration',
+ i18nLabel: 'Webhook_URL',
+ });
+
+ settings.add('Livechat_secret_token', false, {
+ type: 'string',
+ group: 'Livechat',
+ section: 'CRM_Integration',
+ i18nLabel: 'Secret_token',
+ });
+
+ settings.add('Livechat_webhook_on_close', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ section: 'CRM_Integration',
+ i18nLabel: 'Send_request_on_chat_close',
+ });
+
+ settings.add('Livechat_webhook_on_offline_msg', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ section: 'CRM_Integration',
+ i18nLabel: 'Send_request_on_offline_messages',
+ });
+
+ settings.add('Livechat_webhook_on_visitor_message', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ section: 'CRM_Integration',
+ i18nLabel: 'Send_request_on_visitor_message',
+ });
+
+ settings.add('Livechat_webhook_on_agent_message', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ section: 'CRM_Integration',
+ i18nLabel: 'Send_request_on_agent_message',
+ });
+
+ settings.add('Send_visitor_navigation_history_livechat_webhook_request', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ section: 'CRM_Integration',
+ i18nLabel: 'Send_visitor_navigation_history_on_request',
+ i18nDescription: 'Feature_Depends_on_Livechat_Visitor_navigation_as_a_message_to_be_enabled',
+ enableQuery: { _id: 'Livechat_Visitor_navigation_as_a_message', value: true },
+ });
+
+ settings.add('Livechat_webhook_on_capture', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ section: 'CRM_Integration',
+ i18nLabel: 'Send_request_on_lead_capture',
+ });
+
+ settings.add('Livechat_lead_email_regex', '\\b[A-Z0-9._%+-]+@(?:[A-Z0-9-]+\\.)+[A-Z]{2,4}\\b', {
+ type: 'string',
+ group: 'Livechat',
+ section: 'CRM_Integration',
+ i18nLabel: 'Lead_capture_email_regex',
+ });
+
+ settings.add('Livechat_lead_phone_regex', '((?:\\([0-9]{1,3}\\)|[0-9]{2})[ \\-]*?[0-9]{4,5}(?:[\\-\\s\\_]{1,2})?[0-9]{4}(?:(?=[^0-9])|$)|[0-9]{4,5}(?:[\\-\\s\\_]{1,2})?[0-9]{4}(?:(?=[^0-9])|$))', {
+ type: 'string',
+ group: 'Livechat',
+ section: 'CRM_Integration',
+ i18nLabel: 'Lead_capture_phone_regex',
+ });
+
+ settings.add('Livechat_Knowledge_Enabled', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ section: 'Knowledge_Base',
+ public: true,
+ i18nLabel: 'Enabled',
+ });
+
+ settings.add('Livechat_Knowledge_Apiai_Key', '', {
+ type: 'string',
+ group: 'Livechat',
+ section: 'Knowledge_Base',
+ public: true,
+ i18nLabel: 'Apiai_Key',
+ });
+
+ settings.add('Livechat_Knowledge_Apiai_Language', 'en', {
+ type: 'string',
+ group: 'Livechat',
+ section: 'Knowledge_Base',
+ public: true,
+ i18nLabel: 'Apiai_Language',
+ });
+
+ settings.add('Livechat_history_monitor_type', 'url', {
+ type: 'select',
+ group: 'Livechat',
+ i18nLabel: 'Monitor_history_for_changes_on',
+ values: [
+ { key: 'url', i18nLabel: 'Page_URL' },
+ { key: 'title', i18nLabel: 'Page_title' },
+ ],
+ });
+
+ settings.add('Livechat_Visitor_navigation_as_a_message', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Send_Visitor_navigation_history_as_a_message',
+ });
+
+ settings.add('Livechat_enable_office_hours', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Office_hours_enabled',
+ });
+
+ settings.add('Livechat_continuous_sound_notification_new_livechat_room', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Continuous_sound_notifications_for_new_livechat_room',
+ });
+
+ settings.add('Livechat_videocall_enabled', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Videocall_enabled',
+ i18nDescription: 'Beta_feature_Depends_on_Video_Conference_to_be_enabled',
+ enableQuery: { _id: 'Jitsi_Enabled', value: true },
+ });
+
+ settings.add('Livechat_fileupload_enabled', true, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'FileUpload_Enabled',
+ enableQuery: { _id: 'FileUpload_Enabled', value: true },
+ });
+
+ settings.add('Livechat_enable_transcript', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Transcript_Enabled',
+ });
+
+ settings.add('Livechat_transcript_message', '', {
+ type: 'string',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Transcript_message',
+ enableQuery: { _id: 'Livechat_enable_transcript', value: true },
+ });
+
+ settings.add('Livechat_registration_form_message', '', {
+ type: 'string',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Livechat_registration_form_message',
+ });
+
+ settings.add('Livechat_AllowedDomainsList', '', {
+ type: 'string',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Livechat_AllowedDomainsList',
+ i18nDescription: 'Domains_allowed_to_embed_the_livechat_widget',
+ });
+
+ settings.add('Livechat_Facebook_Enabled', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ section: 'Facebook',
+ });
+
+ settings.add('Livechat_Facebook_API_Key', '', {
+ type: 'string',
+ group: 'Livechat',
+ section: 'Facebook',
+ i18nDescription: 'If_you_dont_have_one_send_an_email_to_omni_rocketchat_to_get_yours',
+ });
+
+ settings.add('Livechat_Facebook_API_Secret', '', {
+ type: 'string',
+ group: 'Livechat',
+ section: 'Facebook',
+ i18nDescription: 'If_you_dont_have_one_send_an_email_to_omni_rocketchat_to_get_yours',
+ });
+
+ settings.add('Livechat_RDStation_Token', '', {
+ type: 'string',
+ group: 'Livechat',
+ public: false,
+ section: 'RD Station',
+ i18nLabel: 'RDStation_Token',
+ });
+
+ settings.add('Livechat_Routing_Method', 'Least_Amount', {
+ type: 'select',
+ group: 'Livechat',
+ public: true,
+ section: 'Routing',
+ values: [
+ { key: 'External', i18nLabel: 'External_Service' },
+ { key: 'Least_Amount', i18nLabel: 'Least_Amount' },
+ { key: 'Guest_Pool', i18nLabel: 'Guest_Pool' },
+ ],
+ });
+
+ settings.add('Livechat_guest_pool_with_no_agents', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ section: 'Routing',
+ i18nLabel: 'Accept_with_no_online_agents',
+ i18nDescription: 'Accept_incoming_livechat_requests_even_if_there_are_no_online_agents',
+ enableQuery: { _id: 'Livechat_Routing_Method', value: 'Guest_Pool' },
+ });
+
+ settings.add('Livechat_show_queue_list_link', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ section: 'Routing',
+ i18nLabel: 'Show_queue_list_to_all_agents',
+ enableQuery: { _id: 'Livechat_Routing_Method', value: { $ne: 'External' } },
+ });
+
+ settings.add('Livechat_External_Queue_URL', '', {
+ type: 'string',
+ group: 'Livechat',
+ public: false,
+ section: 'Routing',
+ i18nLabel: 'External_Queue_Service_URL',
+ i18nDescription: 'For_more_details_please_check_our_docs',
+ enableQuery: { _id: 'Livechat_Routing_Method', value: 'External' },
+ });
+
+ settings.add('Livechat_External_Queue_Token', '', {
+ type: 'string',
+ group: 'Livechat',
+ public: false,
+ section: 'Routing',
+ i18nLabel: 'Secret_token',
+ enableQuery: { _id: 'Livechat_Routing_Method', value: 'External' },
+ });
+
+ settings.add('Livechat_Allow_collect_and_store_HTTP_header_informations', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Allow_collect_and_store_HTTP_header_informations',
+ i18nDescription: 'Allow_collect_and_store_HTTP_header_informations_description',
+ });
+
+ settings.add('Livechat_force_accept_data_processing_consent', false, {
+ type: 'boolean',
+ group: 'Livechat',
+ public: true,
+ alert: 'Force_visitor_to_accept_data_processing_consent_enabled_alert',
+ i18nLabel: 'Force_visitor_to_accept_data_processing_consent',
+ i18nDescription: 'Force_visitor_to_accept_data_processing_consent_description',
+ });
+
+ settings.add('Livechat_data_processing_consent_text', '', {
+ type: 'string',
+ multiline: true,
+ group: 'Livechat',
+ public: true,
+ i18nLabel: 'Data_processing_consent_text',
+ i18nDescription: 'Data_processing_consent_text_description',
+ enableQuery: { _id: 'Livechat_force_accept_data_processing_consent', value: true },
+ });
+
+});
diff --git a/app/livechat/server/hooks/RDStation.js b/app/livechat/server/hooks/RDStation.js
new file mode 100644
index 000000000000..5254ae348771
--- /dev/null
+++ b/app/livechat/server/hooks/RDStation.js
@@ -0,0 +1,60 @@
+import { HTTP } from 'meteor/http';
+import { settings } from '../../../settings';
+import { callbacks } from '../../../callbacks';
+import { Livechat } from '../lib/Livechat';
+
+function sendToRDStation(room) {
+ if (!settings.get('Livechat_RDStation_Token')) {
+ return room;
+ }
+
+ const livechatData = Livechat.getLivechatRoomGuestInfo(room);
+
+ if (!livechatData.visitor.email) {
+ return room;
+ }
+
+ const email = Array.isArray(livechatData.visitor.email) ? livechatData.visitor.email[0].address : livechatData.visitor.email;
+
+ const options = {
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ data: {
+ token_rdstation: settings.get('Livechat_RDStation_Token'),
+ identificador: 'rocketchat-livechat',
+ client_id: livechatData.visitor._id,
+ email,
+ },
+ };
+
+ options.data.nome = livechatData.visitor.name || livechatData.visitor.username;
+
+ if (livechatData.visitor.phone) {
+ options.data.telefone = livechatData.visitor.phone;
+ }
+
+ if (livechatData.tags) {
+ options.data.tags = livechatData.tags;
+ }
+
+ Object.keys(livechatData.customFields || {}).forEach((field) => {
+ options.data[field] = livechatData.customFields[field];
+ });
+
+ Object.keys(livechatData.visitor.customFields || {}).forEach((field) => {
+ options.data[field] = livechatData.visitor.customFields[field];
+ });
+
+ try {
+ HTTP.call('POST', 'https://www.rdstation.com.br/api/1.3/conversions', options);
+ } catch (e) {
+ console.error('Error sending lead to RD Station ->', e);
+ }
+
+ return room;
+}
+
+callbacks.add('livechat.closeRoom', sendToRDStation, callbacks.priority.MEDIUM, 'livechat-rd-station-close-room');
+
+callbacks.add('livechat.saveInfo', sendToRDStation, callbacks.priority.MEDIUM, 'livechat-rd-station-save-info');
diff --git a/app/livechat/server/hooks/externalMessage.js b/app/livechat/server/hooks/externalMessage.js
new file mode 100644
index 000000000000..2597deaeeaa2
--- /dev/null
+++ b/app/livechat/server/hooks/externalMessage.js
@@ -0,0 +1,69 @@
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../../settings';
+import { callbacks } from '../../../callbacks';
+import { SystemLogger } from '../../../logger';
+import { HTTP } from 'meteor/http';
+import { LivechatExternalMessage } from '../../lib/LivechatExternalMessage';
+import _ from 'underscore';
+
+let knowledgeEnabled = false;
+let apiaiKey = '';
+let apiaiLanguage = 'en';
+settings.get('Livechat_Knowledge_Enabled', function(key, value) {
+ knowledgeEnabled = value;
+});
+settings.get('Livechat_Knowledge_Apiai_Key', function(key, value) {
+ apiaiKey = value;
+});
+settings.get('Livechat_Knowledge_Apiai_Language', function(key, value) {
+ apiaiLanguage = value;
+});
+
+callbacks.add('afterSaveMessage', function(message, room) {
+ // skips this callback if the message was edited
+ if (!message || message.editedAt) {
+ return message;
+ }
+
+ if (!knowledgeEnabled) {
+ return message;
+ }
+
+ if (!(typeof room.t !== 'undefined' && room.t === 'l' && room.v && room.v.token)) {
+ return message;
+ }
+
+ // if the message hasn't a token, it was not sent by the visitor, so ignore it
+ if (!message.token) {
+ return message;
+ }
+
+ Meteor.defer(() => {
+ try {
+ const response = HTTP.post('https://api.api.ai/api/query?v=20150910', {
+ data: {
+ query: message.msg,
+ lang: apiaiLanguage,
+ sessionId: room._id,
+ },
+ headers: {
+ 'Content-Type': 'application/json; charset=utf-8',
+ Authorization: `Bearer ${ apiaiKey }`,
+ },
+ });
+
+ if (response.data && response.data.status.code === 200 && !_.isEmpty(response.data.result.fulfillment.speech)) {
+ LivechatExternalMessage.insert({
+ rid: message.rid,
+ msg: response.data.result.fulfillment.speech,
+ orig: message._id,
+ ts: new Date(),
+ });
+ }
+ } catch (e) {
+ SystemLogger.error('Error using Api.ai ->', e);
+ }
+ });
+
+ return message;
+}, callbacks.priority.LOW, 'externalWebHook');
diff --git a/app/livechat/server/hooks/leadCapture.js b/app/livechat/server/hooks/leadCapture.js
new file mode 100644
index 000000000000..7dd2092246b6
--- /dev/null
+++ b/app/livechat/server/hooks/leadCapture.js
@@ -0,0 +1,47 @@
+import { callbacks } from '../../../callbacks';
+import { settings } from '../../../settings';
+import { LivechatVisitors } from '../../../models';
+
+function validateMessage(message, room) {
+ // skips this callback if the message was edited
+ if (message.editedAt) {
+ return false;
+ }
+
+ // message valid only if it is a livechat room
+ if (!(typeof room.t !== 'undefined' && room.t === 'l' && room.v && room.v.token)) {
+ return false;
+ }
+
+ // if the message hasn't a token, it was NOT sent from the visitor, so ignore it
+ if (!message.token) {
+ return false;
+ }
+
+ // if the message has a type means it is a special message (like the closing comment), so skips
+ if (message.t) {
+ return false;
+ }
+
+ return true;
+}
+
+callbacks.add('afterSaveMessage', function(message, room) {
+ if (!validateMessage(message, room)) {
+ return message;
+ }
+
+ const phoneRegexp = new RegExp(settings.get('Livechat_lead_phone_regex'), 'g');
+ const msgPhones = message.msg.match(phoneRegexp);
+
+ const emailRegexp = new RegExp(settings.get('Livechat_lead_email_regex'), 'gi');
+ const msgEmails = message.msg.match(emailRegexp);
+
+ if (msgEmails || msgPhones) {
+ LivechatVisitors.saveGuestEmailPhoneById(room.v._id, msgEmails, msgPhones);
+
+ callbacks.run('livechat.leadCapture', room);
+ }
+
+ return message;
+}, callbacks.priority.LOW, 'leadCapture');
diff --git a/app/livechat/server/hooks/markRoomResponded.js b/app/livechat/server/hooks/markRoomResponded.js
new file mode 100644
index 000000000000..7a4c2a9a6215
--- /dev/null
+++ b/app/livechat/server/hooks/markRoomResponded.js
@@ -0,0 +1,31 @@
+import { Meteor } from 'meteor/meteor';
+import { callbacks } from '../../../callbacks';
+import { Rooms } from '../../../models';
+
+callbacks.add('afterSaveMessage', function(message, room) {
+ // skips this callback if the message was edited
+ if (!message || message.editedAt) {
+ return message;
+ }
+
+ // check if room is yet awaiting for response
+ if (!(typeof room.t !== 'undefined' && room.t === 'l' && room.waitingResponse)) {
+ return message;
+ }
+
+ // if the message has a token, it was sent by the visitor, so ignore it
+ if (message.token) {
+ return message;
+ }
+
+ Meteor.defer(() => {
+ Rooms.setResponseByRoomId(room._id, {
+ user: {
+ _id: message.u._id,
+ username: message.u.username,
+ },
+ });
+ });
+
+ return message;
+}, callbacks.priority.LOW, 'markRoomResponded');
diff --git a/app/livechat/server/hooks/offlineMessage.js b/app/livechat/server/hooks/offlineMessage.js
new file mode 100644
index 000000000000..91a0641c3fdc
--- /dev/null
+++ b/app/livechat/server/hooks/offlineMessage.js
@@ -0,0 +1,21 @@
+import { callbacks } from '../../../callbacks';
+import { settings } from '../../../settings';
+import { Livechat } from '../lib/Livechat';
+
+callbacks.add('livechat.offlineMessage', (data) => {
+ if (!settings.get('Livechat_webhook_on_offline_msg')) {
+ return data;
+ }
+
+ const postData = {
+ type: 'LivechatOfflineMessage',
+ sentAt: new Date(),
+ visitor: {
+ name: data.name,
+ email: data.email,
+ },
+ message: data.message,
+ };
+
+ Livechat.sendRequest(postData);
+}, callbacks.priority.MEDIUM, 'livechat-send-email-offline-message');
diff --git a/packages/rocketchat-livechat/server/hooks/saveAnalyticsData.js b/app/livechat/server/hooks/saveAnalyticsData.js
similarity index 88%
rename from packages/rocketchat-livechat/server/hooks/saveAnalyticsData.js
rename to app/livechat/server/hooks/saveAnalyticsData.js
index 31b178fede11..286542847486 100644
--- a/packages/rocketchat-livechat/server/hooks/saveAnalyticsData.js
+++ b/app/livechat/server/hooks/saveAnalyticsData.js
@@ -1,7 +1,8 @@
import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { callbacks } from '../../../callbacks';
+import { Rooms } from '../../../models';
-RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
+callbacks.add('afterSaveMessage', function(message, room) {
// skips this callback if the message was edited
if (!message || message.editedAt) {
return message;
@@ -58,8 +59,8 @@ RocketChat.callbacks.add('afterSaveMessage', function(message, room) {
} // ignore, its continuing response
}
- RocketChat.models.Rooms.saveAnalyticsDataByRoomId(room, message, analyticsData);
+ Rooms.saveAnalyticsDataByRoomId(room, message, analyticsData);
});
return message;
-}, RocketChat.callbacks.priority.LOW, 'saveAnalyticsData');
+}, callbacks.priority.LOW, 'saveAnalyticsData');
diff --git a/app/livechat/server/hooks/sendToCRM.js b/app/livechat/server/hooks/sendToCRM.js
new file mode 100644
index 000000000000..a09b06177e90
--- /dev/null
+++ b/app/livechat/server/hooks/sendToCRM.js
@@ -0,0 +1,119 @@
+import { settings } from '../../../settings';
+import { callbacks } from '../../../callbacks';
+import { Messages, Rooms } from '../../../models';
+import { Livechat } from '../lib/Livechat';
+
+const msgNavType = 'livechat_navigation_history';
+
+const crmEnabled = () => {
+ const secretToken = settings.get('Livechat_secret_token');
+ const webhookUrl = settings.get('Livechat_webhookUrl');
+ return secretToken !== '' && secretToken !== undefined && webhookUrl !== '' && webhookUrl !== undefined;
+};
+
+const sendMessageType = (msgType) => {
+ const sendNavHistory = settings.get('Livechat_Visitor_navigation_as_a_message') && settings.get('Send_visitor_navigation_history_livechat_webhook_request');
+
+ return sendNavHistory && msgType === msgNavType;
+};
+
+function sendToCRM(type, room, includeMessages = true) {
+ if (crmEnabled() === false) {
+ return room;
+ }
+
+ const postData = Livechat.getLivechatRoomGuestInfo(room);
+
+ postData.type = type;
+
+ postData.messages = [];
+
+ let messages;
+ if (typeof includeMessages === 'boolean' && includeMessages) {
+ messages = Messages.findVisibleByRoomId(room._id, { sort: { ts: 1 } });
+ } else if (includeMessages instanceof Array) {
+ messages = includeMessages;
+ }
+
+ if (messages) {
+ messages.forEach((message) => {
+ if (message.t && !sendMessageType(message.t)) {
+ return;
+ }
+ const msg = {
+ _id: message._id,
+ username: message.u.username,
+ msg: message.msg,
+ ts: message.ts,
+ editedAt: message.editedAt,
+ };
+
+ if (message.u.username !== postData.visitor.username) {
+ msg.agentId = message.u._id;
+ }
+
+ if (message.t === msgNavType) {
+ msg.navigation = message.navigation;
+ }
+
+ postData.messages.push(msg);
+ });
+ }
+
+ const response = Livechat.sendRequest(postData);
+
+ if (response && response.data && response.data.data) {
+ Rooms.saveCRMDataByRoomId(room._id, response.data.data);
+ }
+
+ return room;
+}
+
+callbacks.add('livechat.closeRoom', (room) => {
+ if (!settings.get('Livechat_webhook_on_close')) {
+ return room;
+ }
+
+ return sendToCRM('LivechatSession', room);
+}, callbacks.priority.MEDIUM, 'livechat-send-crm-close-room');
+
+callbacks.add('livechat.saveInfo', (room) => {
+ // Do not send to CRM if the chat is still open
+ if (room.open) {
+ return room;
+ }
+
+ return sendToCRM('LivechatEdit', room);
+}, callbacks.priority.MEDIUM, 'livechat-send-crm-save-info');
+
+callbacks.add('afterSaveMessage', function(message, room) {
+ // only call webhook if it is a livechat room
+ if (room.t !== 'l' || room.v == null || room.v.token == null) {
+ return message;
+ }
+
+ // if the message has a token, it was sent from the visitor
+ // if not, it was sent from the agent
+ if (message.token) {
+ if (!settings.get('Livechat_webhook_on_visitor_message')) {
+ return message;
+ }
+ } else if (!settings.get('Livechat_webhook_on_agent_message')) {
+ return message;
+ }
+ // if the message has a type means it is a special message (like the closing comment), so skips
+ // unless the settings that handle with visitor navigation history are enabled
+ if (message.t && !sendMessageType(message.t)) {
+ return message;
+ }
+
+ sendToCRM('Message', room, [message]);
+ return message;
+}, callbacks.priority.MEDIUM, 'livechat-send-crm-message');
+
+callbacks.add('livechat.leadCapture', (room) => {
+ if (!settings.get('Livechat_webhook_on_capture')) {
+ return room;
+ }
+ return sendToCRM('LeadCapture', room, false);
+}, callbacks.priority.MEDIUM, 'livechat-send-crm-lead-capture');
diff --git a/app/livechat/server/hooks/sendToFacebook.js b/app/livechat/server/hooks/sendToFacebook.js
new file mode 100644
index 000000000000..1977dffe270b
--- /dev/null
+++ b/app/livechat/server/hooks/sendToFacebook.js
@@ -0,0 +1,38 @@
+import { callbacks } from '../../../callbacks';
+import { settings } from '../../../settings';
+import OmniChannel from '../lib/OmniChannel';
+
+callbacks.add('afterSaveMessage', function(message, room) {
+ // skips this callback if the message was edited
+ if (message.editedAt) {
+ return message;
+ }
+
+ if (!settings.get('Livechat_Facebook_Enabled') || !settings.get('Livechat_Facebook_API_Key')) {
+ return message;
+ }
+
+ // only send the sms by SMS if it is a livechat room with SMS set to true
+ if (!(typeof room.t !== 'undefined' && room.t === 'l' && room.facebook && room.v && room.v.token)) {
+ return message;
+ }
+
+ // if the message has a token, it was sent from the visitor, so ignore it
+ if (message.token) {
+ return message;
+ }
+
+ // if the message has a type means it is a special message (like the closing comment), so skips
+ if (message.t) {
+ return message;
+ }
+
+ OmniChannel.reply({
+ page: room.facebook.page.id,
+ token: room.v.token,
+ text: message.msg,
+ });
+
+ return message;
+
+}, callbacks.priority.LOW, 'sendMessageToFacebook');
diff --git a/app/livechat/server/index.js b/app/livechat/server/index.js
new file mode 100644
index 000000000000..3458109384d3
--- /dev/null
+++ b/app/livechat/server/index.js
@@ -0,0 +1,90 @@
+import './livechat';
+import './startup';
+import './visitorStatus';
+import './agentStatus';
+import './permissions';
+import '../lib/messageTypes';
+import './config';
+import './roomType';
+import './hooks/externalMessage';
+import './hooks/leadCapture';
+import './hooks/markRoomResponded';
+import './hooks/offlineMessage';
+import './hooks/RDStation';
+import './hooks/saveAnalyticsData';
+import './hooks/sendToCRM';
+import './hooks/sendToFacebook';
+import './methods/addAgent';
+import './methods/addManager';
+import './methods/changeLivechatStatus';
+import './methods/closeByVisitor';
+import './methods/closeRoom';
+import './methods/facebook';
+import './methods/getCustomFields';
+import './methods/getAgentData';
+import './methods/getAgentOverviewData';
+import './methods/getAnalyticsChartData';
+import './methods/getAnalyticsOverviewData';
+import './methods/getInitialData';
+import './methods/getNextAgent';
+import './methods/loadHistory';
+import './methods/loginByToken';
+import './methods/pageVisited';
+import './methods/registerGuest';
+import './methods/removeAgent';
+import './methods/removeCustomField';
+import './methods/removeDepartment';
+import './methods/removeManager';
+import './methods/removeTrigger';
+import './methods/removeRoom';
+import './methods/saveAppearance';
+import './methods/saveCustomField';
+import './methods/saveDepartment';
+import './methods/saveInfo';
+import './methods/saveIntegration';
+import './methods/saveSurveyFeedback';
+import './methods/saveTrigger';
+import './methods/searchAgent';
+import './methods/sendMessageLivechat';
+import './methods/sendFileLivechatMessage';
+import './methods/sendOfflineMessage';
+import './methods/setCustomField';
+import './methods/setDepartmentForVisitor';
+import './methods/startVideoCall';
+import './methods/startFileUploadRoom';
+import './methods/transfer';
+import './methods/webhookTest';
+import './methods/setUpConnection';
+import './methods/takeInquiry';
+import './methods/returnAsInquiry';
+import './methods/saveOfficeHours';
+import './methods/sendTranscript';
+import './methods/getFirstRoomMessage';
+import '../lib/LivechatExternalMessage';
+import '../lib/LivechatInquiry';
+export { Livechat } from './lib/Livechat';
+import './lib/Analytics';
+import './lib/QueueMethods';
+import './lib/OfficeClock';
+import './sendMessageBySMS';
+import './unclosedLivechats';
+import './publications/customFields';
+import './publications/departmentAgents';
+import './publications/externalMessages';
+import './publications/livechatAgents';
+import './publications/livechatAppearance';
+import './publications/livechatDepartments';
+import './publications/livechatIntegration';
+import './publications/livechatManagers';
+import './publications/livechatMonitoring';
+import './publications/livechatRooms';
+import './publications/livechatQueue';
+import './publications/livechatTriggers';
+import './publications/livechatVisitors';
+import './publications/visitorHistory';
+import './publications/visitorInfo';
+import './publications/visitorPageVisited';
+import './publications/livechatInquiries';
+import './publications/livechatOfficeHours';
+import './api';
+import './api/rest';
diff --git a/packages/rocketchat-livechat/server/lib/Analytics.js b/app/livechat/server/lib/Analytics.js
similarity index 92%
rename from packages/rocketchat-livechat/server/lib/Analytics.js
rename to app/livechat/server/lib/Analytics.js
index b70301f6b424..4e9e5b88d781 100644
--- a/packages/rocketchat-livechat/server/lib/Analytics.js
+++ b/app/livechat/server/lib/Analytics.js
@@ -1,4 +1,4 @@
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Rooms } from '../../../models';
import moment from 'moment';
/**
@@ -119,14 +119,14 @@ export const Analytics = {
* @returns {Integer}
*/
Total_conversations(date) {
- return RocketChat.models.Rooms.getTotalConversationsBetweenDate('l', date);
+ return Rooms.getTotalConversationsBetweenDate('l', date);
},
Avg_chat_duration(date) {
let total = 0;
let count = 0;
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ metrics }) => {
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ metrics }) => {
if (metrics && metrics.chatDuration) {
total += metrics.chatDuration;
count++;
@@ -140,7 +140,7 @@ export const Analytics = {
Total_messages(date) {
let total = 0;
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ msgs }) => {
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ msgs }) => {
if (msgs) {
total += msgs;
}
@@ -158,7 +158,7 @@ export const Analytics = {
Avg_first_response_time(date) {
let frt = 0;
let count = 0;
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ metrics }) => {
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ metrics }) => {
if (metrics && metrics.response && metrics.response.ft) {
frt += metrics.response.ft;
count++;
@@ -178,7 +178,7 @@ export const Analytics = {
Best_first_response_time(date) {
let maxFrt;
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ metrics }) => {
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ metrics }) => {
if (metrics && metrics.response && metrics.response.ft) {
maxFrt = (maxFrt) ? Math.min(maxFrt, metrics.response.ft) : metrics.response.ft;
}
@@ -198,7 +198,7 @@ export const Analytics = {
Avg_response_time(date) {
let art = 0;
let count = 0;
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ metrics }) => {
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ metrics }) => {
if (metrics && metrics.response && metrics.response.avg) {
art += metrics.response.avg;
count++;
@@ -219,7 +219,7 @@ export const Analytics = {
Avg_reaction_time(date) {
let arnt = 0;
let count = 0;
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ metrics }) => {
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({ metrics }) => {
if (metrics && metrics.reaction && metrics.reaction.ft) {
arnt += metrics.reaction.ft;
count++;
@@ -284,7 +284,7 @@ export const Analytics = {
lt: moment(m).add(1, 'days'),
};
- const result = RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date);
+ const result = Rooms.getAnalyticsMetricsBetweenDate('l', date);
totalConversations += result.count();
result.forEach(summarize(m));
@@ -302,7 +302,7 @@ export const Analytics = {
lt: moment(h).add(1, 'hours'),
};
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
msgs,
}) => {
const dayHour = h.format('H'); // @int : 0, 1, ... 23
@@ -354,7 +354,7 @@ export const Analytics = {
lt: to.add(1, 'days'),
};
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
metrics,
}) => {
if (metrics && metrics.response && metrics.reaction) {
@@ -436,7 +436,7 @@ export const Analytics = {
data: [],
};
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
servedBy,
}) => {
if (servedBy) {
@@ -486,7 +486,7 @@ export const Analytics = {
data: [],
};
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
metrics,
servedBy,
}) => {
@@ -546,7 +546,7 @@ export const Analytics = {
data: [],
};
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
servedBy,
msgs,
}) => {
@@ -590,7 +590,7 @@ export const Analytics = {
data: [],
};
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
metrics,
servedBy,
}) => {
@@ -650,7 +650,7 @@ export const Analytics = {
data: [],
};
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
metrics,
servedBy,
}) => {
@@ -702,7 +702,7 @@ export const Analytics = {
data: [],
};
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
metrics,
servedBy,
}) => {
@@ -762,7 +762,7 @@ export const Analytics = {
data: [],
};
- RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
+ Rooms.getAnalyticsMetricsBetweenDate('l', date).forEach(({
metrics,
servedBy,
}) => {
diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js
new file mode 100644
index 000000000000..c716b84ee326
--- /dev/null
+++ b/app/livechat/server/lib/Livechat.js
@@ -0,0 +1,955 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { Random } from 'meteor/random';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { HTTP } from 'meteor/http';
+import { settings } from '../../../settings';
+import { callbacks } from '../../../callbacks';
+import { Users, Rooms, Messages, Subscriptions, Settings, LivechatDepartmentAgents, LivechatDepartment, LivechatCustomField, LivechatVisitors } from '../../../models';
+import { Logger } from '../../../logger';
+import { sendMessage, deleteMessage, updateMessage } from '../../../lib';
+import { addUserRoles, removeUserFromRoles } from '../../../authorization';
+import _ from 'underscore';
+import s from 'underscore.string';
+import moment from 'moment';
+import dns from 'dns';
+import UAParser from 'ua-parser-js';
+import * as Mailer from '../../../mailer';
+import { LivechatInquiry } from '../../lib/LivechatInquiry';
+import { QueueMethods } from './QueueMethods';
+import { Analytics } from './Analytics';
+
+export const Livechat = {
+ Analytics,
+ historyMonitorType: 'url',
+
+ logger: new Logger('Livechat', {
+ sections: {
+ webhook: 'Webhook',
+ },
+ }),
+
+ getNextAgent(department) {
+ if (settings.get('Livechat_Routing_Method') === 'External') {
+ for (let i = 0; i < 10; i++) {
+ try {
+ const queryString = department ? `?departmentId=${ department }` : '';
+ const result = HTTP.call('GET', `${ settings.get('Livechat_External_Queue_URL') }${ queryString }`, {
+ headers: {
+ 'User-Agent': 'RocketChat Server',
+ Accept: 'application/json',
+ 'X-RocketChat-Secret-Token': settings.get('Livechat_External_Queue_Token'),
+ },
+ });
+
+ if (result && result.data && result.data.username) {
+ const agent = Users.findOneOnlineAgentByUsername(result.data.username);
+
+ if (agent) {
+ return {
+ agentId: agent._id,
+ username: agent.username,
+ };
+ }
+ }
+ } catch (e) {
+ console.error('Error requesting agent from external queue.', e);
+ break;
+ }
+ }
+ throw new Meteor.Error('no-agent-online', 'Sorry, no online agents');
+ } else if (department) {
+ return LivechatDepartmentAgents.getNextAgentForDepartment(department);
+ }
+ return Users.getNextAgent();
+ },
+ getAgents(department) {
+ if (department) {
+ return LivechatDepartmentAgents.findByDepartmentId(department);
+ }
+ return Users.findAgents();
+ },
+ getOnlineAgents(department) {
+ if (department) {
+ return LivechatDepartmentAgents.getOnlineForDepartment(department);
+ }
+ return Users.findOnlineAgents();
+ },
+ getRequiredDepartment(onlineRequired = true) {
+ const departments = LivechatDepartment.findEnabledWithAgents();
+
+ return departments.fetch().find((dept) => {
+ if (!dept.showOnRegistration) {
+ return false;
+ }
+ if (!onlineRequired) {
+ return true;
+ }
+ const onlineAgents = LivechatDepartmentAgents.getOnlineForDepartment(dept._id);
+ return onlineAgents && onlineAgents.count() > 0;
+ });
+ },
+ getRoom(guest, message, roomInfo, agent) {
+ let room = Rooms.findOneById(message.rid);
+ let newRoom = false;
+
+ if (room && !room.open) {
+ message.rid = Random.id();
+ room = null;
+ }
+
+ if (room == null) {
+ // if no department selected verify if there is at least one active and pick the first
+ if (!agent && !guest.department) {
+ const department = this.getRequiredDepartment();
+
+ if (department) {
+ guest.department = department._id;
+ }
+ }
+
+ // delegate room creation to QueueMethods
+ const routingMethod = settings.get('Livechat_Routing_Method');
+ room = QueueMethods[routingMethod](guest, message, roomInfo, agent);
+
+ newRoom = true;
+ }
+
+ if (!room || room.v.token !== guest.token) {
+ throw new Meteor.Error('cannot-access-room');
+ }
+
+ if (newRoom) {
+ Messages.setRoomIdByToken(guest.token, room._id);
+ }
+
+ return { room, newRoom };
+ },
+
+ sendMessage({ guest, message, roomInfo, agent }) {
+ const { room, newRoom } = this.getRoom(guest, message, roomInfo, agent);
+ if (guest.name) {
+ message.alias = guest.name;
+ }
+
+ // return messages;
+ return _.extend(sendMessage(guest, message, room), { newRoom, showConnecting: this.showConnecting() });
+ },
+
+ updateMessage({ guest, message }) {
+ check(message, Match.ObjectIncluding({ _id: String }));
+
+ const originalMessage = Messages.findOneById(message._id);
+ if (!originalMessage || !originalMessage._id) {
+ return;
+ }
+
+ const editAllowed = settings.get('Message_AllowEditing');
+ const editOwn = originalMessage.u && originalMessage.u._id === guest._id;
+
+ if (!editAllowed || !editOwn) {
+ throw new Meteor.Error('error-action-not-allowed', 'Message editing not allowed', { method: 'livechatUpdateMessage' });
+ }
+
+ updateMessage(message, guest);
+
+ return true;
+ },
+
+ deleteMessage({ guest, message }) {
+ check(message, Match.ObjectIncluding({ _id: String }));
+
+ const msg = Messages.findOneById(message._id);
+ if (!msg || !msg._id) {
+ return;
+ }
+
+ const deleteAllowed = settings.get('Message_AllowDeleting');
+ const editOwn = msg.u && msg.u._id === guest._id;
+
+ if (!deleteAllowed || !editOwn) {
+ throw new Meteor.Error('error-action-not-allowed', 'Message deleting not allowed', { method: 'livechatDeleteMessage' });
+ }
+
+ deleteMessage(message, guest);
+
+ return true;
+ },
+
+ registerGuest({ token, name, email, department, phone, username, connectionData } = {}) {
+ check(token, String);
+
+ let userId;
+ const updateUser = {
+ $set: {
+ token,
+ },
+ };
+
+ const user = LivechatVisitors.getVisitorByToken(token, { fields: { _id: 1 } });
+
+ if (user) {
+ userId = user._id;
+ } else {
+ if (!username) {
+ username = LivechatVisitors.getNextVisitorUsername();
+ }
+
+ let existingUser = null;
+
+ if (s.trim(email) !== '' && (existingUser = LivechatVisitors.findOneGuestByEmailAddress(email))) {
+ userId = existingUser._id;
+ } else {
+ const userData = {
+ username,
+ };
+
+ if (settings.get('Livechat_Allow_collect_and_store_HTTP_header_informations')) {
+
+ const connection = this.connection || connectionData;
+ if (connection && connection.httpHeaders) {
+ userData.userAgent = connection.httpHeaders['user-agent'];
+ userData.ip = connection.httpHeaders['x-real-ip'] || connection.httpHeaders['x-forwarded-for'] || connection.clientAddress;
+ userData.host = connection.httpHeaders.host;
+ }
+ }
+
+ userId = LivechatVisitors.insert(userData);
+ }
+ }
+
+ if (phone) {
+ updateUser.$set.phone = [
+ { phoneNumber: phone.number },
+ ];
+ }
+
+ if (email && email.trim() !== '') {
+ updateUser.$set.visitorEmails = [
+ { address: email },
+ ];
+ }
+
+ if (name) {
+ updateUser.$set.name = name;
+ }
+
+ if (!department) {
+ Object.assign(updateUser, { $unset: { department: 1 } });
+ } else {
+ const dep = LivechatDepartment.findOneByIdOrName(department);
+ updateUser.$set.department = dep && dep._id;
+ }
+
+ LivechatVisitors.updateById(userId, updateUser);
+
+ return userId;
+ },
+
+ setDepartmentForGuest({ token, department } = {}) {
+ check(token, String);
+
+ const updateUser = {
+ $set: {
+ department,
+ },
+ };
+
+ const user = LivechatVisitors.getVisitorByToken(token, { fields: { _id: 1 } });
+ if (user) {
+ return LivechatVisitors.updateById(user._id, updateUser);
+ }
+ return false;
+ },
+
+ saveGuest({ _id, name, email, phone }) {
+ const updateData = {};
+
+ if (name) {
+ updateData.name = name;
+ }
+ if (email) {
+ updateData.email = email;
+ }
+ if (phone) {
+ updateData.phone = phone;
+ }
+ const ret = LivechatVisitors.saveGuestById(_id, updateData);
+
+ Meteor.defer(() => {
+ callbacks.run('livechat.saveGuest', updateData);
+ });
+
+ return ret;
+ },
+
+ closeRoom({ user, visitor, room, comment }) {
+ if (!room || room.t !== 'l' || !room.open) {
+ return false;
+ }
+
+ const now = new Date();
+
+ const closeData = {
+ closedAt: now,
+ chatDuration: (now.getTime() - room.ts) / 1000,
+ };
+
+ if (user) {
+ closeData.closer = 'user';
+ closeData.closedBy = {
+ _id: user._id,
+ username: user.username,
+ };
+ } else if (visitor) {
+ closeData.closer = 'visitor';
+ closeData.closedBy = {
+ _id: visitor._id,
+ username: visitor.username,
+ };
+ }
+
+ Rooms.closeByRoomId(room._id, closeData);
+ LivechatInquiry.closeByRoomId(room._id, closeData);
+
+ const message = {
+ t: 'livechat-close',
+ msg: comment,
+ groupable: false,
+ };
+
+ // Retreive the closed room
+ room = Rooms.findOneByIdOrName(room._id);
+
+ sendMessage(user, message, room);
+
+ if (room.servedBy) {
+ Subscriptions.hideByRoomIdAndUserId(room._id, room.servedBy._id);
+ }
+ Messages.createCommandWithRoomIdAndUser('promptTranscript', room._id, closeData.closedBy);
+
+ Meteor.defer(() => {
+ callbacks.run('livechat.closeRoom', room);
+ });
+
+ return true;
+ },
+
+ setCustomFields({ token, key, value, overwrite } = {}) {
+ check(token, String);
+ check(key, String);
+ check(value, String);
+ check(overwrite, Boolean);
+
+ const customField = LivechatCustomField.findOneById(key);
+ if (!customField) {
+ throw new Meteor.Error('invalid-custom-field');
+ }
+
+ if (customField.scope === 'room') {
+ return Rooms.updateLivechatDataByToken(token, key, value, overwrite);
+ } else {
+ return LivechatVisitors.updateLivechatDataByToken(token, key, value, overwrite);
+ }
+ },
+
+ getInitSettings() {
+ const rcSettings = {};
+
+ Settings.findNotHiddenPublic([
+ 'Livechat_title',
+ 'Livechat_title_color',
+ 'Livechat_enabled',
+ 'Livechat_registration_form',
+ 'Livechat_allow_switching_departments',
+ 'Livechat_offline_title',
+ 'Livechat_offline_title_color',
+ 'Livechat_offline_message',
+ 'Livechat_offline_success_message',
+ 'Livechat_offline_form_unavailable',
+ 'Livechat_display_offline_form',
+ 'Livechat_videocall_enabled',
+ 'Jitsi_Enabled',
+ 'Language',
+ 'Livechat_enable_transcript',
+ 'Livechat_transcript_message',
+ 'Livechat_fileupload_enabled',
+ 'FileUpload_Enabled',
+ 'Livechat_conversation_finished_message',
+ 'Livechat_name_field_registration_form',
+ 'Livechat_email_field_registration_form',
+ 'Livechat_registration_form_message',
+ 'Livechat_force_accept_data_processing_consent',
+ 'Livechat_data_processing_consent_text',
+ ]).forEach((setting) => {
+ rcSettings[setting._id] = setting.value;
+ });
+
+ settings.get('Livechat_history_monitor_type', (key, value) => {
+ rcSettings[key] = value;
+ });
+
+ rcSettings.Livechat_Show_Connecting = this.showConnecting();
+
+ return rcSettings;
+ },
+
+ saveRoomInfo(roomData, guestData) {
+ if ((roomData.topic != null || roomData.tags != null) && !Rooms.setTopicAndTagsById(roomData._id, roomData.topic, roomData.tags)) {
+ return false;
+ }
+
+ Meteor.defer(() => {
+ callbacks.run('livechat.saveRoom', roomData);
+ });
+
+ if (!_.isEmpty(guestData.name)) {
+ return Rooms.setNameById(roomData._id, guestData.name, guestData.name) && Subscriptions.updateDisplayNameByRoomId(roomData._id, guestData.name);
+ }
+ },
+
+ closeOpenChats(userId, comment) {
+ const user = Users.findOneById(userId);
+ Rooms.findOpenByAgent(userId).forEach((room) => {
+ this.closeRoom({ user, room, comment });
+ });
+ },
+
+ forwardOpenChats(userId) {
+ Rooms.findOpenByAgent(userId).forEach((room) => {
+ const guest = LivechatVisitors.findOneById(room.v._id);
+ this.transfer(room, guest, { departmentId: guest.department });
+ });
+ },
+
+ savePageHistory(token, roomId, pageInfo) {
+ if (pageInfo.change === Livechat.historyMonitorType) {
+
+ const user = Users.findOneById('rocket.cat');
+
+ const pageTitle = pageInfo.title;
+ const pageUrl = pageInfo.location.href;
+ const extraData = {
+ navigation: {
+ page: pageInfo,
+ token,
+ },
+ };
+
+ if (!roomId) {
+ // keep history of unregistered visitors for 1 month
+ const keepHistoryMiliseconds = 2592000000;
+ extraData.expireAt = new Date().getTime() + keepHistoryMiliseconds;
+ }
+
+ if (!settings.get('Livechat_Visitor_navigation_as_a_message')) {
+ extraData._hidden = true;
+ }
+
+ return Messages.createNavigationHistoryWithRoomIdMessageAndUser(roomId, `${ pageTitle } - ${ pageUrl }`, user, extraData);
+ }
+
+ return;
+ },
+
+ transfer(room, guest, transferData) {
+ let agent;
+
+ if (transferData.userId) {
+ const user = Users.findOneOnlineAgentById(transferData.userId);
+ if (!user) {
+ return false;
+ }
+
+ const { _id: agentId, username } = user;
+ agent = Object.assign({}, { agentId, username });
+ } else if (settings.get('Livechat_Routing_Method') !== 'Guest_Pool') {
+ agent = Livechat.getNextAgent(transferData.departmentId);
+ } else {
+ return Livechat.returnRoomAsInquiry(room._id, transferData.departmentId);
+ }
+
+ const { servedBy } = room;
+
+ if (agent && servedBy && agent.agentId !== servedBy._id) {
+ Rooms.changeAgentByRoomId(room._id, agent);
+
+ if (transferData.departmentId) {
+ Rooms.changeDepartmentIdByRoomId(room._id, transferData.departmentId);
+ }
+
+ const subscriptionData = {
+ rid: room._id,
+ name: guest.name || guest.username,
+ alert: true,
+ open: true,
+ unread: 1,
+ userMentions: 1,
+ groupMentions: 0,
+ u: {
+ _id: agent.agentId,
+ username: agent.username,
+ },
+ t: 'l',
+ desktopNotifications: 'all',
+ mobilePushNotifications: 'all',
+ emailNotifications: 'all',
+ };
+ Subscriptions.removeByRoomIdAndUserId(room._id, servedBy._id);
+
+ Subscriptions.insert(subscriptionData);
+ Rooms.incUsersCountById(room._id);
+
+ Messages.createUserLeaveWithRoomIdAndUser(room._id, { _id: servedBy._id, username: servedBy.username });
+ Messages.createUserJoinWithRoomIdAndUser(room._id, { _id: agent.agentId, username: agent.username });
+
+ const guestData = {
+ token: guest.token,
+ department: transferData.departmentId,
+ };
+
+ this.setDepartmentForGuest(guestData);
+ const data = Users.getAgentInfo(agent.agentId);
+
+ Livechat.stream.emit(room._id, {
+ type: 'agentData',
+ data,
+ });
+
+ return true;
+ }
+
+ return false;
+ },
+
+ returnRoomAsInquiry(rid, departmentId) {
+ const room = Rooms.findOneById(rid);
+ if (!room) {
+ throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'livechat:returnRoomAsInquiry' });
+ }
+
+ if (!room.servedBy) {
+ return false;
+ }
+
+ const user = Users.findOne(room.servedBy._id);
+ if (!user || !user._id) {
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:returnRoomAsInquiry' });
+ }
+
+ const agentIds = [];
+ // get the agents of the department
+ if (departmentId) {
+ const agents = Livechat.getAgents(departmentId);
+ if (!agents || agents.count() === 0) {
+ return false;
+ }
+
+ agents.forEach((agent) => {
+ agentIds.push(agent.agentId);
+ });
+
+ Rooms.changeDepartmentIdByRoomId(room._id, departmentId);
+ }
+
+ // delete agent and room subscription
+ Subscriptions.removeByRoomId(rid);
+
+ // remove agent from room
+ Rooms.removeAgentByRoomId(rid);
+
+ // find inquiry corresponding to room
+ const inquiry = LivechatInquiry.findOne({ rid });
+ if (!inquiry) {
+ return false;
+ }
+
+ let openInq;
+ // mark inquiry as open
+ if (agentIds.length === 0) {
+ openInq = LivechatInquiry.openInquiry(inquiry._id);
+ } else {
+ openInq = LivechatInquiry.openInquiryWithAgents(inquiry._id, agentIds);
+ }
+
+ if (openInq) {
+ Messages.createUserLeaveWithRoomIdAndUser(rid, { _id: room.servedBy._id, username: room.servedBy.username });
+
+ Livechat.stream.emit(rid, {
+ type: 'agentData',
+ data: null,
+ });
+ }
+
+ return openInq;
+ },
+
+ sendRequest(postData, callback, trying = 1) {
+ try {
+ const options = {
+ headers: {
+ 'X-RocketChat-Livechat-Token': settings.get('Livechat_secret_token'),
+ },
+ data: postData,
+ };
+ return HTTP.post(settings.get('Livechat_webhookUrl'), options);
+ } catch (e) {
+ Livechat.logger.webhook.error(`Response error on ${ trying } try ->`, e);
+ // try 10 times after 10 seconds each
+ if (trying < 10) {
+ Livechat.logger.webhook.warn('Will try again in 10 seconds ...');
+ trying++;
+ setTimeout(Meteor.bindEnvironment(() => {
+ Livechat.sendRequest(postData, callback, trying);
+ }), 10000);
+ }
+ }
+ },
+
+ getLivechatRoomGuestInfo(room) {
+ const visitor = LivechatVisitors.findOneById(room.v._id);
+ const agent = Users.findOneById(room.servedBy && room.servedBy._id);
+
+ const ua = new UAParser();
+ ua.setUA(visitor.userAgent);
+
+ const postData = {
+ _id: room._id,
+ label: room.fname || room.label, // using same field for compatibility
+ topic: room.topic,
+ createdAt: room.ts,
+ lastMessageAt: room.lm,
+ tags: room.tags,
+ customFields: room.livechatData,
+ visitor: {
+ _id: visitor._id,
+ token: visitor.token,
+ name: visitor.name,
+ username: visitor.username,
+ email: null,
+ phone: null,
+ department: visitor.department,
+ ip: visitor.ip,
+ os: ua.getOS().name && (`${ ua.getOS().name } ${ ua.getOS().version }`),
+ browser: ua.getBrowser().name && (`${ ua.getBrowser().name } ${ ua.getBrowser().version }`),
+ customFields: visitor.livechatData,
+ },
+ };
+
+ if (agent) {
+ postData.agent = {
+ _id: agent._id,
+ username: agent.username,
+ name: agent.name,
+ email: null,
+ };
+
+ if (agent.emails && agent.emails.length > 0) {
+ postData.agent.email = agent.emails[0].address;
+ }
+ }
+
+ if (room.crmData) {
+ postData.crmData = room.crmData;
+ }
+
+ if (visitor.visitorEmails && visitor.visitorEmails.length > 0) {
+ postData.visitor.email = visitor.visitorEmails;
+ }
+ if (visitor.phone && visitor.phone.length > 0) {
+ postData.visitor.phone = visitor.phone;
+ }
+
+ return postData;
+ },
+
+ addAgent(username) {
+ check(username, String);
+
+ const user = Users.findOneByUsername(username, { fields: { _id: 1, username: 1 } });
+
+ if (!user) {
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:addAgent' });
+ }
+
+ if (addUserRoles(user._id, 'livechat-agent')) {
+ Users.setOperator(user._id, true);
+ Users.setLivechatStatus(user._id, 'available');
+ return user;
+ }
+
+ return false;
+ },
+
+ addManager(username) {
+ check(username, String);
+
+ const user = Users.findOneByUsername(username, { fields: { _id: 1, username: 1 } });
+
+ if (!user) {
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:addManager' });
+ }
+
+ if (addUserRoles(user._id, 'livechat-manager')) {
+ return user;
+ }
+
+ return false;
+ },
+
+ removeAgent(username) {
+ check(username, String);
+
+ const user = Users.findOneByUsername(username, { fields: { _id: 1 } });
+
+ if (!user) {
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:removeAgent' });
+ }
+
+ if (removeUserFromRoles(user._id, 'livechat-agent')) {
+ Users.setOperator(user._id, false);
+ Users.setLivechatStatus(user._id, 'not-available');
+ return true;
+ }
+
+ return false;
+ },
+
+ removeManager(username) {
+ check(username, String);
+
+ const user = Users.findOneByUsername(username, { fields: { _id: 1 } });
+
+ if (!user) {
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:removeManager' });
+ }
+
+ return removeUserFromRoles(user._id, 'livechat-manager');
+ },
+
+ removeGuest(_id) {
+ check(_id, String);
+
+ const guest = LivechatVisitors.findById(_id);
+ if (!guest) {
+ throw new Meteor.Error('error-invalid-guest', 'Invalid guest', { method: 'livechat:removeGuest' });
+ }
+
+ this.cleanGuestHistory(_id);
+ return LivechatVisitors.removeById(_id);
+ },
+
+ cleanGuestHistory(_id) {
+ const guest = LivechatVisitors.findById(_id);
+ if (!guest) {
+ throw new Meteor.Error('error-invalid-guest', 'Invalid guest', { method: 'livechat:cleanGuestHistory' });
+ }
+
+ const { token } = guest;
+
+ Rooms.findByVisitorToken(token).forEach((room) => {
+ Messages.removeFilesByRoomId(room._id);
+ Messages.removeByRoomId(room._id);
+ });
+
+ Subscriptions.removeByVisitorToken(token);
+ Rooms.removeByVisitorToken(token);
+ },
+
+ saveDepartment(_id, departmentData, departmentAgents) {
+ check(_id, Match.Maybe(String));
+
+ check(departmentData, {
+ enabled: Boolean,
+ name: String,
+ description: Match.Optional(String),
+ showOnRegistration: Boolean,
+ email: String,
+ showOnOfflineForm: Boolean,
+ });
+
+ check(departmentAgents, [
+ Match.ObjectIncluding({
+ agentId: String,
+ username: String,
+ }),
+ ]);
+
+ if (_id) {
+ const department = LivechatDepartment.findOneById(_id);
+ if (!department) {
+ throw new Meteor.Error('error-department-not-found', 'Department not found', { method: 'livechat:saveDepartment' });
+ }
+ }
+
+ return LivechatDepartment.createOrUpdateDepartment(_id, departmentData, departmentAgents);
+ },
+
+ removeDepartment(_id) {
+ check(_id, String);
+
+ const department = LivechatDepartment.findOneById(_id, { fields: { _id: 1 } });
+
+ if (!department) {
+ throw new Meteor.Error('department-not-found', 'Department not found', { method: 'livechat:removeDepartment' });
+ }
+
+ return LivechatDepartment.removeById(_id);
+ },
+
+ showConnecting() {
+ return settings.get('Livechat_Routing_Method') === 'Guest_Pool';
+ },
+
+ sendEmail(from, to, replyTo, subject, html) {
+ Mailer.send({
+ to,
+ from,
+ replyTo,
+ subject,
+ html,
+ });
+ },
+
+ sendTranscript({ token, rid, email }) {
+ check(rid, String);
+ check(email, String);
+
+ const room = Rooms.findOneById(rid);
+
+ const visitor = LivechatVisitors.getVisitorByToken(token);
+ const userLanguage = (visitor && visitor.language) || settings.get('Language') || 'en';
+
+ // allow to only user to send transcripts from their own chats
+ if (!room || room.t !== 'l' || !room.v || room.v.token !== token) {
+ throw new Meteor.Error('error-invalid-room', 'Invalid room');
+ }
+
+ const messages = Messages.findVisibleByRoomIdNotContainingTypes(rid, ['livechat_navigation_history'], { sort: { ts: 1 } });
+
+ let html = '
';
+ messages.forEach((message) => {
+ if (message.t && ['command', 'livechat-close', 'livechat_video_call'].indexOf(message.t) !== -1) {
+ return;
+ }
+
+ let author;
+ if (message.u._id === visitor._id) {
+ author = TAPi18n.__('You', { lng: userLanguage });
+ } else {
+ author = message.u.username;
+ }
+
+ const datetime = moment(message.ts).locale(userLanguage).format('LLL');
+ const singleMessage = `
+
${ author } ${ datetime }
+
${ message.msg }
+ `;
+ html = html + singleMessage;
+ });
+
+ html = `${ html }
`;
+
+ let fromEmail = settings.get('From_Email').match(/\b[A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,4}\b/i);
+
+ if (fromEmail) {
+ fromEmail = fromEmail[0];
+ } else {
+ fromEmail = settings.get('From_Email');
+ }
+
+ const subject = TAPi18n.__('Transcript_of_your_livechat_conversation', { lng: userLanguage });
+
+ this.sendEmail(fromEmail, email, fromEmail, subject, html);
+
+ Meteor.defer(() => {
+ callbacks.run('livechat.sendTranscript', messages, email);
+ });
+
+ return true;
+ },
+
+ notifyGuestStatusChanged(token, status) {
+ LivechatInquiry.updateVisitorStatus(token, status);
+ Rooms.updateVisitorStatus(token, status);
+ },
+
+ sendOfflineMessage(data = {}) {
+ if (!settings.get('Livechat_display_offline_form')) {
+ return false;
+ }
+
+ const message = (`${ data.message }`).replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' + '
' + '$2');
+
+ const html = `
+
New livechat message
+
Visitor name: ${ data.name }
+
Visitor email: ${ data.email }
+
Message:
${ message }
`;
+
+ let fromEmail = settings.get('From_Email').match(/\b[A-Z0-9._%+-]+@(?:[A-Z0-9-]+\.)+[A-Z]{2,4}\b/i);
+
+ if (fromEmail) {
+ fromEmail = fromEmail[0];
+ } else {
+ fromEmail = settings.get('From_Email');
+ }
+
+ if (settings.get('Livechat_validate_offline_email')) {
+ const emailDomain = data.email.substr(data.email.lastIndexOf('@') + 1);
+
+ try {
+ Meteor.wrapAsync(dns.resolveMx)(emailDomain);
+ } catch (e) {
+ throw new Meteor.Error('error-invalid-email-address', 'Invalid email address', { method: 'livechat:sendOfflineMessage' });
+ }
+ }
+
+ let emailTo = settings.get('Livechat_offline_email');
+ if (data.department) {
+ const dep = LivechatDepartment.findOneByIdOrName(data.department);
+ emailTo = dep.email || emailTo;
+ }
+
+ const from = `${ data.name } - ${ data.email } <${ fromEmail }>`;
+ const replyTo = `${ data.name } <${ data.email }>`;
+ const subject = `Livechat offline message from ${ data.name }: ${ (`${ data.message }`).substring(0, 20) }`;
+
+ this.sendEmail(from, emailTo, replyTo, subject, html);
+
+ Meteor.defer(() => {
+ callbacks.run('livechat.offlineMessage', data);
+ });
+
+ return true;
+ },
+
+ notifyAgentStatusChanged(userId, status) {
+ Rooms.findOpenByAgent(userId).forEach((room) => {
+ Livechat.stream.emit(room._id, {
+ type: 'agentStatus',
+ status,
+ });
+ });
+ },
+};
+
+Livechat.stream = new Meteor.Streamer('livechat-room');
+
+Livechat.stream.allowRead((roomId, extraData) => {
+ const room = Rooms.findOneById(roomId);
+
+ if (!room) {
+ console.warn(`Invalid eventName: "${ roomId }"`);
+ return false;
+ }
+
+ if (room.t === 'l' && extraData && extraData.visitorToken && room.v.token === extraData.visitorToken) {
+ return true;
+ }
+ return false;
+});
+
+settings.get('Livechat_history_monitor_type', (key, value) => {
+ Livechat.historyMonitorType = value;
+});
diff --git a/app/livechat/server/lib/OfficeClock.js b/app/livechat/server/lib/OfficeClock.js
new file mode 100644
index 000000000000..8c5c96d2ea35
--- /dev/null
+++ b/app/livechat/server/lib/OfficeClock.js
@@ -0,0 +1,14 @@
+// Every minute check if office closed
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../../settings';
+import { Users, LivechatOfficeHour } from '../../../models';
+
+Meteor.setInterval(function() {
+ if (settings.get('Livechat_enable_office_hours')) {
+ if (LivechatOfficeHour.isOpeningTime()) {
+ Users.openOffice();
+ } else if (LivechatOfficeHour.isClosingTime()) {
+ Users.closeOffice();
+ }
+ }
+}, 60000);
diff --git a/app/livechat/server/lib/OmniChannel.js b/app/livechat/server/lib/OmniChannel.js
new file mode 100644
index 000000000000..b1eb1139b0dc
--- /dev/null
+++ b/app/livechat/server/lib/OmniChannel.js
@@ -0,0 +1,69 @@
+import { HTTP } from 'meteor/http';
+import { settings } from '../../../settings';
+
+const gatewayURL = 'https://omni.rocket.chat';
+
+export default {
+ enable() {
+ const result = HTTP.call('POST', `${ gatewayURL }/facebook/enable`, {
+ headers: {
+ authorization: `Bearer ${ settings.get('Livechat_Facebook_API_Key') }`,
+ 'content-type': 'application/json',
+ },
+ data: {
+ url: settings.get('Site_Url'),
+ },
+ });
+ return result.data;
+ },
+
+ disable() {
+ const result = HTTP.call('DELETE', `${ gatewayURL }/facebook/enable`, {
+ headers: {
+ authorization: `Bearer ${ settings.get('Livechat_Facebook_API_Key') }`,
+ 'content-type': 'application/json',
+ },
+ });
+ return result.data;
+ },
+
+ listPages() {
+ const result = HTTP.call('GET', `${ gatewayURL }/facebook/pages`, {
+ headers: {
+ authorization: `Bearer ${ settings.get('Livechat_Facebook_API_Key') }`,
+ },
+ });
+ return result.data;
+ },
+
+ subscribe(pageId) {
+ const result = HTTP.call('POST', `${ gatewayURL }/facebook/page/${ pageId }/subscribe`, {
+ headers: {
+ authorization: `Bearer ${ settings.get('Livechat_Facebook_API_Key') }`,
+ },
+ });
+ return result.data;
+ },
+
+ unsubscribe(pageId) {
+ const result = HTTP.call('DELETE', `${ gatewayURL }/facebook/page/${ pageId }/subscribe`, {
+ headers: {
+ authorization: `Bearer ${ settings.get('Livechat_Facebook_API_Key') }`,
+ },
+ });
+ return result.data;
+ },
+
+ reply({ page, token, text }) {
+ return HTTP.call('POST', `${ gatewayURL }/facebook/reply`, {
+ headers: {
+ authorization: `Bearer ${ settings.get('Livechat_Facebook_API_Key') }`,
+ },
+ data: {
+ page,
+ token,
+ text,
+ },
+ });
+ },
+};
diff --git a/app/livechat/server/lib/QueueMethods.js b/app/livechat/server/lib/QueueMethods.js
new file mode 100644
index 000000000000..aed907b4f6f9
--- /dev/null
+++ b/app/livechat/server/lib/QueueMethods.js
@@ -0,0 +1,197 @@
+import { Meteor } from 'meteor/meteor';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { Rooms, Subscriptions, Users } from '../../../models';
+import { settings } from '../../../settings';
+import _ from 'underscore';
+import { sendNotification } from '../../../lib';
+import { LivechatInquiry } from '../../lib/LivechatInquiry';
+import { Livechat } from './Livechat';
+
+export const QueueMethods = {
+ /* Least Amount Queuing method:
+ *
+ * default method where the agent with the least number
+ * of open chats is paired with the incoming livechat
+ */
+ 'Least_Amount'(guest, message, roomInfo, agent) {
+ if (!agent || (agent.username && !Users.findOneOnlineAgentByUsername(agent.username))) {
+ agent = Livechat.getNextAgent(guest.department);
+ if (!agent) {
+ throw new Meteor.Error('no-agent-online', 'Sorry, no online agents');
+ }
+ }
+
+ Rooms.updateLivechatRoomCount();
+
+ const room = _.extend({
+ _id: message.rid,
+ msgs: 0,
+ usersCount: 1,
+ lm: new Date(),
+ fname: (roomInfo && roomInfo.fname) || guest.name || guest.username,
+ // usernames: [agent.username, guest.username],
+ t: 'l',
+ ts: new Date(),
+ v: {
+ _id: guest._id,
+ username: guest.username,
+ token: message.token,
+ status: guest.status || 'online',
+ },
+ servedBy: {
+ _id: agent.agentId,
+ username: agent.username,
+ ts: new Date(),
+ },
+ cl: false,
+ open: true,
+ waitingResponse: true,
+ }, roomInfo);
+
+ const subscriptionData = {
+ rid: message.rid,
+ fname: guest.name || guest.username,
+ alert: true,
+ open: true,
+ unread: 1,
+ userMentions: 1,
+ groupMentions: 0,
+ u: {
+ _id: agent.agentId,
+ username: agent.username,
+ },
+ t: 'l',
+ desktopNotifications: 'all',
+ mobilePushNotifications: 'all',
+ emailNotifications: 'all',
+ };
+
+ if (guest.department) {
+ room.departmentId = guest.department;
+ }
+
+ Rooms.insert(room);
+
+ Subscriptions.insert(subscriptionData);
+
+ Livechat.stream.emit(room._id, {
+ type: 'agentData',
+ data: Users.getAgentInfo(agent.agentId),
+ });
+
+ return room;
+ },
+ /* Guest Pool Queuing Method:
+ *
+ * An incomming livechat is created as an Inquiry
+ * which is picked up from an agent.
+ * An Inquiry is visible to all agents (TODO: in the correct department)
+ *
+ * A room is still created with the initial message, but it is occupied by
+ * only the client until paired with an agent
+ */
+ 'Guest_Pool'(guest, message, roomInfo) {
+ const onlineAgents = Livechat.getOnlineAgents(guest.department);
+ if (settings.get('Livechat_guest_pool_with_no_agents') === false) {
+ if (!onlineAgents || onlineAgents.count() === 0) {
+ throw new Meteor.Error('no-agent-online', 'Sorry, no online agents');
+ }
+ }
+
+ const allAgents = Livechat.getAgents(guest.department);
+ if (allAgents.count() === 0) {
+ throw new Meteor.Error('no-agent-available', 'Sorry, no available agents.');
+ }
+
+ Rooms.updateLivechatRoomCount();
+
+ const agentIds = [];
+
+ allAgents.forEach((agent) => {
+ if (guest.department) {
+ agentIds.push(agent.agentId);
+ } else {
+ agentIds.push(agent._id);
+ }
+ });
+
+ const inquiry = {
+ rid: message.rid,
+ message: message.msg,
+ name: guest.name || guest.username,
+ ts: new Date(),
+ department: guest.department,
+ agents: agentIds,
+ status: 'open',
+ v: {
+ _id: guest._id,
+ username: guest.username,
+ token: message.token,
+ status: guest.status || 'online',
+ },
+ t: 'l',
+ };
+
+ const room = _.extend({
+ _id: message.rid,
+ msgs: 0,
+ usersCount: 0,
+ lm: new Date(),
+ fname: guest.name || guest.username,
+ // usernames: [guest.username],
+ t: 'l',
+ ts: new Date(),
+ v: {
+ _id: guest._id,
+ username: guest.username,
+ token: message.token,
+ status: guest.status,
+ },
+ cl: false,
+ open: true,
+ waitingResponse: true,
+ }, roomInfo);
+
+ if (guest.department) {
+ room.departmentId = guest.department;
+ }
+
+ LivechatInquiry.insert(inquiry);
+ Rooms.insert(room);
+
+ // Alert only the online agents of the queued request
+ onlineAgents.forEach((agent) => {
+ const { _id, active, emails, language, status, statusConnection, username } = agent;
+
+ sendNotification({
+ // fake a subscription in order to make use of the function defined above
+ subscription: {
+ rid: room._id,
+ t : room.t,
+ u: {
+ _id,
+ },
+ receiver: [{
+ active,
+ emails,
+ language,
+ status,
+ statusConnection,
+ username,
+ }],
+ },
+ sender: room.v,
+ hasMentionToAll: true, // consider all agents to be in the room
+ hasMentionToHere: false,
+ message: Object.assign(message, { u: room.v }),
+ notificationMessage: message.msg,
+ room: Object.assign(room, { name: TAPi18n.__('New_livechat_in_queue') }),
+ mentionIds: [],
+ });
+ });
+ return room;
+ },
+ 'External'(guest, message, roomInfo, agent) {
+ return this['Least_Amount'](guest, message, roomInfo, agent); // eslint-disable-line
+ },
+};
diff --git a/app/livechat/server/livechat.js b/app/livechat/server/livechat.js
new file mode 100644
index 000000000000..84b6edc7beb4
--- /dev/null
+++ b/app/livechat/server/livechat.js
@@ -0,0 +1,43 @@
+import _ from 'underscore';
+import url from 'url';
+
+import { Meteor } from 'meteor/meteor';
+import { WebApp } from 'meteor/webapp';
+
+import { settings } from '../../settings/server';
+import { addServerUrlToIndex, addServerUrlToHead } from '../lib/Assets';
+
+const latestVersion = '1.0.0';
+const indexHtmlWithServerURL = addServerUrlToIndex(Assets.getText('livechat/index.html'));
+const headHtmlWithServerURL = addServerUrlToHead(Assets.getText('livechat/head.html'));
+const isLatestVersion = (version) => version && version === latestVersion;
+
+WebApp.connectHandlers.use('/livechat', Meteor.bindEnvironment((req, res, next) => {
+ const reqUrl = url.parse(req.url);
+ if (reqUrl.pathname !== '/') {
+ return next();
+ }
+
+ const { version } = req.query;
+ const html = isLatestVersion(version) ? indexHtmlWithServerURL : headHtmlWithServerURL;
+
+ res.setHeader('content-type', 'text/html; charset=utf-8');
+
+ let domainWhiteList = settings.get('Livechat_AllowedDomainsList');
+ if (req.headers.referer && !_.isEmpty(domainWhiteList.trim())) {
+ domainWhiteList = _.map(domainWhiteList.split(','), function(domain) {
+ return domain.trim();
+ });
+
+ const referer = url.parse(req.headers.referer);
+ if (!_.contains(domainWhiteList, referer.host)) {
+ res.setHeader('X-FRAME-OPTIONS', 'DENY');
+ return next();
+ }
+
+ res.setHeader('X-FRAME-OPTIONS', `ALLOW-FROM ${ referer.protocol }//${ referer.host }`);
+ }
+
+ res.write(html);
+ res.end();
+}));
diff --git a/app/livechat/server/methods/addAgent.js b/app/livechat/server/methods/addAgent.js
new file mode 100644
index 000000000000..21b6884ffe64
--- /dev/null
+++ b/app/livechat/server/methods/addAgent.js
@@ -0,0 +1,13 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:addAgent'(username) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:addAgent' });
+ }
+
+ return Livechat.addAgent(username);
+ },
+});
diff --git a/app/livechat/server/methods/addManager.js b/app/livechat/server/methods/addManager.js
new file mode 100644
index 000000000000..dc4cb052de05
--- /dev/null
+++ b/app/livechat/server/methods/addManager.js
@@ -0,0 +1,13 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:addManager'(username) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:addManager' });
+ }
+
+ return Livechat.addManager(username);
+ },
+});
diff --git a/app/livechat/server/methods/changeLivechatStatus.js b/app/livechat/server/methods/changeLivechatStatus.js
new file mode 100644
index 000000000000..31a302e139b1
--- /dev/null
+++ b/app/livechat/server/methods/changeLivechatStatus.js
@@ -0,0 +1,16 @@
+import { Meteor } from 'meteor/meteor';
+import { Users } from '../../../models';
+
+Meteor.methods({
+ 'livechat:changeLivechatStatus'() {
+ if (!Meteor.userId()) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:changeLivechatStatus' });
+ }
+
+ const user = Meteor.user();
+
+ const newStatus = user.statusLivechat === 'available' ? 'not-available' : 'available';
+
+ return Users.setLivechatStatus(user._id, newStatus);
+ },
+});
diff --git a/app/livechat/server/methods/closeByVisitor.js b/app/livechat/server/methods/closeByVisitor.js
new file mode 100644
index 000000000000..c3829f232b2c
--- /dev/null
+++ b/app/livechat/server/methods/closeByVisitor.js
@@ -0,0 +1,19 @@
+import { Meteor } from 'meteor/meteor';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { settings } from '../../../settings';
+import { Rooms, LivechatVisitors } from '../../../models';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:closeByVisitor'({ roomId, token }) {
+ const visitor = LivechatVisitors.getVisitorByToken(token);
+
+ const language = (visitor && visitor.language) || settings.get('Language') || 'en';
+
+ return Livechat.closeRoom({
+ visitor,
+ room: Rooms.findOneOpenByRoomIdAndVisitorToken(roomId, token),
+ comment: TAPi18n.__('Closed_by_visitor', { lng: language }),
+ });
+ },
+});
diff --git a/app/livechat/server/methods/closeRoom.js b/app/livechat/server/methods/closeRoom.js
new file mode 100644
index 000000000000..7d49719a0465
--- /dev/null
+++ b/app/livechat/server/methods/closeRoom.js
@@ -0,0 +1,26 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Subscriptions, Rooms } from '../../../models';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:closeRoom'(roomId, comment) {
+ const userId = Meteor.userId();
+ if (!userId || !hasPermission(userId, 'close-livechat-room')) {
+ throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'livechat:closeRoom' });
+ }
+
+ const user = Meteor.user();
+
+ const subscription = Subscriptions.findOneByRoomIdAndUserId(roomId, user._id, { _id: 1 });
+ if (!subscription && !hasPermission(userId, 'close-others-livechat-room')) {
+ throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'livechat:closeRoom' });
+ }
+
+ return Livechat.closeRoom({
+ user,
+ room: Rooms.findOneById(roomId),
+ comment,
+ });
+ },
+});
diff --git a/app/livechat/server/methods/facebook.js b/app/livechat/server/methods/facebook.js
new file mode 100644
index 000000000000..075165f3bf74
--- /dev/null
+++ b/app/livechat/server/methods/facebook.js
@@ -0,0 +1,65 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { settings } from '../../../settings';
+import OmniChannel from '../lib/OmniChannel';
+
+Meteor.methods({
+ 'livechat:facebook'(options) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:addAgent' });
+ }
+
+ try {
+ switch (options.action) {
+ case 'initialState': {
+ return {
+ enabled: settings.get('Livechat_Facebook_Enabled'),
+ hasToken: !!settings.get('Livechat_Facebook_API_Key'),
+ };
+ }
+
+ case 'enable': {
+ const result = OmniChannel.enable();
+
+ if (!result.success) {
+ return result;
+ }
+
+ return settings.updateById('Livechat_Facebook_Enabled', true);
+ }
+
+ case 'disable': {
+ OmniChannel.disable();
+
+ return settings.updateById('Livechat_Facebook_Enabled', false);
+ }
+
+ case 'list-pages': {
+ return OmniChannel.listPages();
+ }
+
+ case 'subscribe': {
+ return OmniChannel.subscribe(options.page);
+ }
+
+ case 'unsubscribe': {
+ return OmniChannel.unsubscribe(options.page);
+ }
+ }
+ } catch (e) {
+ if (e.response && e.response.data && e.response.data.error) {
+ if (e.response.data.error.error) {
+ throw new Meteor.Error(e.response.data.error.error, e.response.data.error.message);
+ }
+ if (e.response.data.error.response) {
+ throw new Meteor.Error('integration-error', e.response.data.error.response.error.message);
+ }
+ if (e.response.data.error.message) {
+ throw new Meteor.Error('integration-error', e.response.data.error.message);
+ }
+ }
+ console.error('Error contacting omni.rocket.chat:', e);
+ throw new Meteor.Error('integration-error', e.error);
+ }
+ },
+});
diff --git a/app/livechat/server/methods/getAgentData.js b/app/livechat/server/methods/getAgentData.js
new file mode 100644
index 000000000000..77bdf81adbde
--- /dev/null
+++ b/app/livechat/server/methods/getAgentData.js
@@ -0,0 +1,23 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import { Users, Rooms, LivechatVisitors } from '../../../models';
+
+Meteor.methods({
+ 'livechat:getAgentData'({ roomId, token }) {
+ check(roomId, String);
+ check(token, String);
+
+ const room = Rooms.findOneById(roomId);
+ const visitor = LivechatVisitors.getVisitorByToken(token);
+
+ if (!room || room.t !== 'l' || !room.v || room.v.token !== visitor.token) {
+ throw new Meteor.Error('error-invalid-room', 'Invalid room');
+ }
+
+ if (!room.servedBy) {
+ return;
+ }
+
+ return Users.getAgentInfo(room.servedBy._id);
+ },
+});
diff --git a/app/livechat/server/methods/getAgentOverviewData.js b/app/livechat/server/methods/getAgentOverviewData.js
new file mode 100644
index 000000000000..e6c325a9195a
--- /dev/null
+++ b/app/livechat/server/methods/getAgentOverviewData.js
@@ -0,0 +1,20 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:getAgentOverviewData'(options) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+ method: 'livechat:getAgentOverviewData',
+ });
+ }
+
+ if (!(options.chartOptions && options.chartOptions.name)) {
+ console.log('Incorrect analytics options');
+ return;
+ }
+
+ return Livechat.Analytics.getAgentOverviewData(options);
+ },
+});
diff --git a/app/livechat/server/methods/getAnalyticsChartData.js b/app/livechat/server/methods/getAnalyticsChartData.js
new file mode 100644
index 000000000000..918ff200d1ad
--- /dev/null
+++ b/app/livechat/server/methods/getAnalyticsChartData.js
@@ -0,0 +1,20 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:getAnalyticsChartData'(options) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+ method: 'livechat:getAnalyticsChartData',
+ });
+ }
+
+ if (!(options.chartOptions && options.chartOptions.name)) {
+ console.log('Incorrect chart options');
+ return;
+ }
+
+ return Livechat.Analytics.getAnalyticsChartData(options);
+ },
+});
diff --git a/app/livechat/server/methods/getAnalyticsOverviewData.js b/app/livechat/server/methods/getAnalyticsOverviewData.js
new file mode 100644
index 000000000000..0958c8085017
--- /dev/null
+++ b/app/livechat/server/methods/getAnalyticsOverviewData.js
@@ -0,0 +1,20 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:getAnalyticsOverviewData'(options) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+ method: 'livechat:getAnalyticsOverviewData',
+ });
+ }
+
+ if (!(options.analyticsOptions && options.analyticsOptions.name)) {
+ console.log('Incorrect analytics options');
+ return;
+ }
+
+ return Livechat.Analytics.getAnalyticsOverviewData(options);
+ },
+});
diff --git a/app/livechat/server/methods/getCustomFields.js b/app/livechat/server/methods/getCustomFields.js
new file mode 100644
index 000000000000..8d2020520481
--- /dev/null
+++ b/app/livechat/server/methods/getCustomFields.js
@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+import { LivechatCustomField } from '../../../models';
+
+Meteor.methods({
+ 'livechat:getCustomFields'() {
+ return LivechatCustomField.find().fetch();
+ },
+});
diff --git a/app/livechat/server/methods/getFirstRoomMessage.js b/app/livechat/server/methods/getFirstRoomMessage.js
new file mode 100644
index 000000000000..2bac3b053b4f
--- /dev/null
+++ b/app/livechat/server/methods/getFirstRoomMessage.js
@@ -0,0 +1,22 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import { Rooms, Messages } from '../../../models';
+import { hasPermission } from '../../../authorization';
+
+Meteor.methods({
+ 'livechat:getFirstRoomMessage'({ rid }) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-l-room')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:getFirstRoomMessage' });
+ }
+
+ check(rid, String);
+
+ const room = Rooms.findOneById(rid);
+
+ if (!room || room.t !== 'l') {
+ throw new Meteor.Error('error-invalid-room', 'Invalid room');
+ }
+
+ return Messages.findOne({ rid }, { sort: { ts: 1 } });
+ },
+});
diff --git a/packages/rocketchat-livechat/server/methods/getInitialData.js b/app/livechat/server/methods/getInitialData.js
similarity index 78%
rename from packages/rocketchat-livechat/server/methods/getInitialData.js
rename to app/livechat/server/methods/getInitialData.js
index d2e7ad337f69..4099074a86ad 100644
--- a/packages/rocketchat-livechat/server/methods/getInitialData.js
+++ b/app/livechat/server/methods/getInitialData.js
@@ -1,8 +1,7 @@
import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { Rooms, Users, LivechatDepartment, LivechatTrigger, LivechatVisitors } from '../../../models';
import _ from 'underscore';
-
-import LivechatVisitors from '../models/LivechatVisitors';
+import { Livechat } from '../lib/Livechat';
Meteor.methods({
'livechat:getInitialData'(visitorToken, departmentId) {
@@ -28,6 +27,7 @@ Meteor.methods({
nameFieldRegistrationForm: null,
emailFieldRegistrationForm: null,
registrationFormMessage: null,
+ showConnecting: false,
};
const options = {
@@ -42,7 +42,7 @@ Meteor.methods({
departmentId: 1,
},
};
- const room = (departmentId) ? RocketChat.models.Rooms.findOpenByVisitorTokenAndDepartmentId(visitorToken, departmentId, options).fetch() : RocketChat.models.Rooms.findOpenByVisitorToken(visitorToken, options).fetch();
+ const room = (departmentId) ? Rooms.findOpenByVisitorTokenAndDepartmentId(visitorToken, departmentId, options).fetch() : Rooms.findOpenByVisitorToken(visitorToken, options).fetch();
if (room && room.length > 0) {
info.room = room[0];
}
@@ -60,7 +60,7 @@ Meteor.methods({
info.visitor = visitor;
}
- const initSettings = RocketChat.Livechat.getInitSettings();
+ const initSettings = Livechat.getInitSettings();
info.title = initSettings.Livechat_title;
info.color = initSettings.Livechat_title_color;
@@ -81,19 +81,20 @@ Meteor.methods({
info.nameFieldRegistrationForm = initSettings.Livechat_name_field_registration_form;
info.emailFieldRegistrationForm = initSettings.Livechat_email_field_registration_form;
info.registrationFormMessage = initSettings.Livechat_registration_form_message;
+ info.showConnecting = initSettings.Livechat_Show_Connecting;
- info.agentData = room && room[0] && room[0].servedBy && RocketChat.models.Users.getAgentInfo(room[0].servedBy._id);
+ info.agentData = room && room[0] && room[0].servedBy && Users.getAgentInfo(room[0].servedBy._id);
- RocketChat.models.LivechatTrigger.findEnabled().forEach((trigger) => {
+ LivechatTrigger.findEnabled().forEach((trigger) => {
info.triggers.push(_.pick(trigger, '_id', 'actions', 'conditions', 'runOnce'));
});
- RocketChat.models.LivechatDepartment.findEnabledWithAgents().forEach((department) => {
+ LivechatDepartment.findEnabledWithAgents().forEach((department) => {
info.departments.push(department);
});
info.allowSwitchingDepartments = initSettings.Livechat_allow_switching_departments;
- info.online = RocketChat.models.Users.findOnlineAgents().count() > 0;
+ info.online = Users.findOnlineAgents().count() > 0;
return info;
},
});
diff --git a/app/livechat/server/methods/getNextAgent.js b/app/livechat/server/methods/getNextAgent.js
new file mode 100644
index 000000000000..6946c01d0039
--- /dev/null
+++ b/app/livechat/server/methods/getNextAgent.js
@@ -0,0 +1,30 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import { Rooms, Users } from '../../../models';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:getNextAgent'({ token, department }) {
+ check(token, String);
+
+ const room = Rooms.findOpenByVisitorToken(token).fetch();
+
+ if (room && room.length > 0) {
+ return;
+ }
+
+ if (!department) {
+ const requireDeparment = Livechat.getRequiredDepartment();
+ if (requireDeparment) {
+ department = requireDeparment._id;
+ }
+ }
+
+ const agent = Livechat.getNextAgent(department);
+ if (!agent) {
+ return;
+ }
+
+ return Users.getAgentInfo(agent.agentId);
+ },
+});
diff --git a/app/livechat/server/methods/loadHistory.js b/app/livechat/server/methods/loadHistory.js
new file mode 100644
index 000000000000..060a5c6b549f
--- /dev/null
+++ b/app/livechat/server/methods/loadHistory.js
@@ -0,0 +1,15 @@
+import { Meteor } from 'meteor/meteor';
+import { loadMessageHistory } from '../../../lib';
+import { LivechatVisitors } from '../../../models';
+
+Meteor.methods({
+ 'livechat:loadHistory'({ token, rid, end, limit = 20, ls }) {
+ const visitor = LivechatVisitors.getVisitorByToken(token, { fields: { _id: 1 } });
+
+ if (!visitor) {
+ return;
+ }
+
+ return loadMessageHistory({ userId: visitor._id, rid, end, limit, ls });
+ },
+});
diff --git a/packages/rocketchat-livechat/server/methods/loginByToken.js b/app/livechat/server/methods/loginByToken.js
similarity index 81%
rename from packages/rocketchat-livechat/server/methods/loginByToken.js
rename to app/livechat/server/methods/loginByToken.js
index 1eaae13492bc..18bbad251dd7 100644
--- a/packages/rocketchat-livechat/server/methods/loginByToken.js
+++ b/app/livechat/server/methods/loginByToken.js
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
-import LivechatVisitors from '../models/LivechatVisitors';
+import { LivechatVisitors } from '../../../models';
Meteor.methods({
'livechat:loginByToken'(token) {
diff --git a/app/livechat/server/methods/pageVisited.js b/app/livechat/server/methods/pageVisited.js
new file mode 100644
index 000000000000..114108f87fc5
--- /dev/null
+++ b/app/livechat/server/methods/pageVisited.js
@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:pageVisited'(token, room, pageInfo) {
+ Livechat.savePageHistory(token, room, pageInfo);
+ },
+});
diff --git a/app/livechat/server/methods/registerGuest.js b/app/livechat/server/methods/registerGuest.js
new file mode 100644
index 000000000000..46995a549319
--- /dev/null
+++ b/app/livechat/server/methods/registerGuest.js
@@ -0,0 +1,51 @@
+import { Meteor } from 'meteor/meteor';
+import { Messages, Rooms, LivechatVisitors } from '../../../models';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:registerGuest'({ token, name, email, department, customFields } = {}) {
+ const userId = Livechat.registerGuest.call(this, {
+ token,
+ name,
+ email,
+ department,
+ });
+
+ // update visited page history to not expire
+ Messages.keepHistoryForToken(token);
+
+ const visitor = LivechatVisitors.getVisitorByToken(token, {
+ fields: {
+ token: 1,
+ name: 1,
+ username: 1,
+ visitorEmails: 1,
+ department: 1,
+ },
+ });
+
+ // If it's updating an existing visitor, it must also update the roomInfo
+ const cursor = Rooms.findOpenByVisitorToken(token);
+ cursor.forEach((room) => {
+ Livechat.saveRoomInfo(room, visitor);
+ });
+
+ if (customFields && customFields instanceof Array) {
+ customFields.forEach((customField) => {
+ if (typeof customField !== 'object') {
+ return;
+ }
+
+ if (!customField.scope || customField.scope !== 'room') {
+ const { key, value, overwrite } = customField;
+ LivechatVisitors.updateLivechatDataByToken(token, key, value, overwrite);
+ }
+ });
+ }
+
+ return {
+ userId,
+ visitor,
+ };
+ },
+});
diff --git a/app/livechat/server/methods/removeAgent.js b/app/livechat/server/methods/removeAgent.js
new file mode 100644
index 000000000000..e6bc9fcf0cc2
--- /dev/null
+++ b/app/livechat/server/methods/removeAgent.js
@@ -0,0 +1,13 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:removeAgent'(username) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:removeAgent' });
+ }
+
+ return Livechat.removeAgent(username);
+ },
+});
diff --git a/app/livechat/server/methods/removeCustomField.js b/app/livechat/server/methods/removeCustomField.js
new file mode 100644
index 000000000000..a53efa59ee0c
--- /dev/null
+++ b/app/livechat/server/methods/removeCustomField.js
@@ -0,0 +1,22 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import { hasPermission } from '../../../authorization';
+import { LivechatCustomField } from '../../../models';
+
+Meteor.methods({
+ 'livechat:removeCustomField'(_id) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:removeCustomField' });
+ }
+
+ check(_id, String);
+
+ const customField = LivechatCustomField.findOneById(_id, { fields: { _id: 1 } });
+
+ if (!customField) {
+ throw new Meteor.Error('error-invalid-custom-field', 'Custom field not found', { method: 'livechat:removeCustomField' });
+ }
+
+ return LivechatCustomField.removeById(_id);
+ },
+});
diff --git a/app/livechat/server/methods/removeDepartment.js b/app/livechat/server/methods/removeDepartment.js
new file mode 100644
index 000000000000..d08fee853401
--- /dev/null
+++ b/app/livechat/server/methods/removeDepartment.js
@@ -0,0 +1,13 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:removeDepartment'(_id) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:removeDepartment' });
+ }
+
+ return Livechat.removeDepartment(_id);
+ },
+});
diff --git a/app/livechat/server/methods/removeManager.js b/app/livechat/server/methods/removeManager.js
new file mode 100644
index 000000000000..9fa635e7d6bd
--- /dev/null
+++ b/app/livechat/server/methods/removeManager.js
@@ -0,0 +1,13 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:removeManager'(username) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:removeManager' });
+ }
+
+ return Livechat.removeManager(username);
+ },
+});
diff --git a/app/livechat/server/methods/removeRoom.js b/app/livechat/server/methods/removeRoom.js
new file mode 100644
index 000000000000..13ef3aa62d02
--- /dev/null
+++ b/app/livechat/server/methods/removeRoom.js
@@ -0,0 +1,35 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Rooms, Messages, Subscriptions } from '../../../models';
+
+Meteor.methods({
+ 'livechat:removeRoom'(rid) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'remove-closed-livechat-rooms')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:removeRoom' });
+ }
+
+ const room = Rooms.findOneById(rid);
+
+ if (!room) {
+ throw new Meteor.Error('error-invalid-room', 'Invalid room', {
+ method: 'livechat:removeRoom',
+ });
+ }
+
+ if (room.t !== 'l') {
+ throw new Meteor.Error('error-this-is-not-a-livechat-room', 'This is not a Livechat room', {
+ method: 'livechat:removeRoom',
+ });
+ }
+
+ if (room.open) {
+ throw new Meteor.Error('error-room-is-not-closed', 'Room is not closed', {
+ method: 'livechat:removeRoom',
+ });
+ }
+
+ Messages.removeByRoomId(rid);
+ Subscriptions.removeByRoomId(rid);
+ return Rooms.removeById(rid);
+ },
+});
diff --git a/app/livechat/server/methods/removeTrigger.js b/app/livechat/server/methods/removeTrigger.js
new file mode 100644
index 000000000000..164f0f56b4fc
--- /dev/null
+++ b/app/livechat/server/methods/removeTrigger.js
@@ -0,0 +1,16 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import { hasPermission } from '../../../authorization';
+import { LivechatTrigger } from '../../../models';
+
+Meteor.methods({
+ 'livechat:removeTrigger'(triggerId) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:removeTrigger' });
+ }
+
+ check(triggerId, String);
+
+ return LivechatTrigger.removeById(triggerId);
+ },
+});
diff --git a/app/livechat/server/methods/returnAsInquiry.js b/app/livechat/server/methods/returnAsInquiry.js
new file mode 100644
index 000000000000..2a7c5971bb4e
--- /dev/null
+++ b/app/livechat/server/methods/returnAsInquiry.js
@@ -0,0 +1,13 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:returnAsInquiry'(rid, departmentId) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-l-room')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveDepartment' });
+ }
+
+ return Livechat.returnRoomAsInquiry(rid, departmentId);
+ },
+});
diff --git a/packages/rocketchat-livechat/server/methods/saveAppearance.js b/app/livechat/server/methods/saveAppearance.js
similarity index 79%
rename from packages/rocketchat-livechat/server/methods/saveAppearance.js
rename to app/livechat/server/methods/saveAppearance.js
index 368863bf2bf8..18ac479061a7 100644
--- a/packages/rocketchat-livechat/server/methods/saveAppearance.js
+++ b/app/livechat/server/methods/saveAppearance.js
@@ -1,9 +1,10 @@
import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { hasPermission } from '../../../authorization';
+import { settings as rcSettings } from '../../../settings';
Meteor.methods({
'livechat:saveAppearance'(settings) {
- if (!Meteor.userId() || !RocketChat.authz.hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveAppearance' });
}
@@ -32,7 +33,7 @@ Meteor.methods({
}
settings.forEach((setting) => {
- RocketChat.settings.updateById(setting._id, setting.value);
+ rcSettings.updateById(setting._id, setting.value);
});
return;
diff --git a/app/livechat/server/methods/saveCustomField.js b/app/livechat/server/methods/saveCustomField.js
new file mode 100644
index 000000000000..8a41b25e1dc1
--- /dev/null
+++ b/app/livechat/server/methods/saveCustomField.js
@@ -0,0 +1,31 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { hasPermission } from '../../../authorization';
+import { LivechatCustomField } from '../../../models';
+
+Meteor.methods({
+ 'livechat:saveCustomField'(_id, customFieldData) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveCustomField' });
+ }
+
+ if (_id) {
+ check(_id, String);
+ }
+
+ check(customFieldData, Match.ObjectIncluding({ field: String, label: String, scope: String, visibility: String }));
+
+ if (!/^[0-9a-zA-Z-_]+$/.test(customFieldData.field)) {
+ throw new Meteor.Error('error-invalid-custom-field-nmae', 'Invalid custom field name. Use only letters, numbers, hyphens and underscores.', { method: 'livechat:saveCustomField' });
+ }
+
+ if (_id) {
+ const customField = LivechatCustomField.findOneById(_id);
+ if (!customField) {
+ throw new Meteor.Error('error-invalid-custom-field', 'Custom Field Not found', { method: 'livechat:saveCustomField' });
+ }
+ }
+
+ return LivechatCustomField.createOrUpdateCustomField(_id, customFieldData.field, customFieldData.label, customFieldData.scope, customFieldData.visibility);
+ },
+});
diff --git a/app/livechat/server/methods/saveDepartment.js b/app/livechat/server/methods/saveDepartment.js
new file mode 100644
index 000000000000..067f49592aef
--- /dev/null
+++ b/app/livechat/server/methods/saveDepartment.js
@@ -0,0 +1,13 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:saveDepartment'(_id, departmentData, departmentAgents) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveDepartment' });
+ }
+
+ return Livechat.saveDepartment(_id, departmentData, departmentAgents);
+ },
+});
diff --git a/app/livechat/server/methods/saveInfo.js b/app/livechat/server/methods/saveInfo.js
new file mode 100644
index 000000000000..4318fd163c7d
--- /dev/null
+++ b/app/livechat/server/methods/saveInfo.js
@@ -0,0 +1,45 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { hasPermission } from '../../../authorization';
+import { Rooms } from '../../../models';
+import { callbacks } from '../../../callbacks';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:saveInfo'(guestData, roomData) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-l-room')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveInfo' });
+ }
+
+ check(guestData, Match.ObjectIncluding({
+ _id: String,
+ name: Match.Optional(String),
+ email: Match.Optional(String),
+ phone: Match.Optional(String),
+ }));
+
+ check(roomData, Match.ObjectIncluding({
+ _id: String,
+ topic: Match.Optional(String),
+ tags: Match.Optional(String),
+ }));
+
+ const room = Rooms.findOneById(roomData._id, { fields: { t: 1, servedBy: 1 } });
+
+ if (room == null || room.t !== 'l') {
+ throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'livechat:saveInfo' });
+ }
+
+ if ((!room.servedBy || room.servedBy._id !== Meteor.userId()) && !hasPermission(Meteor.userId(), 'save-others-livechat-room-info')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveInfo' });
+ }
+
+ const ret = Livechat.saveGuest(guestData) && Livechat.saveRoomInfo(roomData, guestData);
+
+ Meteor.defer(() => {
+ callbacks.run('livechat.saveInfo', Rooms.findOneById(roomData._id));
+ });
+
+ return ret;
+ },
+});
diff --git a/app/livechat/server/methods/saveIntegration.js b/app/livechat/server/methods/saveIntegration.js
new file mode 100644
index 000000000000..b4097b76e534
--- /dev/null
+++ b/app/livechat/server/methods/saveIntegration.js
@@ -0,0 +1,38 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { settings } from '../../../settings';
+import s from 'underscore.string';
+
+Meteor.methods({
+ 'livechat:saveIntegration'(values) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveIntegration' });
+ }
+
+ if (typeof values.Livechat_webhookUrl !== 'undefined') {
+ settings.updateById('Livechat_webhookUrl', s.trim(values.Livechat_webhookUrl));
+ }
+
+ if (typeof values.Livechat_secret_token !== 'undefined') {
+ settings.updateById('Livechat_secret_token', s.trim(values.Livechat_secret_token));
+ }
+
+ if (typeof values.Livechat_webhook_on_close !== 'undefined') {
+ settings.updateById('Livechat_webhook_on_close', !!values.Livechat_webhook_on_close);
+ }
+
+ if (typeof values.Livechat_webhook_on_offline_msg !== 'undefined') {
+ settings.updateById('Livechat_webhook_on_offline_msg', !!values.Livechat_webhook_on_offline_msg);
+ }
+
+ if (typeof values.Livechat_webhook_on_visitor_message !== 'undefined') {
+ settings.updateById('Livechat_webhook_on_visitor_message', !!values.Livechat_webhook_on_visitor_message);
+ }
+
+ if (typeof values.Livechat_webhook_on_agent_message !== 'undefined') {
+ settings.updateById('Livechat_webhook_on_agent_message', !!values.Livechat_webhook_on_agent_message);
+ }
+
+ return;
+ },
+});
diff --git a/app/livechat/server/methods/saveOfficeHours.js b/app/livechat/server/methods/saveOfficeHours.js
new file mode 100644
index 000000000000..874777929071
--- /dev/null
+++ b/app/livechat/server/methods/saveOfficeHours.js
@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+import { LivechatOfficeHour } from '../../../models';
+
+Meteor.methods({
+ 'livechat:saveOfficeHours'(day, start, finish, open) {
+ LivechatOfficeHour.updateHours(day, start, finish, open);
+ },
+});
diff --git a/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js b/app/livechat/server/methods/saveSurveyFeedback.js
similarity index 78%
rename from packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js
rename to app/livechat/server/methods/saveSurveyFeedback.js
index 4636a42a7a4b..5b5a571178dc 100644
--- a/packages/rocketchat-livechat/server/methods/saveSurveyFeedback.js
+++ b/app/livechat/server/methods/saveSurveyFeedback.js
@@ -1,7 +1,6 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import LivechatVisitors from '../models/LivechatVisitors';
+import { Rooms, LivechatVisitors } from '../../../models';
import _ from 'underscore';
Meteor.methods({
@@ -11,7 +10,7 @@ Meteor.methods({
check(formData, [Match.ObjectIncluding({ name: String, value: String })]);
const visitor = LivechatVisitors.getVisitorByToken(visitorToken);
- const room = RocketChat.models.Rooms.findOneById(visitorRoom);
+ const room = Rooms.findOneById(visitorRoom);
if (visitor !== undefined && room !== undefined && room.v !== undefined && room.v.token === visitor.token) {
const updateData = {};
@@ -23,7 +22,7 @@ Meteor.methods({
}
}
if (!_.isEmpty(updateData)) {
- return RocketChat.models.Rooms.updateSurveyFeedbackById(room._id, updateData);
+ return Rooms.updateSurveyFeedbackById(room._id, updateData);
}
}
},
diff --git a/app/livechat/server/methods/saveTrigger.js b/app/livechat/server/methods/saveTrigger.js
new file mode 100644
index 000000000000..8452a42ea9d4
--- /dev/null
+++ b/app/livechat/server/methods/saveTrigger.js
@@ -0,0 +1,28 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { hasPermission } from '../../../authorization';
+import { LivechatTrigger } from '../../../models';
+
+Meteor.methods({
+ 'livechat:saveTrigger'(trigger) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveTrigger' });
+ }
+
+ check(trigger, {
+ _id: Match.Maybe(String),
+ name: String,
+ description: String,
+ enabled: Boolean,
+ runOnce: Boolean,
+ conditions: Array,
+ actions: Array,
+ });
+
+ if (trigger._id) {
+ return LivechatTrigger.updateById(trigger._id, trigger);
+ } else {
+ return LivechatTrigger.insert(trigger);
+ }
+ },
+});
diff --git a/app/livechat/server/methods/searchAgent.js b/app/livechat/server/methods/searchAgent.js
new file mode 100644
index 000000000000..18607f7110a2
--- /dev/null
+++ b/app/livechat/server/methods/searchAgent.js
@@ -0,0 +1,24 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Users } from '../../../models';
+import _ from 'underscore';
+
+Meteor.methods({
+ 'livechat:searchAgent'(username) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:searchAgent' });
+ }
+
+ if (!username || !_.isString(username)) {
+ throw new Meteor.Error('error-invalid-arguments', 'Invalid arguments', { method: 'livechat:searchAgent' });
+ }
+
+ const user = Users.findOneByUsername(username, { fields: { _id: 1, username: 1 } });
+
+ if (!user) {
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'livechat:searchAgent' });
+ }
+
+ return user;
+ },
+});
diff --git a/packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js b/app/livechat/server/methods/sendFileLivechatMessage.js
similarity index 86%
rename from packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js
rename to app/livechat/server/methods/sendFileLivechatMessage.js
index 187b4e5c0da3..9095d2971b4c 100644
--- a/packages/rocketchat-livechat/server/methods/sendFileLivechatMessage.js
+++ b/app/livechat/server/methods/sendFileLivechatMessage.js
@@ -1,9 +1,8 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
import { Random } from 'meteor/random';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import { FileUpload } from 'meteor/rocketchat:file-upload';
-import LivechatVisitors from '../models/LivechatVisitors';
+import { Rooms, LivechatVisitors } from '../../../models';
+import { FileUpload } from '../../../file-upload';
Meteor.methods({
async 'sendFileLivechatMessage'(roomId, visitorToken, file, msgData = {}) {
@@ -13,7 +12,7 @@ Meteor.methods({
return false;
}
- const room = RocketChat.models.Rooms.findOneOpenByRoomIdAndVisitorToken(roomId, visitorToken);
+ const room = Rooms.findOneOpenByRoomIdAndVisitorToken(roomId, visitorToken);
if (!room) {
return false;
diff --git a/packages/rocketchat-livechat/server/methods/sendMessageLivechat.js b/app/livechat/server/methods/sendMessageLivechat.js
similarity index 81%
rename from packages/rocketchat-livechat/server/methods/sendMessageLivechat.js
rename to app/livechat/server/methods/sendMessageLivechat.js
index ec4d05abec33..e3b7e7b56721 100644
--- a/packages/rocketchat-livechat/server/methods/sendMessageLivechat.js
+++ b/app/livechat/server/methods/sendMessageLivechat.js
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import LivechatVisitors from '../models/LivechatVisitors';
+import { LivechatVisitors } from '../../../models';
+import { Livechat } from '../lib/Livechat';
Meteor.methods({
sendMessageLivechat({ token, _id, rid, msg, attachments }, agent) {
@@ -28,7 +28,7 @@ Meteor.methods({
throw new Meteor.Error('invalid-token');
}
- return RocketChat.Livechat.sendMessage({
+ return Livechat.sendMessage({
guest,
message: {
_id,
diff --git a/packages/rocketchat-livechat/server/methods/sendOfflineMessage.js b/app/livechat/server/methods/sendOfflineMessage.js
similarity index 79%
rename from packages/rocketchat-livechat/server/methods/sendOfflineMessage.js
rename to app/livechat/server/methods/sendOfflineMessage.js
index 2ace9354065d..d9dde597fedb 100644
--- a/packages/rocketchat-livechat/server/methods/sendOfflineMessage.js
+++ b/app/livechat/server/methods/sendOfflineMessage.js
@@ -1,7 +1,7 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
+import { Livechat } from '../lib/Livechat';
Meteor.methods({
'livechat:sendOfflineMessage'(data) {
@@ -11,7 +11,7 @@ Meteor.methods({
message: String,
});
- return RocketChat.Livechat.sendOfflineMessage(data);
+ return Livechat.sendOfflineMessage(data);
},
});
diff --git a/packages/rocketchat-livechat/server/methods/sendTranscript.js b/app/livechat/server/methods/sendTranscript.js
similarity index 76%
rename from packages/rocketchat-livechat/server/methods/sendTranscript.js
rename to app/livechat/server/methods/sendTranscript.js
index f6b2eb05f532..2ba0aa49343d 100644
--- a/packages/rocketchat-livechat/server/methods/sendTranscript.js
+++ b/app/livechat/server/methods/sendTranscript.js
@@ -1,14 +1,14 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
import { DDPRateLimiter } from 'meteor/ddp-rate-limiter';
+import { Livechat } from '../lib/Livechat';
Meteor.methods({
'livechat:sendTranscript'(token, rid, email) {
check(rid, String);
check(email, String);
- return RocketChat.Livechat.sendTranscript({ token, rid, email });
+ return Livechat.sendTranscript({ token, rid, email });
},
});
diff --git a/app/livechat/server/methods/setCustomField.js b/app/livechat/server/methods/setCustomField.js
new file mode 100644
index 000000000000..1e840732e3c8
--- /dev/null
+++ b/app/livechat/server/methods/setCustomField.js
@@ -0,0 +1,18 @@
+import { Meteor } from 'meteor/meteor';
+import { Rooms, LivechatVisitors, LivechatCustomField } from '../../../models';
+
+Meteor.methods({
+ 'livechat:setCustomField'(token, key, value, overwrite = true) {
+ const customField = LivechatCustomField.findOneById(key);
+ if (customField) {
+ if (customField.scope === 'room') {
+ return Rooms.updateLivechatDataByToken(token, key, value, overwrite);
+ } else {
+ // Save in user
+ return LivechatVisitors.updateLivechatDataByToken(token, key, value, overwrite);
+ }
+ }
+
+ return true;
+ },
+});
diff --git a/app/livechat/server/methods/setDepartmentForVisitor.js b/app/livechat/server/methods/setDepartmentForVisitor.js
new file mode 100644
index 000000000000..3ba3690b4316
--- /dev/null
+++ b/app/livechat/server/methods/setDepartmentForVisitor.js
@@ -0,0 +1,29 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import { Rooms, Messages, LivechatVisitors } from '../../../models';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:setDepartmentForVisitor'({ roomId, visitorToken, departmentId } = {}) {
+ check(roomId, String);
+ check(visitorToken, String);
+ check(departmentId, String);
+
+ const room = Rooms.findOneById(roomId);
+ const visitor = LivechatVisitors.getVisitorByToken(visitorToken);
+
+ if (!room || room.t !== 'l' || !room.v || room.v.token !== visitor.token) {
+ throw new Meteor.Error('error-invalid-room', 'Invalid room');
+ }
+
+ // update visited page history to not expire
+ Messages.keepHistoryForToken(visitorToken);
+
+ const transferData = {
+ roomId,
+ departmentId,
+ };
+
+ return Livechat.transfer(room, visitor, transferData);
+ },
+});
diff --git a/app/livechat/server/methods/setUpConnection.js b/app/livechat/server/methods/setUpConnection.js
new file mode 100644
index 000000000000..bb040ff62131
--- /dev/null
+++ b/app/livechat/server/methods/setUpConnection.js
@@ -0,0 +1,21 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:setUpConnection'(data) {
+
+ check(data, {
+ token: String,
+ });
+
+ const { token } = data;
+
+ if (!this.connection.livechatToken) {
+ this.connection.livechatToken = token;
+ this.connection.onClose(() => {
+ Livechat.notifyGuestStatusChanged(token, 'offline');
+ });
+ }
+ },
+});
diff --git a/app/livechat/server/methods/startFileUploadRoom.js b/app/livechat/server/methods/startFileUploadRoom.js
new file mode 100644
index 000000000000..6d70dbf15843
--- /dev/null
+++ b/app/livechat/server/methods/startFileUploadRoom.js
@@ -0,0 +1,20 @@
+import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+import { LivechatVisitors } from '../../../models';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:startFileUploadRoom'(roomId, token) {
+ const guest = LivechatVisitors.getVisitorByToken(token);
+
+ const message = {
+ _id: Random.id(),
+ rid: roomId || Random.id(),
+ msg: '',
+ ts: new Date(),
+ token: guest.token,
+ };
+
+ return Livechat.getRoom(guest, message);
+ },
+});
diff --git a/app/livechat/server/methods/startVideoCall.js b/app/livechat/server/methods/startVideoCall.js
new file mode 100644
index 000000000000..45c636ce9126
--- /dev/null
+++ b/app/livechat/server/methods/startVideoCall.js
@@ -0,0 +1,39 @@
+import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+import { Messages } from '../../../models';
+import { settings } from '../../../settings';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:startVideoCall'(roomId) {
+ if (!Meteor.userId()) {
+ throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'livechat:closeByVisitor' });
+ }
+
+ const guest = Meteor.user();
+
+ const message = {
+ _id: Random.id(),
+ rid: roomId || Random.id(),
+ msg: '',
+ ts: new Date(),
+ };
+
+ const { room } = Livechat.getRoom(guest, message, { jitsiTimeout: new Date(Date.now() + 3600 * 1000) });
+ message.rid = room._id;
+
+ Messages.createWithTypeRoomIdMessageAndUser('livechat_video_call', room._id, '', guest, {
+ actionLinks: [
+ { icon: 'icon-videocam', i18nLabel: 'Accept', method_id: 'createLivechatCall', params: '' },
+ { icon: 'icon-cancel', i18nLabel: 'Decline', method_id: 'denyLivechatCall', params: '' },
+ ],
+ });
+
+ return {
+ roomId: room._id,
+ domain: settings.get('Jitsi_Domain'),
+ jitsiRoom: settings.get('Jitsi_URL_Room_Prefix') + settings.get('uniqueID') + roomId,
+ };
+ },
+});
+
diff --git a/app/livechat/server/methods/takeInquiry.js b/app/livechat/server/methods/takeInquiry.js
new file mode 100644
index 000000000000..0ad662b1a87f
--- /dev/null
+++ b/app/livechat/server/methods/takeInquiry.js
@@ -0,0 +1,76 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Users, Rooms, Subscriptions, Messages } from '../../../models';
+import { LivechatInquiry } from '../../lib/LivechatInquiry';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:takeInquiry'(inquiryId) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-l-room')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:takeInquiry' });
+ }
+
+ const inquiry = LivechatInquiry.findOneById(inquiryId);
+
+ if (!inquiry || inquiry.status === 'taken') {
+ throw new Meteor.Error('error-not-allowed', 'Inquiry already taken', { method: 'livechat:takeInquiry' });
+ }
+
+ const user = Users.findOneById(Meteor.userId());
+
+ const agent = {
+ agentId: user._id,
+ username: user.username,
+ ts: new Date(),
+ };
+
+ // add subscription
+ const subscriptionData = {
+ rid: inquiry.rid,
+ name: inquiry.name,
+ alert: true,
+ open: true,
+ unread: 1,
+ userMentions: 1,
+ groupMentions: 0,
+ u: {
+ _id: agent.agentId,
+ username: agent.username,
+ },
+ t: 'l',
+ desktopNotifications: 'all',
+ mobilePushNotifications: 'all',
+ emailNotifications: 'all',
+ };
+
+ Subscriptions.insert(subscriptionData);
+ Rooms.incUsersCountById(inquiry.rid);
+
+ // update room
+ const room = Rooms.findOneById(inquiry.rid);
+
+ Rooms.changeAgentByRoomId(inquiry.rid, agent);
+
+ room.servedBy = {
+ _id: agent.agentId,
+ username: agent.username,
+ ts: agent.ts,
+ };
+
+ // mark inquiry as taken
+ LivechatInquiry.takeInquiry(inquiry._id);
+
+ // remove sending message from guest widget
+ // dont check if setting is true, because if settingwas switched off inbetween guest entered pool,
+ // and inquiry being taken, message would not be switched off.
+ Messages.createCommandWithRoomIdAndUser('connected', room._id, user);
+
+ Livechat.stream.emit(room._id, {
+ type: 'agentData',
+ data: Users.getAgentInfo(agent.agentId),
+ });
+
+ // return inquiry (for redirecting agent to the room route)
+ return inquiry;
+ },
+});
diff --git a/app/livechat/server/methods/transfer.js b/app/livechat/server/methods/transfer.js
new file mode 100644
index 000000000000..1b08e5a64066
--- /dev/null
+++ b/app/livechat/server/methods/transfer.js
@@ -0,0 +1,33 @@
+import { Meteor } from 'meteor/meteor';
+import { Match, check } from 'meteor/check';
+import { hasPermission, hasRole } from '../../../authorization';
+import { Rooms, Subscriptions, LivechatVisitors } from '../../../models';
+import { Livechat } from '../lib/Livechat';
+
+Meteor.methods({
+ 'livechat:transfer'(transferData) {
+ if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-l-room')) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:transfer' });
+ }
+
+ check(transferData, {
+ roomId: String,
+ userId: Match.Optional(String),
+ departmentId: Match.Optional(String),
+ });
+
+ const room = Rooms.findOneById(transferData.roomId);
+ if (!room) {
+ throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'livechat:transfer' });
+ }
+
+ const subscription = Subscriptions.findOneByRoomIdAndUserId(room._id, Meteor.userId(), { fields: { _id: 1 } });
+ if (!subscription && !hasRole(Meteor.userId(), 'livechat-manager')) {
+ throw new Meteor.Error('error-not-authorized', 'Not authorized', { method: 'livechat:transfer' });
+ }
+
+ const guest = LivechatVisitors.findOneById(room.v && room.v._id);
+
+ return Livechat.transfer(room, guest, transferData);
+ },
+});
diff --git a/packages/rocketchat-livechat/server/methods/webhookTest.js b/app/livechat/server/methods/webhookTest.js
similarity index 87%
rename from packages/rocketchat-livechat/server/methods/webhookTest.js
rename to app/livechat/server/methods/webhookTest.js
index eb8221d51fd3..7f88b722c928 100644
--- a/packages/rocketchat-livechat/server/methods/webhookTest.js
+++ b/app/livechat/server/methods/webhookTest.js
@@ -1,5 +1,5 @@
import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from '../../../settings';
import { HTTP } from 'meteor/http';
const postCatchError = Meteor.wrapAsync(function(url, options, resolve) {
@@ -65,12 +65,12 @@ Meteor.methods({
const options = {
headers: {
- 'X-RocketChat-Livechat-Token': RocketChat.settings.get('Livechat_secret_token'),
+ 'X-RocketChat-Livechat-Token': settings.get('Livechat_secret_token'),
},
data: sampleData,
};
- const response = postCatchError(RocketChat.settings.get('Livechat_webhookUrl'), options);
+ const response = postCatchError(settings.get('Livechat_webhookUrl'), options);
console.log('response ->', response);
diff --git a/app/livechat/server/permissions.js b/app/livechat/server/permissions.js
new file mode 100644
index 000000000000..d8e9153549dd
--- /dev/null
+++ b/app/livechat/server/permissions.js
@@ -0,0 +1,26 @@
+import { Meteor } from 'meteor/meteor';
+import { Roles, Permissions } from '../../models';
+import _ from 'underscore';
+
+Meteor.startup(() => {
+ const roles = _.pluck(Roles.find().fetch(), 'name');
+ if (roles.indexOf('livechat-agent') === -1) {
+ Roles.createOrUpdate('livechat-agent');
+ }
+ if (roles.indexOf('livechat-manager') === -1) {
+ Roles.createOrUpdate('livechat-manager');
+ }
+ if (roles.indexOf('livechat-guest') === -1) {
+ Roles.createOrUpdate('livechat-guest');
+ }
+ if (Permissions) {
+ Permissions.createOrUpdate('view-l-room', ['livechat-agent', 'livechat-manager', 'admin']);
+ Permissions.createOrUpdate('view-livechat-manager', ['livechat-manager', 'admin']);
+ Permissions.createOrUpdate('view-livechat-rooms', ['livechat-manager', 'admin']);
+ Permissions.createOrUpdate('close-livechat-room', ['livechat-agent', 'livechat-manager', 'admin']);
+ Permissions.createOrUpdate('close-others-livechat-room', ['livechat-manager', 'admin']);
+ Permissions.createOrUpdate('save-others-livechat-room-info', ['livechat-manager']);
+ Permissions.createOrUpdate('remove-closed-livechat-rooms', ['livechat-manager', 'admin']);
+ Permissions.createOrUpdate('view-livechat-analytics', ['livechat-manager', 'admin']);
+ }
+});
diff --git a/app/livechat/server/publications/customFields.js b/app/livechat/server/publications/customFields.js
new file mode 100644
index 000000000000..95283a4f4f36
--- /dev/null
+++ b/app/livechat/server/publications/customFields.js
@@ -0,0 +1,21 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { LivechatCustomField } from '../../../models';
+import s from 'underscore.string';
+
+Meteor.publish('livechat:customFields', function(_id) {
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:customFields' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-l-room')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:customFields' }));
+ }
+
+ if (s.trim(_id)) {
+ return LivechatCustomField.find({ _id });
+ }
+
+ return LivechatCustomField.find();
+
+});
diff --git a/app/livechat/server/publications/departmentAgents.js b/app/livechat/server/publications/departmentAgents.js
new file mode 100644
index 000000000000..f55b2b214916
--- /dev/null
+++ b/app/livechat/server/publications/departmentAgents.js
@@ -0,0 +1,15 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { LivechatDepartmentAgents } from '../../../models';
+
+Meteor.publish('livechat:departmentAgents', function(departmentId) {
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:departmentAgents' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-livechat-rooms')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:departmentAgents' }));
+ }
+
+ return LivechatDepartmentAgents.find({ departmentId });
+});
diff --git a/app/livechat/server/publications/externalMessages.js b/app/livechat/server/publications/externalMessages.js
new file mode 100644
index 000000000000..106962b81da2
--- /dev/null
+++ b/app/livechat/server/publications/externalMessages.js
@@ -0,0 +1,6 @@
+import { Meteor } from 'meteor/meteor';
+import { LivechatExternalMessage } from '../../lib/LivechatExternalMessage';
+
+Meteor.publish('livechat:externalMessages', function(roomId) {
+ return LivechatExternalMessage.findByRoomId(roomId);
+});
diff --git a/packages/rocketchat-livechat/server/publications/livechatAgents.js b/app/livechat/server/publications/livechatAgents.js
similarity index 75%
rename from packages/rocketchat-livechat/server/publications/livechatAgents.js
rename to app/livechat/server/publications/livechatAgents.js
index c5d333039c1f..874b35af4e18 100644
--- a/packages/rocketchat-livechat/server/publications/livechatAgents.js
+++ b/app/livechat/server/publications/livechatAgents.js
@@ -1,18 +1,18 @@
import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { hasPermission, getUsersInRole } from '../../../authorization';
Meteor.publish('livechat:agents', function() {
if (!this.userId) {
return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:agents' }));
}
- if (!RocketChat.authz.hasPermission(this.userId, 'view-l-room')) {
+ if (!hasPermission(this.userId, 'view-l-room')) {
return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:agents' }));
}
const self = this;
- const handle = RocketChat.authz.getUsersInRole('livechat-agent').observeChanges({
+ const handle = getUsersInRole('livechat-agent').observeChanges({
added(id, fields) {
self.added('agentUsers', id, fields);
},
diff --git a/app/livechat/server/publications/livechatAppearance.js b/app/livechat/server/publications/livechatAppearance.js
new file mode 100644
index 000000000000..1d304d1696b5
--- /dev/null
+++ b/app/livechat/server/publications/livechatAppearance.js
@@ -0,0 +1,55 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Settings } from '../../../models';
+
+Meteor.publish('livechat:appearance', function() {
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:appearance' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:appearance' }));
+ }
+
+ const query = {
+ _id: {
+ $in: [
+ 'Livechat_title',
+ 'Livechat_title_color',
+ 'Livechat_show_agent_email',
+ 'Livechat_display_offline_form',
+ 'Livechat_offline_form_unavailable',
+ 'Livechat_offline_message',
+ 'Livechat_offline_success_message',
+ 'Livechat_offline_title',
+ 'Livechat_offline_title_color',
+ 'Livechat_offline_email',
+ 'Livechat_conversation_finished_message',
+ 'Livechat_registration_form',
+ 'Livechat_name_field_registration_form',
+ 'Livechat_email_field_registration_form',
+ 'Livechat_registration_form_message',
+ ],
+ },
+ };
+
+ const self = this;
+
+ const handle = Settings.find(query).observeChanges({
+ added(id, fields) {
+ self.added('livechatAppearance', id, fields);
+ },
+ changed(id, fields) {
+ self.changed('livechatAppearance', id, fields);
+ },
+ removed(id) {
+ self.removed('livechatAppearance', id);
+ },
+ });
+
+ this.ready();
+
+ this.onStop(() => {
+ handle.stop();
+ });
+});
diff --git a/app/livechat/server/publications/livechatDepartments.js b/app/livechat/server/publications/livechatDepartments.js
new file mode 100644
index 000000000000..c89de01ce749
--- /dev/null
+++ b/app/livechat/server/publications/livechatDepartments.js
@@ -0,0 +1,20 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { LivechatDepartment } from '../../../models';
+
+Meteor.publish('livechat:departments', function(_id) {
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:agents' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-l-room')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:agents' }));
+ }
+
+ if (_id !== undefined) {
+ return LivechatDepartment.findByDepartmentId(_id);
+ } else {
+ return LivechatDepartment.find();
+ }
+
+});
diff --git a/app/livechat/server/publications/livechatInquiries.js b/app/livechat/server/publications/livechatInquiries.js
new file mode 100644
index 000000000000..356e1364f7e6
--- /dev/null
+++ b/app/livechat/server/publications/livechatInquiries.js
@@ -0,0 +1,37 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { LivechatInquiry } from '../../lib/LivechatInquiry';
+
+Meteor.publish('livechat:inquiry', function(_id) {
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:inquiry' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-l-room')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:inquiry' }));
+ }
+
+ const publication = this;
+
+ const cursorHandle = LivechatInquiry.find({
+ agents: this.userId,
+ status: 'open',
+ ...(_id && { _id }),
+ }).observeChanges({
+ added(_id, record) {
+ return publication.added('rocketchat_livechat_inquiry', _id, record);
+ },
+ changed(_id, record) {
+ return publication.changed('rocketchat_livechat_inquiry', _id, record);
+ },
+ removed(_id) {
+ return publication.removed('rocketchat_livechat_inquiry', _id);
+ },
+ });
+
+ this.ready();
+ return this.onStop(function() {
+ return cursorHandle.stop();
+ });
+
+});
diff --git a/app/livechat/server/publications/livechatIntegration.js b/app/livechat/server/publications/livechatIntegration.js
new file mode 100644
index 000000000000..d9d80fd3caf7
--- /dev/null
+++ b/app/livechat/server/publications/livechatIntegration.js
@@ -0,0 +1,33 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Settings } from '../../../models';
+
+Meteor.publish('livechat:integration', function() {
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:integration' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:integration' }));
+ }
+
+ const self = this;
+
+ const handle = Settings.findByIds(['Livechat_webhookUrl', 'Livechat_secret_token', 'Livechat_webhook_on_close', 'Livechat_webhook_on_offline_msg', 'Livechat_webhook_on_visitor_message', 'Livechat_webhook_on_agent_message']).observeChanges({
+ added(id, fields) {
+ self.added('livechatIntegration', id, fields);
+ },
+ changed(id, fields) {
+ self.changed('livechatIntegration', id, fields);
+ },
+ removed(id) {
+ self.removed('livechatIntegration', id);
+ },
+ });
+
+ self.ready();
+
+ self.onStop(function() {
+ handle.stop();
+ });
+});
diff --git a/packages/rocketchat-livechat/server/publications/livechatManagers.js b/app/livechat/server/publications/livechatManagers.js
similarity index 75%
rename from packages/rocketchat-livechat/server/publications/livechatManagers.js
rename to app/livechat/server/publications/livechatManagers.js
index 6f9aa3dec657..eefcf21f1d56 100644
--- a/packages/rocketchat-livechat/server/publications/livechatManagers.js
+++ b/app/livechat/server/publications/livechatManagers.js
@@ -1,18 +1,18 @@
import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { hasPermission, getUsersInRole } from '../../../authorization';
Meteor.publish('livechat:managers', function() {
if (!this.userId) {
return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:managers' }));
}
- if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-rooms')) {
+ if (!hasPermission(this.userId, 'view-livechat-rooms')) {
return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:managers' }));
}
const self = this;
- const handle = RocketChat.authz.getUsersInRole('livechat-manager').observeChanges({
+ const handle = getUsersInRole('livechat-manager').observeChanges({
added(id, fields) {
self.added('managerUsers', id, fields);
},
diff --git a/packages/rocketchat-livechat/server/publications/livechatMonitoring.js b/app/livechat/server/publications/livechatMonitoring.js
similarity index 77%
rename from packages/rocketchat-livechat/server/publications/livechatMonitoring.js
rename to app/livechat/server/publications/livechatMonitoring.js
index 99707fc23324..7257184e4fbd 100644
--- a/packages/rocketchat-livechat/server/publications/livechatMonitoring.js
+++ b/app/livechat/server/publications/livechatMonitoring.js
@@ -1,13 +1,14 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { hasPermission } from '../../../authorization';
+import { Rooms } from '../../../models';
Meteor.publish('livechat:monitoring', function(date) {
if (!this.userId) {
return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:monitoring' }));
}
- if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:monitoring' }));
}
@@ -21,7 +22,7 @@ Meteor.publish('livechat:monitoring', function(date) {
const self = this;
- const handle = RocketChat.models.Rooms.getAnalyticsMetricsBetweenDate('l', date).observeChanges({
+ const handle = Rooms.getAnalyticsMetricsBetweenDate('l', date).observeChanges({
added(id, fields) {
self.added('livechatMonitoring', id, fields);
},
diff --git a/app/livechat/server/publications/livechatOfficeHours.js b/app/livechat/server/publications/livechatOfficeHours.js
new file mode 100644
index 000000000000..6962b7898d4e
--- /dev/null
+++ b/app/livechat/server/publications/livechatOfficeHours.js
@@ -0,0 +1,11 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { LivechatOfficeHour } from '../../../models';
+
+Meteor.publish('livechat:officeHour', function() {
+ if (!hasPermission(this.userId, 'view-l-room')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:agents' }));
+ }
+
+ return LivechatOfficeHour.find();
+});
diff --git a/app/livechat/server/publications/livechatQueue.js b/app/livechat/server/publications/livechatQueue.js
new file mode 100644
index 000000000000..2940473890cc
--- /dev/null
+++ b/app/livechat/server/publications/livechatQueue.js
@@ -0,0 +1,51 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { LivechatDepartmentAgents } from '../../../models';
+
+Meteor.publish('livechat:queue', function() {
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:queue' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-l-room')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:queue' }));
+ }
+
+ // let sort = { count: 1, sort: 1, username: 1 };
+ // let onlineUsers = {};
+
+ // let handleUsers = RocketChat.models.Users.findOnlineAgents().observeChanges({
+ // added(id, fields) {
+ // onlineUsers[fields.username] = 1;
+ // // this.added('livechatQueueUser', id, fields);
+ // },
+ // changed(id, fields) {
+ // onlineUsers[fields.username] = 1;
+ // // this.changed('livechatQueueUser', id, fields);
+ // },
+ // removed(id) {
+ // this.removed('livechatQueueUser', id);
+ // }
+ // });
+
+ const self = this;
+
+ const handleDepts = LivechatDepartmentAgents.findUsersInQueue().observeChanges({
+ added(id, fields) {
+ self.added('livechatQueueUser', id, fields);
+ },
+ changed(id, fields) {
+ self.changed('livechatQueueUser', id, fields);
+ },
+ removed(id) {
+ self.removed('livechatQueueUser', id);
+ },
+ });
+
+ this.ready();
+
+ this.onStop(() => {
+ // handleUsers.stop();
+ handleDepts.stop();
+ });
+});
diff --git a/packages/rocketchat-livechat/server/publications/livechatRooms.js b/app/livechat/server/publications/livechatRooms.js
similarity index 86%
rename from packages/rocketchat-livechat/server/publications/livechatRooms.js
rename to app/livechat/server/publications/livechatRooms.js
index 0a5cb4f5354a..37eaebf30f3f 100644
--- a/packages/rocketchat-livechat/server/publications/livechatRooms.js
+++ b/app/livechat/server/publications/livechatRooms.js
@@ -1,13 +1,14 @@
import { Meteor } from 'meteor/meteor';
import { Match, check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { hasPermission } from '../../../authorization';
+import { Rooms } from '../../../models';
Meteor.publish('livechat:rooms', function(filter = {}, offset = 0, limit = 20) {
if (!this.userId) {
return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:rooms' }));
}
- if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-rooms')) {
+ if (!hasPermission(this.userId, 'view-livechat-rooms')) {
return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:rooms' }));
}
@@ -50,7 +51,7 @@ Meteor.publish('livechat:rooms', function(filter = {}, offset = 0, limit = 20) {
const self = this;
- const handle = RocketChat.models.Rooms.findLivechat(query, offset, limit).observeChanges({
+ const handle = Rooms.findLivechat(query, offset, limit).observeChanges({
added(id, fields) {
self.added('livechatRoom', id, fields);
},
diff --git a/app/livechat/server/publications/livechatTriggers.js b/app/livechat/server/publications/livechatTriggers.js
new file mode 100644
index 000000000000..185dd444d2c2
--- /dev/null
+++ b/app/livechat/server/publications/livechatTriggers.js
@@ -0,0 +1,19 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { LivechatTrigger } from '../../../models';
+
+Meteor.publish('livechat:triggers', function(_id) {
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:triggers' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:triggers' }));
+ }
+
+ if (_id !== undefined) {
+ return LivechatTrigger.findById(_id);
+ } else {
+ return LivechatTrigger.find();
+ }
+});
diff --git a/packages/rocketchat-livechat/server/publications/livechatVisitors.js b/app/livechat/server/publications/livechatVisitors.js
similarity index 82%
rename from packages/rocketchat-livechat/server/publications/livechatVisitors.js
rename to app/livechat/server/publications/livechatVisitors.js
index b71b4888d55b..5521d96a32f2 100644
--- a/packages/rocketchat-livechat/server/publications/livechatVisitors.js
+++ b/app/livechat/server/publications/livechatVisitors.js
@@ -1,14 +1,14 @@
import { Meteor } from 'meteor/meteor';
import { check } from 'meteor/check';
-import { RocketChat } from 'meteor/rocketchat:lib';
-import LivechatVisitors from '../models/LivechatVisitors';
+import { hasPermission } from '../../../authorization';
+import { LivechatVisitors } from '../../../models';
Meteor.publish('livechat:visitors', function(date) {
if (!this.userId) {
return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitors' }));
}
- if (!RocketChat.authz.hasPermission(this.userId, 'view-livechat-manager')) {
+ if (!hasPermission(this.userId, 'view-livechat-manager')) {
return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitors' }));
}
diff --git a/app/livechat/server/publications/visitorHistory.js b/app/livechat/server/publications/visitorHistory.js
new file mode 100644
index 000000000000..2309a1697929
--- /dev/null
+++ b/app/livechat/server/publications/visitorHistory.js
@@ -0,0 +1,44 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Rooms, Subscriptions } from '../../../models';
+
+Meteor.publish('livechat:visitorHistory', function({ rid: roomId }) {
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitorHistory' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-l-room')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitorHistory' }));
+ }
+
+ const room = Rooms.findOneById(roomId);
+
+ const subscription = Subscriptions.findOneByRoomIdAndUserId(room._id, this.userId, { fields: { _id: 1 } });
+ if (!subscription) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitorHistory' }));
+ }
+
+ const self = this;
+
+ if (room && room.v && room.v._id) {
+ const handle = Rooms.findByVisitorId(room.v._id).observeChanges({
+ added(id, fields) {
+ self.added('visitor_history', id, fields);
+ },
+ changed(id, fields) {
+ self.changed('visitor_history', id, fields);
+ },
+ removed(id) {
+ self.removed('visitor_history', id);
+ },
+ });
+
+ self.ready();
+
+ self.onStop(function() {
+ handle.stop();
+ });
+ } else {
+ self.ready();
+ }
+});
diff --git a/app/livechat/server/publications/visitorInfo.js b/app/livechat/server/publications/visitorInfo.js
new file mode 100644
index 000000000000..054eb358d476
--- /dev/null
+++ b/app/livechat/server/publications/visitorInfo.js
@@ -0,0 +1,21 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Rooms, LivechatVisitors } from '../../../models';
+
+Meteor.publish('livechat:visitorInfo', function({ rid: roomId }) {
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitorInfo' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-l-room')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitorInfo' }));
+ }
+
+ const room = Rooms.findOneById(roomId);
+
+ if (room && room.v && room.v._id) {
+ return LivechatVisitors.findById(room.v._id);
+ } else {
+ return this.ready();
+ }
+});
diff --git a/app/livechat/server/publications/visitorPageVisited.js b/app/livechat/server/publications/visitorPageVisited.js
new file mode 100644
index 000000000000..ae875b6f8f3f
--- /dev/null
+++ b/app/livechat/server/publications/visitorPageVisited.js
@@ -0,0 +1,39 @@
+import { Meteor } from 'meteor/meteor';
+import { hasPermission } from '../../../authorization';
+import { Rooms, Messages } from '../../../models';
+
+Meteor.publish('livechat:visitorPageVisited', function({ rid: roomId }) {
+
+ if (!this.userId) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitorPageVisited' }));
+ }
+
+ if (!hasPermission(this.userId, 'view-l-room')) {
+ return this.error(new Meteor.Error('error-not-authorized', 'Not authorized', { publish: 'livechat:visitorPageVisited' }));
+ }
+
+ const self = this;
+ const room = Rooms.findOneById(roomId);
+
+ if (room) {
+ const handle = Messages.findByRoomIdAndType(room._id, 'livechat_navigation_history').observeChanges({
+ added(id, fields) {
+ self.added('visitor_navigation_history', id, fields);
+ },
+ changed(id, fields) {
+ self.changed('visitor_navigation_history', id, fields);
+ },
+ removed(id) {
+ self.removed('visitor_navigation_history', id);
+ },
+ });
+
+ self.ready();
+
+ self.onStop(function() {
+ handle.stop();
+ });
+ } else {
+ self.ready();
+ }
+});
diff --git a/app/livechat/server/roomType.js b/app/livechat/server/roomType.js
new file mode 100644
index 000000000000..3bbe342fb349
--- /dev/null
+++ b/app/livechat/server/roomType.js
@@ -0,0 +1,36 @@
+import { Rooms, LivechatVisitors } from '../../models';
+import { roomTypes } from '../../utils';
+import LivechatRoomType from '../lib/LivechatRoomType';
+
+
+class LivechatRoomTypeServer extends LivechatRoomType {
+ getMsgSender(senderId) {
+ return LivechatVisitors.findOneById(senderId);
+ }
+
+ /**
+ * Returns details to use on notifications
+ *
+ * @param {object} room
+ * @param {object} user
+ * @param {string} notificationMessage
+ * @return {object} Notification details
+ */
+ getNotificationDetails(room, user, notificationMessage) {
+ const title = `[livechat] ${ this.roomName(room) }`;
+ const text = notificationMessage;
+
+ return { title, text };
+ }
+
+ canAccessUploadedFile({ rc_token, rc_rid } = {}) {
+ return rc_token && rc_rid && Rooms.findOneOpenByRoomIdAndVisitorToken(rc_rid, rc_token);
+ }
+
+ getReadReceiptsExtraData(message) {
+ const { token } = message;
+ return { token };
+ }
+}
+
+roomTypes.add(new LivechatRoomTypeServer());
diff --git a/app/livechat/server/sendMessageBySMS.js b/app/livechat/server/sendMessageBySMS.js
new file mode 100644
index 000000000000..551c2263cdef
--- /dev/null
+++ b/app/livechat/server/sendMessageBySMS.js
@@ -0,0 +1,47 @@
+import { callbacks } from '../../callbacks';
+import { settings } from '../../settings';
+import { SMS } from '../../sms';
+import { LivechatVisitors } from '../../models';
+
+callbacks.add('afterSaveMessage', function(message, room) {
+ // skips this callback if the message was edited
+ if (message.editedAt) {
+ return message;
+ }
+
+ if (!SMS.enabled) {
+ return message;
+ }
+
+ // only send the sms by SMS if it is a livechat room with SMS set to true
+ if (!(typeof room.t !== 'undefined' && room.t === 'l' && room.sms && room.v && room.v.token)) {
+ return message;
+ }
+
+ // if the message has a token, it was sent from the visitor, so ignore it
+ if (message.token) {
+ return message;
+ }
+
+ // if the message has a type means it is a special message (like the closing comment), so skips
+ if (message.t) {
+ return message;
+ }
+
+ const SMSService = SMS.getService(settings.get('SMS_Service'));
+
+ if (!SMSService) {
+ return message;
+ }
+
+ const visitor = LivechatVisitors.getVisitorByToken(room.v.token);
+
+ if (!visitor || !visitor.phone || visitor.phone.length === 0) {
+ return message;
+ }
+
+ SMSService.send(room.sms.from, visitor.phone[0].phoneNumber, message.msg);
+
+ return message;
+
+}, callbacks.priority.LOW, 'sendMessageBySms');
diff --git a/app/livechat/server/startup.js b/app/livechat/server/startup.js
new file mode 100644
index 000000000000..0c6bd346b87c
--- /dev/null
+++ b/app/livechat/server/startup.js
@@ -0,0 +1,45 @@
+import { Meteor } from 'meteor/meteor';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { roomTypes } from '../../utils';
+import { Rooms } from '../../models';
+import { hasPermission, addRoomAccessValidator } from '../../authorization';
+import { callbacks } from '../../callbacks';
+import { settings } from '../../settings';
+import { LivechatInquiry } from '../lib/LivechatInquiry';
+
+Meteor.startup(() => {
+ roomTypes.setRoomFind('l', (_id) => Rooms.findOneLivechatById(_id));
+
+ addRoomAccessValidator(function(room, user) {
+ return room && room.t === 'l' && user && hasPermission(user._id, 'view-livechat-rooms');
+ });
+
+ addRoomAccessValidator(function(room, user, extraData) {
+ if (!room && extraData && extraData.rid) {
+ room = Rooms.findOneById(extraData.rid);
+ }
+ return room && room.t === 'l' && extraData && extraData.visitorToken && room.v && room.v.token === extraData.visitorToken;
+ });
+
+ addRoomAccessValidator(function(room, user) {
+ if (settings.get('Livechat_Routing_Method') !== 'Guest_Pool') {
+ return;
+ }
+
+ if (!user || !room || room.t !== 'l') {
+ return;
+ }
+
+ const inquiry = LivechatInquiry.findOne({ agents: user._id, rid: room._id }, { fields: { status: 1 } });
+ return inquiry && inquiry.status === 'open';
+ });
+
+ callbacks.add('beforeLeaveRoom', function(user, room) {
+ if (room.t !== 'l') {
+ return user;
+ }
+ throw new Meteor.Error(TAPi18n.__('You_cant_leave_a_livechat_room_Please_use_the_close_button', {
+ lng: user.language || settings.get('Language') || 'en',
+ }));
+ }, callbacks.priority.LOW, 'cant-leave-room');
+});
diff --git a/packages/rocketchat-livechat/server/unclosedLivechats.js b/app/livechat/server/unclosedLivechats.js
similarity index 76%
rename from packages/rocketchat-livechat/server/unclosedLivechats.js
rename to app/livechat/server/unclosedLivechats.js
index 76d73427a61d..5c06a018f3e1 100644
--- a/packages/rocketchat-livechat/server/unclosedLivechats.js
+++ b/app/livechat/server/unclosedLivechats.js
@@ -1,6 +1,8 @@
import { Meteor } from 'meteor/meteor';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from '../../settings';
+import { Users } from '../../models';
import { UserPresenceMonitor } from 'meteor/konecty:user-presence';
+import { Livechat } from './lib/Livechat';
let agentsHandler;
let monitorAgents = false;
@@ -36,23 +38,23 @@ const onlineAgents = {
};
function runAgentLeaveAction(userId) {
- const action = RocketChat.settings.get('Livechat_agent_leave_action');
+ const action = settings.get('Livechat_agent_leave_action');
if (action === 'close') {
- return RocketChat.Livechat.closeOpenChats(userId, RocketChat.settings.get('Livechat_agent_leave_comment'));
+ return Livechat.closeOpenChats(userId, settings.get('Livechat_agent_leave_comment'));
} else if (action === 'forward') {
- return RocketChat.Livechat.forwardOpenChats(userId);
+ return Livechat.forwardOpenChats(userId);
}
}
-RocketChat.settings.get('Livechat_agent_leave_action_timeout', function(key, value) {
+settings.get('Livechat_agent_leave_action_timeout', function(key, value) {
actionTimeout = value * 1000;
});
-RocketChat.settings.get('Livechat_agent_leave_action', function(key, value) {
+settings.get('Livechat_agent_leave_action', function(key, value) {
monitorAgents = value;
if (value !== 'none') {
if (!agentsHandler) {
- agentsHandler = RocketChat.models.Users.findOnlineAgents().observeChanges({
+ agentsHandler = Users.findOnlineAgents().observeChanges({
added(id) {
onlineAgents.add(id);
},
diff --git a/app/livechat/server/visitorStatus.js b/app/livechat/server/visitorStatus.js
new file mode 100644
index 000000000000..18775e7da01b
--- /dev/null
+++ b/app/livechat/server/visitorStatus.js
@@ -0,0 +1,11 @@
+import { Meteor } from 'meteor/meteor';
+import { UserPresenceEvents } from 'meteor/konecty:user-presence';
+import { Livechat } from './lib/Livechat';
+
+Meteor.startup(() => {
+ UserPresenceEvents.on('setStatus', (session, status, metadata) => {
+ if (metadata && metadata.visitor) {
+ Livechat.notifyGuestStatusChanged(metadata.visitor, status);
+ }
+ });
+});
diff --git a/packages/rocketchat-livestream/.gitignore b/app/livestream/.gitignore
similarity index 100%
rename from packages/rocketchat-livestream/.gitignore
rename to app/livestream/.gitignore
diff --git a/packages/rocketchat-livestream/client/index.js b/app/livestream/client/index.js
similarity index 100%
rename from packages/rocketchat-livestream/client/index.js
rename to app/livestream/client/index.js
diff --git a/app/livestream/client/oauth.js b/app/livestream/client/oauth.js
new file mode 100644
index 000000000000..fa3ea4713e60
--- /dev/null
+++ b/app/livestream/client/oauth.js
@@ -0,0 +1,16 @@
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../settings';
+
+export const close = (popup) => new Promise(function(resolve) {
+ const checkInterval = setInterval(() => {
+ if (popup.closed) {
+ clearInterval(checkInterval);
+ resolve();
+ }
+ }, 300);
+});
+
+export const auth = async () => {
+ const oauthWindow = window.open(`${ settings.get('Site_Url') }/api/v1/livestream/oauth?userId=${ Meteor.userId() }`, 'youtube-integration-oauth', 'width=400,height=600');
+ return await close(oauthWindow);
+};
diff --git a/packages/rocketchat-livestream/client/styles/liveStreamTab.css b/app/livestream/client/styles/liveStreamTab.css
similarity index 100%
rename from packages/rocketchat-livestream/client/styles/liveStreamTab.css
rename to app/livestream/client/styles/liveStreamTab.css
diff --git a/app/livestream/client/tabBar.js b/app/livestream/client/tabBar.js
new file mode 100644
index 000000000000..640a7ecde7b3
--- /dev/null
+++ b/app/livestream/client/tabBar.js
@@ -0,0 +1,25 @@
+import { Meteor } from 'meteor/meteor';
+import { Tracker } from 'meteor/tracker';
+import { Session } from 'meteor/session';
+import { TabBar } from '../../ui-utils';
+import { Rooms } from '../../models';
+import { settings } from '../../settings';
+
+Meteor.startup(function() {
+ Tracker.autorun(function() {
+ TabBar.removeButton('livestream');
+ if (settings.get('Livestream_enabled')) {
+ const live = Rooms.findOne({ _id: Session.get('openedRoom'), 'streamingOptions.type': 'livestream', 'streamingOptions.id': { $exists :1 } }, { fields: { streamingOptions: 1 } });
+ TabBar.size = live ? 5 : 4;
+ return TabBar.addButton({
+ groups: ['channel', 'group'],
+ id: 'livestream',
+ i18nTitle: 'Livestream',
+ icon: 'podcast',
+ template: 'liveStreamTab',
+ order: live ? -1 : 15,
+ class: () => live && 'live',
+ });
+ }
+ });
+});
diff --git a/packages/rocketchat-livestream/client/views/broadcastView.html b/app/livestream/client/views/broadcastView.html
similarity index 100%
rename from packages/rocketchat-livestream/client/views/broadcastView.html
rename to app/livestream/client/views/broadcastView.html
diff --git a/packages/rocketchat-livestream/client/views/broadcastView.js b/app/livestream/client/views/broadcastView.js
similarity index 92%
rename from packages/rocketchat-livestream/client/views/broadcastView.js
rename to app/livestream/client/views/broadcastView.js
index e2feea2e05f8..4033c56856f7 100644
--- a/packages/rocketchat-livestream/client/views/broadcastView.js
+++ b/app/livestream/client/views/broadcastView.js
@@ -2,7 +2,8 @@ import { Meteor } from 'meteor/meteor';
import { ReactiveVar } from 'meteor/reactive-var';
import { Session } from 'meteor/session';
import { Template } from 'meteor/templating';
-import { RocketChat, handleError } from 'meteor/rocketchat:lib';
+import { handleError } from '../../../utils';
+import { settings } from '../../../settings';
const getMedia = () => navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia || navigator.msGetUserMedia;
const createAndConnect = (url) => {
@@ -31,8 +32,8 @@ export const call = (...args) => new Promise(function(resolve, reject) {
const delay = (time) => new Promise((resolve) => setTimeout(resolve, time));
-const waitForStreamStatus = async(id, status) => {
- const streamActive = new Promise(async(resolve) => {
+const waitForStreamStatus = async (id, status) => {
+ const streamActive = new Promise(async (resolve) => {
while (true) { // eslint-disable-line no-constant-condition
const currentStatus = await call('livestreamStreamStatus', { streamId: id });
if (currentStatus === status) {
@@ -43,8 +44,8 @@ const waitForStreamStatus = async(id, status) => {
});
await streamActive;
};
-const waitForBroadcastStatus = async(id, status) => {
- const broadcastActive = new Promise(async(resolve) => {
+const waitForBroadcastStatus = async (id, status) => {
+ const broadcastActive = new Promise(async (resolve) => {
while (true) { // eslint-disable-line no-constant-condition
const currentStatus = await call('getBroadcastStatus', { broadcastId: id });
if (currentStatus === status) {
@@ -66,7 +67,7 @@ Template.broadcastView.helpers({
});
Template.broadcastView.onCreated(async function() {
- const connection = createAndConnect(`${ RocketChat.settings.get('Broadcasting_media_server_url') }/${ this.data.id }`);
+ const connection = createAndConnect(`${ settings.get('Broadcasting_media_server_url') }/${ this.data.id }`);
this.mediaStream = new ReactiveVar(null);
this.mediaRecorder = new ReactiveVar(null);
this.connection = new ReactiveVar(connection);
diff --git a/packages/rocketchat-livestream/client/views/liveStreamTab.html b/app/livestream/client/views/liveStreamTab.html
similarity index 100%
rename from packages/rocketchat-livestream/client/views/liveStreamTab.html
rename to app/livestream/client/views/liveStreamTab.html
diff --git a/packages/rocketchat-livestream/client/views/liveStreamTab.js b/app/livestream/client/views/liveStreamTab.js
similarity index 92%
rename from packages/rocketchat-livestream/client/views/liveStreamTab.js
rename to app/livestream/client/views/liveStreamTab.js
index 647d80c877b8..0bb608f54cf6 100644
--- a/packages/rocketchat-livestream/client/views/liveStreamTab.js
+++ b/app/livestream/client/views/liveStreamTab.js
@@ -6,9 +6,13 @@ import { Template } from 'meteor/templating';
import { TAPi18n } from 'meteor/tap:i18n';
import toastr from 'toastr';
import { auth } from '../oauth.js';
-import { RocketChatAnnouncement, RocketChat, handleError } from 'meteor/rocketchat:lib';
-import { popout } from 'meteor/rocketchat:ui';
-import { t } from 'meteor/rocketchat:utils';
+import { RocketChatAnnouncement } from '../../../lib';
+import { popout } from '../../../ui-utils';
+import { t, handleError } from '../../../utils';
+import { settings } from '../../../settings';
+import { callbacks } from '../../../callbacks';
+import { hasAllPermission } from '../../../authorization';
+import { Users, Rooms } from '../../../models';
export const call = (...args) => new Promise(function(resolve, reject) {
Meteor.call(...args, function(err, result) {
@@ -46,7 +50,7 @@ function optionsFromUrl(url) {
Template.liveStreamTab.helpers({
broadcastEnabled() {
- return !!RocketChat.settings.get('Broadcasting_enabled');
+ return !!settings.get('Broadcasting_enabled');
},
streamingSource() {
return Template.instance().streamingOptions.get() ? Template.instance().streamingOptions.get().url : '';
@@ -64,7 +68,7 @@ Template.liveStreamTab.helpers({
return !!Template.instance().streamingOptions.get() && !!Template.instance().streamingOptions.get().url && Template.instance().streamingOptions.get().url !== '';
},
canEdit() {
- return RocketChat.authz.hasAllPermission('edit-room', this.rid);
+ return hasAllPermission('edit-room', this.rid);
},
editing() {
return Template.instance().editing.get() || Template.instance().streamingOptions.get() == null || (Template.instance().streamingOptions.get() != null && (Template.instance().streamingOptions.get().url == null || Template.instance().streamingOptions.get().url === ''));
@@ -100,7 +104,7 @@ Template.liveStreamTab.onCreated(function() {
this.popoutOpen = new ReactiveVar(popout.context != null);
this.autorun(() => {
- const room = RocketChat.models.Rooms.findOne(this.data.rid, { fields: { streamingOptions : 1 } });
+ const room = Rooms.findOne(this.data.rid, { fields: { streamingOptions : 1 } });
this.streamingOptions.set(room.streamingOptions);
});
});
@@ -121,8 +125,6 @@ Template.liveStreamTab.events({
e.preventDefault();
const clearedObject = {
- message: i.streamingOptions.get().message || '',
- isAudioOnly: i.streamingOptions.get().isAudioOnly || false,
};
Meteor.call('saveRoomSettings', this.rid, 'streamingOptions', clearedObject, function(err) {
@@ -246,7 +248,7 @@ Template.liveStreamTab.events({
e.preventDefault();
e.currentTarget.classList.add('loading');
try {
- const user = RocketChat.models.Users.findOne({ _id: Meteor.userId() }, { fields: { 'settings.livestream': 1 } });
+ const user = Users.findOne({ _id: Meteor.userId() }, { fields: { 'settings.livestream': 1 } });
if (!user.settings || !user.settings.livestream) {
await auth();
}
@@ -269,7 +271,7 @@ Template.liveStreamTab.events({
},
});
-RocketChat.callbacks.add('openBroadcast', (rid) => {
+callbacks.add('openBroadcast', (rid) => {
const roomData = Session.get(`roomData${ rid }`);
if (!roomData) { return; }
popout.open({
diff --git a/packages/rocketchat-livestream/client/views/liveStreamView.html b/app/livestream/client/views/liveStreamView.html
similarity index 100%
rename from packages/rocketchat-livestream/client/views/liveStreamView.html
rename to app/livestream/client/views/liveStreamView.html
diff --git a/packages/rocketchat-livestream/client/views/liveStreamView.js b/app/livestream/client/views/liveStreamView.js
similarity index 100%
rename from packages/rocketchat-livestream/client/views/liveStreamView.js
rename to app/livestream/client/views/liveStreamView.js
diff --git a/packages/rocketchat-livestream/client/views/livestreamBroadcast.html b/app/livestream/client/views/livestreamBroadcast.html
similarity index 100%
rename from packages/rocketchat-livestream/client/views/livestreamBroadcast.html
rename to app/livestream/client/views/livestreamBroadcast.html
diff --git a/packages/rocketchat-livestream/client/views/livestreamBroadcast.js b/app/livestream/client/views/livestreamBroadcast.js
similarity index 100%
rename from packages/rocketchat-livestream/client/views/livestreamBroadcast.js
rename to app/livestream/client/views/livestreamBroadcast.js
diff --git a/packages/rocketchat-livestream/server/functions/livestream.js b/app/livestream/server/functions/livestream.js
similarity index 95%
rename from packages/rocketchat-livestream/server/functions/livestream.js
rename to app/livestream/server/functions/livestream.js
index 2b91962bf99b..a5e6f8ab5f7e 100644
--- a/packages/rocketchat-livestream/server/functions/livestream.js
+++ b/app/livestream/server/functions/livestream.js
@@ -11,7 +11,7 @@ const p = (fn) => new Promise(function(resolve, reject) {
});
});
-export const getBroadcastStatus = async({
+export const getBroadcastStatus = async ({
id,
access_token,
refresh_token,
@@ -32,7 +32,7 @@ export const getBroadcastStatus = async({
return result.items && result.items[0] && result.items[0].status.lifeCycleStatus;
};
-export const statusStreamLiveStream = async({
+export const statusStreamLiveStream = async ({
id,
access_token,
refresh_token,
@@ -102,7 +102,7 @@ export const setBroadcastStatus = ({
}, resolve));
};
-export const createLiveStream = async({
+export const createLiveStream = async ({
room,
access_token,
refresh_token,
diff --git a/app/livestream/server/index.js b/app/livestream/server/index.js
new file mode 100644
index 000000000000..9254662a155a
--- /dev/null
+++ b/app/livestream/server/index.js
@@ -0,0 +1,3 @@
+import './routes.js';
+import './methods.js';
+import './settings';
diff --git a/app/livestream/server/methods.js b/app/livestream/server/methods.js
new file mode 100644
index 000000000000..ae8e6e62b25a
--- /dev/null
+++ b/app/livestream/server/methods.js
@@ -0,0 +1,143 @@
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../settings';
+import { Rooms } from '../../models';
+import { createLiveStream, statusLiveStream, statusStreamLiveStream, getBroadcastStatus, setBroadcastStatus } from './functions/livestream';
+
+const selectLivestreamSettings = (user) => user && user.settings && user.settings.livestream;
+
+Meteor.methods({
+
+ async livestreamStreamStatus({ streamId }) {
+ if (!streamId) {
+ // TODO: change error
+ throw new Meteor.Error('error-not-allowed', 'Livestream ID not found', {
+ method: 'livestreamStreamStatus',
+ });
+ }
+ const livestreamSettings = selectLivestreamSettings(Meteor.user());
+
+ if (!livestreamSettings) {
+ throw new Meteor.Error('error-not-allowed', 'You have no settings to stream', {
+ method: 'livestreamStreamStatus',
+ });
+ }
+
+ const { access_token, refresh_token } = livestreamSettings;
+
+ return await statusStreamLiveStream({
+ id: streamId,
+ access_token,
+ refresh_token,
+ clientId: settings.get('Broadcasting_client_id'),
+ clientSecret: settings.get('Broadcasting_client_secret'),
+ });
+
+ },
+ async setLivestreamStatus({ broadcastId, status }) {
+ if (!broadcastId) {
+ // TODO: change error
+ throw new Meteor.Error('error-not-allowed', 'You have no settings to livestream', {
+ method: 'livestreamStart',
+ });
+ }
+ const livestreamSettings = selectLivestreamSettings(Meteor.user());
+
+ if (!livestreamSettings) {
+ throw new Meteor.Error('error-not-allowed', 'You have no settings to livestream', {
+ method: 'livestreamStart',
+ });
+ }
+
+ const { access_token, refresh_token } = livestreamSettings;
+
+ return await statusLiveStream({
+ id: broadcastId,
+ access_token,
+ refresh_token,
+ status,
+ clientId: settings.get('Broadcasting_client_id'),
+ clientSecret: settings.get('Broadcasting_client_secret'),
+ });
+
+ },
+ async livestreamGet({ rid }) {
+ const livestreamSettings = selectLivestreamSettings(Meteor.user());
+
+ if (!livestreamSettings) {
+ throw new Meteor.Error('error-not-allowed', 'You have no settings to livestream', {
+ method: 'livestreamGet',
+ });
+ }
+
+ const room = Rooms.findOne({ _id: rid });
+
+ if (!room) {
+ // TODO: change error
+ throw new Meteor.Error('error-not-allowed', 'You have no settings to livestream', {
+ method: 'livestreamGet',
+ });
+ }
+
+ const { access_token, refresh_token } = livestreamSettings;
+ return await createLiveStream({
+ room,
+ access_token,
+ refresh_token,
+ clientId: settings.get('Broadcasting_client_id'),
+ clientSecret: settings.get('Broadcasting_client_secret'),
+ });
+
+ },
+ async getBroadcastStatus({ broadcastId }) {
+ if (!broadcastId) {
+ // TODO: change error
+ throw new Meteor.Error('error-not-allowed', 'Broadcast ID not found', {
+ method: 'getBroadcastStatus',
+ });
+ }
+ const livestreamSettings = selectLivestreamSettings(Meteor.user());
+
+ if (!livestreamSettings) {
+ throw new Meteor.Error('error-not-allowed', 'You have no settings to stream', {
+ method: 'getBroadcastStatus',
+ });
+ }
+
+ const { access_token, refresh_token } = livestreamSettings;
+
+ return await getBroadcastStatus({
+ id: broadcastId,
+ access_token,
+ refresh_token,
+ clientId: settings.get('Broadcasting_client_id'),
+ clientSecret: settings.get('Broadcasting_client_secret'),
+ });
+ },
+ async setBroadcastStatus({ broadcastId, status }) {
+ if (!broadcastId) {
+ // TODO: change error
+ throw new Meteor.Error('error-not-allowed', 'Broadcast ID not found', {
+ method: 'setBroadcastStatus',
+ });
+ }
+ const livestreamSettings = selectLivestreamSettings(Meteor.user());
+
+ if (!livestreamSettings) {
+ throw new Meteor.Error('error-not-allowed', 'You have no settings to stream', {
+ method: 'setBroadcastStatus',
+ });
+ }
+
+ const { access_token, refresh_token } = livestreamSettings;
+
+ return await setBroadcastStatus({
+ id: broadcastId,
+ access_token,
+ refresh_token,
+ status,
+ clientId: settings.get('Broadcasting_client_id'),
+ clientSecret: settings.get('Broadcasting_client_secret'),
+ });
+
+ },
+});
diff --git a/app/livestream/server/routes.js b/app/livestream/server/routes.js
new file mode 100644
index 000000000000..cc860cd019f8
--- /dev/null
+++ b/app/livestream/server/routes.js
@@ -0,0 +1,49 @@
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../settings';
+import { Users } from '../../models';
+import { API } from '../../api';
+import google from 'googleapis';
+const { OAuth2 } = google.auth;
+
+API.v1.addRoute('livestream/oauth', {
+ get: function functionName() {
+ const clientAuth = new OAuth2(settings.get('Broadcasting_client_id'), settings.get('Broadcasting_client_secret'), `${ settings.get('Site_Url') }/api/v1/livestream/oauth/callback`.replace(/\/{2}api/g, '/api'));
+ const { userId } = this.queryParams;
+ const url = clientAuth.generateAuthUrl({
+ access_type: 'offline',
+ scope: ['https://www.googleapis.com/auth/youtube'],
+ state: JSON.stringify({
+ userId,
+ }),
+ });
+
+ return {
+ statusCode: 302,
+ headers: {
+ Location: url,
+ }, body: 'Oauth redirect',
+ };
+ },
+});
+
+API.v1.addRoute('livestream/oauth/callback', {
+ get: function functionName() {
+ const { code, state } = this.queryParams;
+
+ const { userId } = JSON.parse(state);
+
+ const clientAuth = new OAuth2(settings.get('Broadcasting_client_id'), settings.get('Broadcasting_client_secret'), `${ settings.get('Site_Url') }/api/v1/livestream/oauth/callback`.replace(/\/{2}api/g, '/api'));
+
+ const ret = Meteor.wrapAsync(clientAuth.getToken.bind(clientAuth))(code);
+
+ Users.update({ _id: userId }, { $set: {
+ 'settings.livestream' : ret,
+ } });
+
+ return {
+ headers: {
+ 'content-type' : 'text/html',
+ }, body: '',
+ };
+ },
+});
diff --git a/app/livestream/server/settings.js b/app/livestream/server/settings.js
new file mode 100644
index 000000000000..149cd4180852
--- /dev/null
+++ b/app/livestream/server/settings.js
@@ -0,0 +1,25 @@
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../settings';
+
+Meteor.startup(function() {
+ settings.addGroup('LiveStream & Broadcasting', function() {
+
+ this.add('Livestream_enabled', false, {
+ type: 'boolean',
+ public: true,
+ alert: 'This feature is currently in beta! Please report bugs to github.com/RocketChat/Rocket.Chat/issues',
+ });
+
+ this.add('Broadcasting_enabled', false, {
+ type: 'boolean',
+ public: true,
+ alert: 'This feature is currently in beta! Please report bugs to github.com/RocketChat/Rocket.Chat/issues',
+ enableQuery: { _id: 'Livestream_enabled', value: true },
+ });
+
+ this.add('Broadcasting_client_id', '', { type: 'string', public: false, enableQuery: { _id: 'Broadcasting_enabled', value: true } });
+ this.add('Broadcasting_client_secret', '', { type: 'string', public: false, enableQuery: { _id: 'Broadcasting_enabled', value: true } });
+ this.add('Broadcasting_api_key', '', { type: 'string', public: false, enableQuery: { _id: 'Broadcasting_enabled', value: true } });
+ this.add('Broadcasting_media_server_url', '', { type: 'string', public: true, enableQuery: { _id: 'Broadcasting_enabled', value: true } });
+ });
+});
diff --git a/packages/rocketchat-logger/README.md b/app/logger/README.md
similarity index 100%
rename from packages/rocketchat-logger/README.md
rename to app/logger/README.md
diff --git a/packages/rocketchat-logger/client/ansispan.js b/app/logger/client/ansispan.js
similarity index 100%
rename from packages/rocketchat-logger/client/ansispan.js
rename to app/logger/client/ansispan.js
diff --git a/packages/rocketchat-logger/client/index.js b/app/logger/client/index.js
similarity index 100%
rename from packages/rocketchat-logger/client/index.js
rename to app/logger/client/index.js
diff --git a/app/logger/client/logger.js b/app/logger/client/logger.js
new file mode 100644
index 000000000000..92556c3dc874
--- /dev/null
+++ b/app/logger/client/logger.js
@@ -0,0 +1,88 @@
+import { Template } from 'meteor/templating';
+import _ from 'underscore';
+
+import { getConfig } from '../../ui-utils/client/config';
+
+Template.log = !!(getConfig('debug') || getConfig('debug-template'));
+
+if (Template.log) {
+
+ Template.logMatch = /.*/;
+
+ Template.enableLogs = function(log) {
+ Template.logMatch = /.*/;
+ if (log === false) {
+ return Template.log = false;
+ } else {
+ Template.log = true;
+ if (log instanceof RegExp) {
+ return Template.logMatch = log;
+ }
+ }
+ };
+
+ const wrapHelpersAndEvents = function(original, prefix, color) {
+ return function(dict) {
+
+ const template = this;
+ const fn1 = function(name, fn) {
+ if (fn instanceof Function) {
+ return dict[name] = function(...args) {
+
+ const result = fn.apply(this, args);
+ if (Template.log === true) {
+ const completeName = `${ prefix }:${ template.viewName.replace('Template.', '') }.${ name }`;
+ if (Template.logMatch.test(completeName)) {
+ console.log(`%c${ completeName }`, `color: ${ color }`, {
+ args,
+ scope: this,
+ result,
+ });
+ }
+ }
+ return result;
+ };
+ }
+ };
+ _.each(name, (fn, name) => {
+ fn1(name, fn);
+ });
+ return original.call(template, dict);
+ };
+ };
+
+ Template.prototype.helpers = wrapHelpersAndEvents(Template.prototype.helpers, 'helper', 'blue');
+
+ Template.prototype.events = wrapHelpersAndEvents(Template.prototype.events, 'event', 'green');
+
+ const wrapLifeCycle = function(original, prefix, color) {
+ return function(fn) {
+ const template = this;
+ if (fn instanceof Function) {
+ const wrap = function(...args) {
+ const result = fn.apply(this, args);
+ if (Template.log === true) {
+ const completeName = `${ prefix }:${ template.viewName.replace('Template.', '') }.${ name }`;
+ if (Template.logMatch.test(completeName)) {
+ console.log(`%c${ completeName }`, `color: ${ color }; font-weight: bold`, {
+ args,
+ scope: this,
+ result,
+ });
+ }
+ }
+ return result;
+ };
+ return original.call(template, wrap);
+ } else {
+ return original.call(template, fn);
+ }
+ };
+ };
+
+ Template.prototype.onCreated = wrapLifeCycle(Template.prototype.onCreated, 'onCreated', 'blue');
+
+ Template.prototype.onRendered = wrapLifeCycle(Template.prototype.onRendered, 'onRendered', 'green');
+
+ Template.prototype.onDestroyed = wrapLifeCycle(Template.prototype.onDestroyed, 'onDestroyed', 'red');
+}
diff --git a/app/logger/client/viewLogs.js b/app/logger/client/viewLogs.js
new file mode 100644
index 000000000000..8185bf6a6f0f
--- /dev/null
+++ b/app/logger/client/viewLogs.js
@@ -0,0 +1,32 @@
+import { Meteor } from 'meteor/meteor';
+import { Mongo } from 'meteor/mongo';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+import { AdminBox } from '../../ui-utils';
+import { hasAllPermission } from '../../authorization';
+import { t } from '../../utils';
+
+export const stdout = new Mongo.Collection('stdout');
+
+Meteor.startup(function() {
+ AdminBox.addOption({
+ href: 'admin-view-logs',
+ i18nLabel: 'View_Logs',
+ icon: 'post',
+ permissionGranted() {
+ return hasAllPermission('view-logs');
+ },
+ });
+});
+
+FlowRouter.route('/admin/view-logs', {
+ name: 'admin-view-logs',
+ action() {
+ return BlazeLayout.render('main', {
+ center: 'pageSettingsContainer',
+ pageTitle: t('View_Logs'),
+ pageTemplate: 'viewLogs',
+ noScroll: true,
+ });
+ },
+});
diff --git a/packages/rocketchat-logger/client/views/viewLogs.html b/app/logger/client/views/viewLogs.html
similarity index 100%
rename from packages/rocketchat-logger/client/views/viewLogs.html
rename to app/logger/client/views/viewLogs.html
diff --git a/app/logger/client/views/viewLogs.js b/app/logger/client/views/viewLogs.js
new file mode 100644
index 000000000000..70df611076ec
--- /dev/null
+++ b/app/logger/client/views/viewLogs.js
@@ -0,0 +1,134 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { Tracker } from 'meteor/tracker';
+import { ansispan } from '../ansispan';
+import { stdout } from '../viewLogs';
+import { readMessage } from '../../../ui-utils';
+import { hasAllPermission } from '../../../authorization';
+import _ from 'underscore';
+import moment from 'moment';
+import { SideNav } from '../../../ui-utils/client';
+
+Template.viewLogs.onCreated(function() {
+ this.subscribe('stdout');
+ return this.atBottom = true;
+});
+
+Template.viewLogs.helpers({
+ hasPermission() {
+ return hasAllPermission('view-logs');
+ },
+ logs() {
+ return stdout.find({}, {
+ sort: {
+ ts: 1,
+ },
+ });
+ },
+ ansispan(string) {
+ string = ansispan(string.replace(/\s/g, ' ').replace(/(\\n|\n)/g, '
'));
+ string = string.replace(/(.\d{8}-\d\d:\d\d:\d\d\.\d\d\d\(?.{0,2}\)?)/, '
$1');
+ return string;
+ },
+ formatTS(date) {
+ return moment(date).format('YMMDD-HH:mm:ss.SSS(ZZ)');
+ },
+});
+
+Template.viewLogs.events({
+ 'click .new-logs'() {
+ Template.instance().atBottom = true;
+ return Template.instance().sendToBottomIfNecessary();
+ },
+});
+
+Template.viewLogs.onRendered(function() {
+ Tracker.afterFlush(() => {
+ SideNav.setFlex('adminFlex');
+ SideNav.openFlex();
+ });
+ const wrapper = this.find('.terminal');
+ const wrapperUl = this.find('.terminal');
+ const newLogs = this.find('.new-logs');
+ const template = this;
+ template.isAtBottom = function(scrollThreshold) {
+ if (scrollThreshold == null) {
+ scrollThreshold = 0;
+ }
+ if (wrapper.scrollTop + scrollThreshold >= wrapper.scrollHeight - wrapper.clientHeight) {
+ newLogs.className = 'new-logs not';
+ return true;
+ }
+ return false;
+ };
+ template.sendToBottom = function() {
+ wrapper.scrollTop = wrapper.scrollHeight - wrapper.clientHeight;
+ return newLogs.className = 'new-logs not';
+ };
+ template.checkIfScrollIsAtBottom = function() {
+ template.atBottom = template.isAtBottom(100);
+ readMessage.enable();
+ return readMessage.read();
+ };
+ template.sendToBottomIfNecessary = function() {
+ if (template.atBottom === true && template.isAtBottom() !== true) {
+ return template.sendToBottom();
+ } else if (template.atBottom === false) {
+ return newLogs.className = 'new-logs';
+ }
+ };
+ template.sendToBottomIfNecessaryDebounced = _.debounce(template.sendToBottomIfNecessary, 10);
+ template.sendToBottomIfNecessary();
+ if (window.MutationObserver == null) {
+ wrapperUl.addEventListener('DOMSubtreeModified', function() {
+ return template.sendToBottomIfNecessaryDebounced();
+ });
+ } else {
+ const observer = new MutationObserver(function(mutations) {
+ return mutations.forEach(function() {
+ return template.sendToBottomIfNecessaryDebounced();
+ });
+ });
+ observer.observe(wrapperUl, {
+ childList: true,
+ });
+ }
+ template.onWindowResize = function() {
+ return Meteor.defer(function() {
+ return template.sendToBottomIfNecessaryDebounced();
+ });
+ };
+ window.addEventListener('resize', template.onWindowResize);
+ wrapper.addEventListener('mousewheel', function() {
+ template.atBottom = false;
+ return Meteor.defer(function() {
+ return template.checkIfScrollIsAtBottom();
+ });
+ });
+ wrapper.addEventListener('wheel', function() {
+ template.atBottom = false;
+ return Meteor.defer(function() {
+ return template.checkIfScrollIsAtBottom();
+ });
+ });
+ wrapper.addEventListener('touchstart', function() {
+ return template.atBottom = false;
+ });
+ wrapper.addEventListener('touchend', function() {
+ Meteor.defer(function() {
+ return template.checkIfScrollIsAtBottom();
+ });
+ Meteor.setTimeout(function() {
+ return template.checkIfScrollIsAtBottom();
+ }, 1000);
+ return Meteor.setTimeout(function() {
+ return template.checkIfScrollIsAtBottom();
+ }, 2000);
+ });
+ return wrapper.addEventListener('scroll', function() {
+ template.atBottom = false;
+ return Meteor.defer(function() {
+ return template.checkIfScrollIsAtBottom();
+ });
+ });
+});
diff --git a/app/logger/index.js b/app/logger/index.js
new file mode 100644
index 000000000000..a67eca871efb
--- /dev/null
+++ b/app/logger/index.js
@@ -0,0 +1,8 @@
+import { Meteor } from 'meteor/meteor';
+
+if (Meteor.isClient) {
+ module.exports = require('./client/index.js');
+}
+if (Meteor.isServer) {
+ module.exports = require('./server/index.js');
+}
diff --git a/packages/rocketchat-logger/server/index.js b/app/logger/server/index.js
similarity index 100%
rename from packages/rocketchat-logger/server/index.js
rename to app/logger/server/index.js
diff --git a/app/logger/server/server.js b/app/logger/server/server.js
new file mode 100644
index 000000000000..d7750a2d6064
--- /dev/null
+++ b/app/logger/server/server.js
@@ -0,0 +1,383 @@
+import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+import { EJSON } from 'meteor/ejson';
+import { Log } from 'meteor/logging';
+import { EventEmitter } from 'events';
+import { settings } from '../../settings';
+import { hasPermission } from '../../authorization';
+import _ from 'underscore';
+import s from 'underscore.string';
+
+let Logger;
+
+const LoggerManager = new class extends EventEmitter {
+ constructor() {
+ super();
+ this.enabled = false;
+ this.loggers = {};
+ this.queue = [];
+ this.showPackage = false;
+ this.showFileAndLine = false;
+ this.logLevel = 0;
+ }
+ register(logger) {
+ if (!logger instanceof Logger) {
+ return;
+ }
+ this.loggers[logger.name] = logger;
+ this.emit('register', logger);
+ }
+ addToQueue(logger, args) {
+ this.queue.push({
+ logger, args,
+ });
+ }
+ dispatchQueue() {
+ _.each(this.queue, (item) => item.logger._log.apply(item.logger, item.args));
+ this.clearQueue();
+ }
+ clearQueue() {
+ this.queue = [];
+ }
+
+ disable() {
+ this.enabled = false;
+ }
+
+ enable(dispatchQueue = false) {
+ this.enabled = true;
+ return (dispatchQueue === true) ? this.dispatchQueue() : this.clearQueue();
+ }
+};
+
+const defaultTypes = {
+ debug: {
+ name: 'debug',
+ color: 'blue',
+ level: 2,
+ },
+ log: {
+ name: 'info',
+ color: 'blue',
+ level: 1,
+ },
+ info: {
+ name: 'info',
+ color: 'blue',
+ level: 1,
+ },
+ success: {
+ name: 'info',
+ color: 'green',
+ level: 1,
+ },
+ warn: {
+ name: 'warn',
+ color: 'magenta',
+ level: 1,
+ },
+ error: {
+ name: 'error',
+ color: 'red',
+ level: 0,
+ },
+};
+
+class _Logger {
+ constructor(name, config = {}) {
+ const self = this;
+ this.name = name;
+
+ this.config = Object.assign({}, config);
+ if (LoggerManager.loggers && LoggerManager.loggers[this.name] != null) {
+ LoggerManager.loggers[this.name].warn('Duplicated instance');
+ return LoggerManager.loggers[this.name];
+ }
+ _.each(defaultTypes, (typeConfig, type) => {
+ this[type] = function(...args) {
+ return self._log.call(self, {
+ section: this.__section,
+ type,
+ level: typeConfig.level,
+ method: typeConfig.name,
+ arguments: args,
+ });
+ };
+
+ self[`${ type }_box`] = function(...args) {
+ return self._log.call(self, {
+ section: this.__section,
+ type,
+ box: true,
+ level: typeConfig.level,
+ method: typeConfig.name,
+ arguments: args,
+ });
+ };
+ });
+ if (this.config.methods) {
+ _.each(this.config.methods, (typeConfig, method) => {
+ if (this[method] != null) {
+ self.warn(`Method ${ method } already exists`);
+ }
+ if (defaultTypes[typeConfig.type] == null) {
+ self.warn(`Method type ${ typeConfig.type } does not exist`);
+ }
+ this[method] = function(...args) {
+ return self._log.call(self, {
+ section: this.__section,
+ type: typeConfig.type,
+ level: typeConfig.level != null ? typeConfig.level : defaultTypes[typeConfig.type] && defaultTypes[typeConfig.type].level,
+ method,
+ arguments: args,
+ });
+ };
+ this[`${ method }_box`] = function(...args) {
+ return self._log.call(self, {
+ section: this.__section,
+ type: typeConfig.type,
+ box: true,
+ level: typeConfig.level != null ? typeConfig.level : defaultTypes[typeConfig.type] && defaultTypes[typeConfig.type].level,
+ method,
+ arguments: args,
+ });
+ };
+ });
+ }
+ if (this.config.sections) {
+ _.each(this.config.sections, (name, section) => {
+ this[section] = {};
+ _.each(defaultTypes, (typeConfig, type) => {
+ self[section][type] = (...args) => this[type].apply({ __section: name }, args);
+ self[section][`${ type }_box`] = (...args) => this[`${ type }_box`].apply({ __section: name }, args);
+ });
+ _.each(this.config.methods, (typeConfig, method) => {
+ self[section][method] = (...args) => self[method].apply({ __section: name }, args);
+ self[section][`${ method }_box`] = (...args) => self[`${ method }_box`].apply({ __section: name }, args);
+ });
+ });
+ }
+
+ LoggerManager.register(this);
+ }
+ getPrefix(options) {
+ let prefix = `${ this.name } ➔ ${ options.method }`;
+ if (options.section) {
+ prefix = `${ this.name } ➔ ${ options.section }.${ options.method }`;
+ }
+ const details = this._getCallerDetails();
+ const detailParts = [];
+ if (details.package && (LoggerManager.showPackage === true || options.type === 'error')) {
+ detailParts.push(details.package);
+ }
+ if (LoggerManager.showFileAndLine === true || options.type === 'error') {
+ if ((details.file != null) && (details.line != null)) {
+ detailParts.push(`${ details.file }:${ details.line }`);
+ } else {
+ if (details.file != null) {
+ detailParts.push(details.file);
+ }
+ if (details.line != null) {
+ detailParts.push(details.line);
+ }
+ }
+ }
+ if (defaultTypes[options.type]) {
+ // format the message to a colored message
+ prefix = prefix[defaultTypes[options.type].color];
+ }
+ if (detailParts.length > 0) {
+ prefix = `${ detailParts.join(' ') } ${ prefix }`;
+ }
+ return prefix;
+ }
+ _getCallerDetails() {
+ const getStack = () => {
+ // We do NOT use Error.prepareStackTrace here (a V8 extension that gets us a
+ // core-parsed stack) since it's impossible to compose it with the use of
+ // Error.prepareStackTrace used on the server for source maps.
+ const { stack } = new Error();
+ return stack;
+ };
+ const stack = getStack();
+ if (!stack) {
+ return {};
+ }
+ const lines = stack.split('\n').splice(1);
+ // looking for the first line outside the logging package (or an
+ // eval if we find that first)
+ let line = lines[0];
+ for (let index = 0, len = lines.length; index < len, index++; line = lines[index]) {
+ if (line.match(/^\s*at eval \(eval/)) {
+ return { file: 'eval' };
+ }
+
+ if (!line.match(/packages\/rocketchat_logger(?:\/|\.js)/)) {
+ break;
+ }
+ }
+
+ const details = {};
+ // The format for FF is 'functionName@filePath:lineNumber'
+ // The format for V8 is 'functionName (packages/logging/logging.js:81)' or
+ // 'packages/logging/logging.js:81'
+ const match = /(?:[@(]| at )([^(]+?):([0-9:]+)(?:\)|$)/.exec(line);
+ if (!match) {
+ return details;
+ }
+ details.line = match[2].split(':')[0];
+ // Possible format: https://foo.bar.com/scripts/file.js?random=foobar
+ // XXX: if you can write the following in better way, please do it
+ // XXX: what about evals?
+ details.file = match[1].split('/').slice(-1)[0].split('?')[0];
+ const packageMatch = match[1].match(/packages\/([^\.\/]+)(?:\/|\.)/);
+ if (packageMatch) {
+ details.package = packageMatch[1];
+ }
+ return details;
+ }
+ makeABox(message, title) {
+ if (!_.isArray(message)) {
+ message = message.split('\n');
+ }
+ let len = 0;
+
+ len = Math.max.apply(null, message.map((line) => line.length));
+
+ const topLine = `+--${ s.pad('', len, '-') }--+`;
+ const separator = `| ${ s.pad('', len, '') } |`;
+ let lines = [];
+
+ lines.push(topLine);
+ if (title) {
+ lines.push(`| ${ s.lrpad(title, len) } |`);
+ lines.push(topLine);
+ }
+ lines.push(separator);
+
+ lines = [...lines, ...message.map((line) => `| ${ s.rpad(line, len) } |`)];
+
+ lines.push(separator);
+ lines.push(topLine);
+ return lines;
+ }
+
+ _log(options, ...args) {
+ if (LoggerManager.enabled === false) {
+ LoggerManager.addToQueue(this, [options, ...args]);
+ return;
+ }
+ if (options.level == null) {
+ options.level = 1;
+ }
+
+ if (LoggerManager.logLevel < options.level) {
+ return;
+ }
+
+ const prefix = this.getPrefix(options);
+
+ if (options.box === true && _.isString(options.arguments[0])) {
+ let color = undefined;
+ if (defaultTypes[options.type]) {
+ color = defaultTypes[options.type].color;
+ }
+
+ const box = this.makeABox(options.arguments[0], options.arguments[1]);
+ let subPrefix = '➔';
+ if (color) {
+ subPrefix = subPrefix[color];
+ }
+
+ console.log(subPrefix, prefix);
+ box.forEach((line) => {
+ console.log(subPrefix, color ? line[color] : line);
+ });
+
+ } else {
+ options.arguments.unshift(prefix);
+ console.log.apply(console, options.arguments);
+ }
+ }
+}
+
+Logger = _Logger;
+const processString = function(string, date) {
+ let obj;
+ try {
+ if (string[0] === '{') {
+ obj = EJSON.parse(string);
+ } else {
+ obj = {
+ message: string,
+ time: date,
+ level: 'info',
+ };
+ }
+ return Log.format(obj, { color: true });
+ } catch (error) {
+ return string;
+ }
+};
+
+const SystemLogger = new Logger('System', {
+ methods: {
+ startup: {
+ type: 'success',
+ level: 0,
+ },
+ },
+});
+
+
+const StdOut = new class extends EventEmitter {
+ constructor() {
+ super();
+ const { write } = process.stdout;
+ this.queue = [];
+ process.stdout.write = (...args) => {
+ write.apply(process.stdout, args);
+ const date = new Date;
+ const string = processString(args[0], date);
+ const item = {
+ id: Random.id(),
+ string,
+ ts: date,
+ };
+ this.queue.push(item);
+
+ if (typeof settings !== 'undefined') {
+ const limit = settings.get('Log_View_Limit');
+ if (limit && this.queue.length > limit) {
+ this.queue.shift();
+ }
+ }
+ this.emit('write', string, item);
+ };
+ }
+};
+
+
+Meteor.publish('stdout', function() {
+ if (!this.userId || hasPermission(this.userId, 'view-logs') !== true) {
+ return this.ready();
+ }
+
+ StdOut.queue.forEach((item) => {
+ this.added('stdout', item.id, {
+ string: item.string,
+ ts: item.ts,
+ });
+ });
+
+ this.ready();
+ StdOut.on('write', (string, item) => {
+ this.added('stdout', item.id, {
+ string: item.string,
+ ts: item.ts,
+ });
+ });
+});
+
+
+export { SystemLogger, StdOut, LoggerManager, processString, Logger };
diff --git a/packages/rocketchat-mail-messages/client/index.js b/app/mail-messages/client/index.js
similarity index 100%
rename from packages/rocketchat-mail-messages/client/index.js
rename to app/mail-messages/client/index.js
diff --git a/app/mail-messages/client/router.js b/app/mail-messages/client/router.js
new file mode 100644
index 000000000000..9e706f11be74
--- /dev/null
+++ b/app/mail-messages/client/router.js
@@ -0,0 +1,20 @@
+import { Meteor } from 'meteor/meteor';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { BlazeLayout } from 'meteor/kadira:blaze-layout';
+
+FlowRouter.route('/admin/mailer', {
+ name: 'admin-mailer',
+ action() {
+ return BlazeLayout.render('main', {
+ center: 'mailer',
+ });
+ },
+});
+
+FlowRouter.route('/mailer/unsubscribe/:_id/:createdAt', {
+ name: 'mailer-unsubscribe',
+ action(params) {
+ Meteor.call('Mailer:unsubscribe', params._id, params.createdAt);
+ return BlazeLayout.render('mailerUnsubscribe');
+ },
+});
diff --git a/app/mail-messages/client/startup.js b/app/mail-messages/client/startup.js
new file mode 100644
index 000000000000..35f55d75cbbe
--- /dev/null
+++ b/app/mail-messages/client/startup.js
@@ -0,0 +1,11 @@
+import { AdminBox } from '../../ui-utils';
+import { hasAllPermission } from '../../authorization';
+
+AdminBox.addOption({
+ href: 'admin-mailer',
+ i18nLabel: 'Mailer',
+ icon: 'mail',
+ permissionGranted() {
+ return hasAllPermission('access-mailer');
+ },
+});
diff --git a/packages/rocketchat-mail-messages/client/views/mailer.html b/app/mail-messages/client/views/mailer.html
similarity index 100%
rename from packages/rocketchat-mail-messages/client/views/mailer.html
rename to app/mail-messages/client/views/mailer.html
diff --git a/app/mail-messages/client/views/mailer.js b/app/mail-messages/client/views/mailer.js
new file mode 100644
index 000000000000..e21205cc319e
--- /dev/null
+++ b/app/mail-messages/client/views/mailer.js
@@ -0,0 +1,46 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { Tracker } from 'meteor/tracker';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { settings } from '../../../settings';
+import { handleError } from '../../../utils';
+import toastr from 'toastr';
+import { SideNav } from '../../../ui-utils/client';
+
+Template.mailer.helpers({
+ fromEmail() {
+ return settings.get('From_Email');
+ },
+});
+
+Template.mailer.events({
+ 'click .send'(e, t) {
+ e.preventDefault();
+ const from = $(t.find('[name=from]')).val();
+ const subject = $(t.find('[name=subject]')).val();
+ const body = $(t.find('[name=body]')).val();
+ const dryrun = $(t.find('[name=dryrun]:checked')).val();
+ const query = $(t.find('[name=query]')).val();
+ if (!from) {
+ toastr.error(TAPi18n.__('error-invalid-from-address'));
+ return;
+ }
+ if (body.indexOf('[unsubscribe]') === -1) {
+ toastr.error(TAPi18n.__('error-missing-unsubscribe-link'));
+ return;
+ }
+ return Meteor.call('Mailer.sendMail', from, subject, body, dryrun, query, function(err) {
+ if (err) {
+ return handleError(err);
+ }
+ return toastr.success(TAPi18n.__('The_emails_are_being_sent'));
+ });
+ },
+});
+
+Template.mailer.onRendered(() => {
+ Tracker.afterFlush(() => {
+ SideNav.setFlex('adminFlex');
+ SideNav.openFlex();
+ });
+});
diff --git a/packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.html b/app/mail-messages/client/views/mailerUnsubscribe.html
similarity index 100%
rename from packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.html
rename to app/mail-messages/client/views/mailerUnsubscribe.html
diff --git a/packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.js b/app/mail-messages/client/views/mailerUnsubscribe.js
similarity index 100%
rename from packages/rocketchat-mail-messages/client/views/mailerUnsubscribe.js
rename to app/mail-messages/client/views/mailerUnsubscribe.js
diff --git a/app/mail-messages/server/functions/sendMail.js b/app/mail-messages/server/functions/sendMail.js
new file mode 100644
index 000000000000..5e1db39d6d0f
--- /dev/null
+++ b/app/mail-messages/server/functions/sendMail.js
@@ -0,0 +1,64 @@
+import { Meteor } from 'meteor/meteor';
+import { EJSON } from 'meteor/ejson';
+import { FlowRouter } from 'meteor/kadira:flow-router';
+import { placeholders } from '../../../utils';
+import s from 'underscore.string';
+import * as Mailer from '../../../mailer';
+
+export const sendMail = function(from, subject, body, dryrun, query) {
+ Mailer.checkAddressFormatAndThrow(from, 'Mailer.sendMail');
+ if (body.indexOf('[unsubscribe]') === -1) {
+ throw new Meteor.Error('error-missing-unsubscribe-link', 'You must provide the [unsubscribe] link.', {
+ function: 'Mailer.sendMail',
+ });
+ }
+
+ let userQuery = { 'mailer.unsubscribed': { $exists: 0 } };
+ if (query) {
+ userQuery = { $and: [userQuery, EJSON.parse(query)] };
+ }
+
+ if (dryrun) {
+ return Meteor.users.find({
+ 'emails.address': from,
+ }).forEach((user) => {
+ const email = `${ user.name } <${ user.emails[0].address }>`;
+ const html = placeholders.replace(body, {
+ unsubscribe: Meteor.absoluteUrl(FlowRouter.path('mailer/unsubscribe/:_id/:createdAt', {
+ _id: user._id,
+ createdAt: user.createdAt.getTime(),
+ })),
+ name: user.name,
+ email,
+ });
+
+ console.log(`Sending email to ${ email }`);
+ return Mailer.send({
+ to: email,
+ from,
+ subject,
+ html,
+ });
+ });
+ }
+
+ return Meteor.users.find(userQuery).forEach(function(user) {
+ const email = `${ user.name } <${ user.emails[0].address }>`;
+
+ const html = placeholders.replace(body, {
+ unsubscribe: Meteor.absoluteUrl(FlowRouter.path('mailer/unsubscribe/:_id/:createdAt', {
+ _id: user._id,
+ createdAt: user.createdAt.getTime(),
+ })),
+ name: s.escapeHTML(user.name),
+ email: s.escapeHTML(email),
+ });
+ console.log(`Sending email to ${ email }`);
+ return Mailer.send({
+ to: email,
+ from,
+ subject,
+ html,
+ });
+ });
+};
diff --git a/app/mail-messages/server/functions/unsubscribe.js b/app/mail-messages/server/functions/unsubscribe.js
new file mode 100644
index 000000000000..9d892acb0c50
--- /dev/null
+++ b/app/mail-messages/server/functions/unsubscribe.js
@@ -0,0 +1,8 @@
+import { Users } from '../../../models';
+
+export const unsubscribe = function(_id, createdAt) {
+ if (_id && createdAt) {
+ return Users.rocketMailUnsubscribe(_id, createdAt) === 1;
+ }
+ return false;
+};
diff --git a/app/mail-messages/server/index.js b/app/mail-messages/server/index.js
new file mode 100644
index 000000000000..a05bc57cc61e
--- /dev/null
+++ b/app/mail-messages/server/index.js
@@ -0,0 +1,8 @@
+import './startup';
+import './methods/sendMail';
+import './methods/unsubscribe';
+import { Mailer } from './lib/Mailer';
+
+export {
+ Mailer,
+};
diff --git a/packages/rocketchat-mail-messages/server/lib/Mailer.js b/app/mail-messages/server/lib/Mailer.js
similarity index 100%
rename from packages/rocketchat-mail-messages/server/lib/Mailer.js
rename to app/mail-messages/server/lib/Mailer.js
diff --git a/app/mail-messages/server/methods/sendMail.js b/app/mail-messages/server/methods/sendMail.js
new file mode 100644
index 000000000000..5dcc9b729aeb
--- /dev/null
+++ b/app/mail-messages/server/methods/sendMail.js
@@ -0,0 +1,28 @@
+import { Meteor } from 'meteor/meteor';
+import { Mailer } from '../lib/Mailer';
+import { hasRole } from '../../../authorization';
+
+Meteor.methods({
+ 'Mailer.sendMail'(from, subject, body, dryrun, query) {
+ const userId = Meteor.userId();
+ if (!userId) {
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+ method: 'Mailer.sendMail',
+ });
+ }
+ if (hasRole(userId, 'admin') !== true) {
+ throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+ method: 'Mailer.sendMail',
+ });
+ }
+ return Mailer.sendMail(from, subject, body, dryrun, query);
+ },
+});
+
+
+// Limit setting username once per minute
+// DDPRateLimiter.addRule
+// type: 'method'
+// name: 'Mailer.sendMail'
+// connectionId: -> return true
+// , 1, 60000
diff --git a/packages/rocketchat-mail-messages/server/methods/unsubscribe.js b/app/mail-messages/server/methods/unsubscribe.js
similarity index 100%
rename from packages/rocketchat-mail-messages/server/methods/unsubscribe.js
rename to app/mail-messages/server/methods/unsubscribe.js
diff --git a/app/mail-messages/server/startup.js b/app/mail-messages/server/startup.js
new file mode 100644
index 000000000000..ed0993fcad50
--- /dev/null
+++ b/app/mail-messages/server/startup.js
@@ -0,0 +1,11 @@
+import { Meteor } from 'meteor/meteor';
+import { Permissions } from '../../models';
+
+Meteor.startup(function() {
+ return Permissions.upsert('access-mailer', {
+ $setOnInsert: {
+ _id: 'access-mailer',
+ roles: ['admin'],
+ },
+ });
+});
diff --git a/app/mailer/index.js b/app/mailer/index.js
new file mode 100644
index 000000000000..7c4b0096a2da
--- /dev/null
+++ b/app/mailer/index.js
@@ -0,0 +1 @@
+export * from './server/api';
diff --git a/app/mailer/server/api.js b/app/mailer/server/api.js
new file mode 100644
index 000000000000..c8044be64766
--- /dev/null
+++ b/app/mailer/server/api.js
@@ -0,0 +1,114 @@
+import { Meteor } from 'meteor/meteor';
+import { Email } from 'meteor/email';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { settings } from '../../settings';
+import _ from 'underscore';
+import s from 'underscore.string';
+import juice from 'juice';
+let contentHeader;
+let contentFooter;
+
+let body;
+let Settings = {
+ get: () => {},
+};
+
+// define server language for email translations
+// @TODO: change TAPi18n.__ function to use the server language by default
+let lng = 'en';
+settings.get('Language', (key, value) => {
+ lng = value || 'en';
+});
+
+export const replacekey = (str, key, value = '') => str.replace(new RegExp(`(\\[${ key }\\]|__${ key }__)`, 'igm'), value);
+export const translate = (str) => str.replace(/\{ ?([^\} ]+)(( ([^\}]+))+)? ?\}/gmi, (match, key) => TAPi18n.__(key, { lng }));
+export const replace = function replace(str, data = {}) {
+ if (!str) {
+ return '';
+ }
+ const options = {
+ Site_Name: Settings.get('Site_Name'),
+ Site_URL: Settings.get('Site_Url'),
+ Site_URL_Slash: Settings.get('Site_Url').replace(/\/?$/, '/'),
+ ...(data.name && {
+ fname: s.strLeft(data.name, ' '),
+ lname: s.strRightBack(data.name, ' '),
+ }),
+ ...data,
+ };
+ return Object.entries(options).reduce((ret, [key, value]) => replacekey(ret, key, value), translate(str));
+};
+
+export const replaceEscaped = (str, data = {}) => replace(str, {
+ Site_Name: s.escapeHTML(settings.get('Site_Name')),
+ Site_Url: s.escapeHTML(settings.get('Site_Url')),
+ ...Object.entries(data).reduce((ret, [key, value]) => {
+ ret[key] = s.escapeHTML(value);
+ return ret;
+ }, {}),
+});
+export const wrap = (html, data = {}) => replaceEscaped(body.replace('{{body}}', html), data);
+export const inlinecss = (html) => juice.inlineContent(html, Settings.get('email_style'));
+export const getTemplate = (template, fn, escape = true) => {
+ let html = '';
+ Settings.get(template, (key, value) => {
+ html = value || '';
+ fn(escape ? inlinecss(html) : html);
+ });
+ Settings.get('email_style', () => {
+ fn(escape ? inlinecss(html) : html);
+ });
+};
+export const getTemplateWrapped = (template, fn) => {
+ let html = '';
+ const wrapInlineCSS = _.debounce(() => fn(wrap(inlinecss(html))), 100);
+
+ Settings.get('Email_Header', () => html && wrapInlineCSS());
+ Settings.get('Email_Footer', () => html && wrapInlineCSS());
+ Settings.get('email_style', () => html && wrapInlineCSS());
+ Settings.get(template, (key, value) => {
+ html = value || '';
+ return html && wrapInlineCSS();
+ });
+};
+export const setSettings = (s) => {
+ Settings = s;
+
+ getTemplate('Email_Header', (value) => {
+ contentHeader = replace(value || '');
+ body = inlinecss(`${ contentHeader } {{body}} ${ contentFooter }`);
+ }, false);
+
+ getTemplate('Email_Footer', (value) => {
+ contentFooter = replace(value || '');
+ body = inlinecss(`${ contentHeader } {{body}} ${ contentFooter }`);
+ }, false);
+
+ body = inlinecss(`${ contentHeader } {{body}} ${ contentFooter }`);
+};
+
+export const rfcMailPatternWithName = /^(?:.*<)?([a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*)(?:>?)$/;
+
+export const checkAddressFormat = (from) => rfcMailPatternWithName.test(from);
+
+export const sendNoWrap = ({ to, from, subject, html, headers }) => {
+ if (!checkAddressFormat(to)) {
+ return;
+ }
+ Meteor.defer(() => Email.send({ to, from, subject, html, headers }));
+};
+
+export const send = ({ to, from, subject, html, data, headers }) => sendNoWrap({ to, from, subject: replace(subject, data), html: wrap(html, data), headers });
+
+export const checkAddressFormatAndThrow = (from, func) => {
+ if (checkAddressFormat(from)) {
+ return true;
+ }
+ throw new Meteor.Error('error-invalid-from-address', 'Invalid from address', {
+ function: func,
+ });
+};
+
+export const getHeader = () => contentHeader;
+
+export const getFooter = () => contentFooter;
diff --git a/packages/rocketchat-mapview/client/index.js b/app/mapview/client/index.js
similarity index 100%
rename from packages/rocketchat-mapview/client/index.js
rename to app/mapview/client/index.js
diff --git a/packages/rocketchat-mapview/client/mapview.js b/app/mapview/client/mapview.js
similarity index 81%
rename from packages/rocketchat-mapview/client/mapview.js
rename to app/mapview/client/mapview.js
index bd6efc7962bf..a1695c1aaac6 100644
--- a/packages/rocketchat-mapview/client/mapview.js
+++ b/app/mapview/client/mapview.js
@@ -1,5 +1,6 @@
import { TAPi18n } from 'meteor/tap:i18n';
-import { RocketChat } from 'meteor/rocketchat:lib';
+import { settings } from '../../settings';
+import { callbacks } from '../../callbacks';
/*
* MapView is a named function that will replace geolocation in messages with a Google Static Map
* @param {Object} message - The message object
@@ -8,7 +9,7 @@ import { RocketChat } from 'meteor/rocketchat:lib';
function MapView(message) {
// get MapView settings
- const mv_googlekey = RocketChat.settings.get('MapView_GMapsAPIKey');
+ const mv_googlekey = settings.get('MapView_GMapsAPIKey');
if (message.location) {
@@ -26,4 +27,4 @@ function MapView(message) {
return message;
}
-RocketChat.callbacks.add('renderMessage', MapView, RocketChat.callbacks.priority.HIGH, 'mapview');
+callbacks.add('renderMessage', MapView, callbacks.priority.HIGH, 'mapview');
diff --git a/packages/rocketchat-mapview/server/index.js b/app/mapview/server/index.js
similarity index 100%
rename from packages/rocketchat-mapview/server/index.js
rename to app/mapview/server/index.js
diff --git a/app/mapview/server/settings.js b/app/mapview/server/settings.js
new file mode 100644
index 000000000000..0fb4ea239ac5
--- /dev/null
+++ b/app/mapview/server/settings.js
@@ -0,0 +1,7 @@
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../settings';
+
+Meteor.startup(function() {
+ settings.add('MapView_Enabled', false, { type: 'boolean', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_Enabled', i18nDescription: 'MapView_Enabled_Description' });
+ return settings.add('MapView_GMapsAPIKey', '', { type: 'string', group: 'Message', section: 'Google Maps', public: true, i18nLabel: 'MapView_GMapsAPIKey', i18nDescription: 'MapView_GMapsAPIKey_Description' });
+});
diff --git a/app/markdown/client/index.js b/app/markdown/client/index.js
new file mode 100644
index 000000000000..33d93bded040
--- /dev/null
+++ b/app/markdown/client/index.js
@@ -0,0 +1 @@
+export { Markdown } from '../lib/markdown';
diff --git a/app/markdown/lib/markdown.js b/app/markdown/lib/markdown.js
new file mode 100644
index 000000000000..5881a5f1bec5
--- /dev/null
+++ b/app/markdown/lib/markdown.js
@@ -0,0 +1,101 @@
+/*
+ * Markdown is a named function that will parse markdown syntax
+ * @param {Object} message - The message object
+ */
+import s from 'underscore.string';
+import { Meteor } from 'meteor/meteor';
+import { Blaze } from 'meteor/blaze';
+import { settings } from '../../settings';
+import { callbacks } from '../../callbacks';
+import { marked } from './parser/marked/marked.js';
+import { original } from './parser/original/original.js';
+
+import { code } from './parser/original/code.js';
+
+const parsers = {
+ original,
+ marked,
+};
+
+class MarkdownClass {
+ parse(text) {
+ const message = {
+ html: s.escapeHTML(text),
+ };
+ return this.mountTokensBack(this.parseMessageNotEscaped(message)).html;
+ }
+
+ parseNotEscaped(text) {
+ const message = {
+ html: text,
+ };
+ return this.mountTokensBack(this.parseMessageNotEscaped(message)).html;
+ }
+
+ parseMessageNotEscaped(message) {
+ const parser = settings.get('Markdown_Parser');
+
+ if (parser === 'disabled') {
+ return message;
+ }
+
+ if (typeof parsers[parser] === 'function') {
+ return parsers[parser](message);
+ }
+ return parsers.original(message);
+ }
+
+ mountTokensBackRecursively(message, tokenList, useHtml = true) {
+ const missingTokens = [];
+
+ if (tokenList.length > 0) {
+ for (const { token, text, noHtml } of tokenList) {
+ if (message.html.indexOf(token) >= 0) {
+ message.html = message.html.replace(token, () => (useHtml ? text : noHtml)); // Uses lambda so doesn't need to escape $
+ } else {
+ missingTokens.push({ token, text, noHtml });
+ }
+ }
+ }
+
+ // If there are tokens that were missing from the string, but the last iteration replaced at least one token, then go again
+ // this is done because one of the tokens may have been hidden by another one
+ if (missingTokens.length > 0 && missingTokens.length < tokenList.length) {
+ this.mountTokensBackRecursively(message, missingTokens, useHtml);
+ }
+ }
+
+ mountTokensBack(message, useHtml = true) {
+ if (message.tokens) {
+ this.mountTokensBackRecursively(message, message.tokens, useHtml);
+ }
+
+ return message;
+ }
+
+ code(...args) {
+ return code(...args);
+ }
+}
+
+export const Markdown = new MarkdownClass;
+
+// renderMessage already did html escape
+const MarkdownMessage = (message) => {
+ if (s.trim(message != null ? message.html : undefined)) {
+ message = Markdown.parseMessageNotEscaped(message);
+ }
+
+ return message;
+};
+
+callbacks.add('renderMessage', MarkdownMessage, callbacks.priority.HIGH, 'markdown');
+
+if (Meteor.isClient) {
+ Blaze.registerHelper('RocketChatMarkdown', (text) => Markdown.parse(text));
+ Blaze.registerHelper('RocketChatMarkdownUnescape', (text) => Markdown.parseNotEscaped(text));
+ Blaze.registerHelper('RocketChatMarkdownInline', (text) => {
+ const output = Markdown.parse(text);
+ return output.replace(/^
/, '').replace(/<\/p>$/, '');
+ });
+}
diff --git a/app/markdown/lib/parser/marked/marked.js b/app/markdown/lib/parser/marked/marked.js
new file mode 100644
index 000000000000..08577708a076
--- /dev/null
+++ b/app/markdown/lib/parser/marked/marked.js
@@ -0,0 +1,114 @@
+import { settings } from '../../../../settings';
+import { Random } from 'meteor/random';
+import _ from 'underscore';
+import s from 'underscore.string';
+import hljs from 'highlight.js';
+import _marked from 'marked';
+
+const renderer = new _marked.Renderer();
+
+let msg = null;
+
+renderer.code = function(code, lang, escaped) {
+ if (this.options.highlight) {
+ const out = this.options.highlight(code, lang);
+ if (out != null && out !== code) {
+ escaped = true;
+ code = out;
+ }
+ }
+
+ let text = null;
+
+ if (!lang) {
+ text = `
${ (escaped ? code : s.escapeHTML(code, true)) }
`;
+ } else {
+ text = `
${ (escaped ? code : s.escapeHTML(code, true)) }
`;
+ }
+
+ if (_.isString(msg)) {
+ return text;
+ }
+
+ const token = `=!=${ Random.id() }=!=`;
+ msg.tokens.push({
+ highlight: true,
+ token,
+ text,
+ });
+
+ return token;
+};
+
+renderer.codespan = function(text) {
+ text = `
${ text }`;
+ if (_.isString(msg)) {
+ return text;
+ }
+
+ const token = `=!=${ Random.id() }=!=`;
+ msg.tokens.push({
+ token,
+ text,
+ });
+
+ return token;
+};
+
+renderer.blockquote = function(quote) {
+ return `
${ quote }
`;
+};
+
+const linkRenderer = renderer.link;
+renderer.link = function(href, title, text) {
+ const html = linkRenderer.call(renderer, href, title, text);
+ return html.replace(/^
{
+ msg = message;
+
+ if (!msg.tokens) {
+ msg.tokens = [];
+ }
+
+ if (gfm == null) { gfm = settings.get('Markdown_Marked_GFM'); }
+ if (tables == null) { tables = settings.get('Markdown_Marked_Tables'); }
+ if (breaks == null) { breaks = settings.get('Markdown_Marked_Breaks'); }
+ if (pedantic == null) { pedantic = settings.get('Markdown_Marked_Pedantic'); }
+ if (smartLists == null) { smartLists = settings.get('Markdown_Marked_SmartLists'); }
+ if (smartypants == null) { smartypants = settings.get('Markdown_Marked_Smartypants'); }
+
+ msg.html = _marked(s.unescapeHTML(msg.html), {
+ gfm,
+ tables,
+ breaks,
+ pedantic,
+ smartLists,
+ smartypants,
+ renderer,
+ sanitize: true,
+ highlight,
+ });
+
+ return msg;
+};
diff --git a/packages/rocketchat-markdown/lib/parser/original/code.js b/app/markdown/lib/parser/original/code.js
similarity index 100%
rename from packages/rocketchat-markdown/lib/parser/original/code.js
rename to app/markdown/lib/parser/original/code.js
diff --git a/app/markdown/lib/parser/original/markdown.js b/app/markdown/lib/parser/original/markdown.js
new file mode 100644
index 000000000000..7ac8f4f20647
--- /dev/null
+++ b/app/markdown/lib/parser/original/markdown.js
@@ -0,0 +1,95 @@
+/*
+ * Markdown is a named function that will parse markdown syntax
+ * @param {String} msg - The message html
+ */
+import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+import { settings } from '../../../../settings';
+import s from 'underscore.string';
+
+const parseNotEscaped = function(msg, message) {
+ if (message && message.tokens == null) {
+ message.tokens = [];
+ }
+
+ const addAsToken = function(html) {
+ const token = `=!=${ Random.id() }=!=`;
+ message.tokens.push({
+ token,
+ text: html,
+ });
+
+ return token;
+ };
+
+ const schemes = settings.get('Markdown_SupportSchemesForLink').split(',').join('|');
+
+ if (settings.get('Markdown_Headers')) {
+ // Support # Text for h1
+ msg = msg.replace(/^# (([\S\w\d-_\/\*\.,\\][ \u00a0\u1680\u180e\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]?)+)/gm, '$1
');
+
+ // Support # Text for h2
+ msg = msg.replace(/^## (([\S\w\d-_\/\*\.,\\][ \u00a0\u1680\u180e\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]?)+)/gm, '$1
');
+
+ // Support # Text for h3
+ msg = msg.replace(/^### (([\S\w\d-_\/\*\.,\\][ \u00a0\u1680\u180e\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]?)+)/gm, '$1
');
+
+ // Support # Text for h4
+ msg = msg.replace(/^#### (([\S\w\d-_\/\*\.,\\][ \u00a0\u1680\u180e\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]?)+)/gm, '$1
');
+ }
+
+ // Support *text* to make bold
+ msg = msg.replace(/(|>|[ >_~`])\*{1,2}([^\*\r\n]+)\*{1,2}([<_~`]|\B|\b|$)/gm, '$1*$2*$3');
+
+ // Support _text_ to make italics
+ msg = msg.replace(/(^|>|[ >*~`])\_{1,2}([^\_\r\n]+)\_{1,2}([<*~`]|\B|\b|$)/gm, '$1_$2_$3');
+
+ // Support ~text~ to strike through text
+ msg = msg.replace(/(^|>|[ >_*`])\~{1,2}([^~\r\n]+)\~{1,2}([<_*`]|\B|\b|$)/gm, '$1~$2~$3');
+
+ // Support for block quote
+ // >>>
+ // Text
+ // <<<
+ msg = msg.replace(/(?:>){3}\n+([\s\S]*?)\n+(?:<){3}/g, '>>>$1<<<
');
+
+ // Support >Text for quote
+ msg = msg.replace(/^>(.*)$/gm, '>$1
');
+
+ // Remove white-space around blockquote (prevent
). Because blockquote is block element.
+ msg = msg.replace(/\s*/gm, '');
+ msg = msg.replace(/<\/blockquote>\s*/gm, '
');
+
+ // Remove new-line between blockquotes.
+ msg = msg.replace(/<\/blockquote>\n {
+ const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
+ return addAsToken(``);
+ });
+
+ // Support [Text](http://link)
+ msg = msg.replace(new RegExp(`\\[([^\\]]+)\\]\\(((?:${ schemes }):\\/\\/[^\\)]+)\\)`, 'gm'), (match, title, url) => {
+ const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
+ title = title.replace(/&/g, '&');
+
+ let escapedUrl = s.escapeHTML(url);
+ escapedUrl = escapedUrl.replace(/&/g, '&');
+
+ return addAsToken(`${ s.escapeHTML(title) }`);
+ });
+
+ // Support
+ msg = msg.replace(new RegExp(`(?:<|<)((?:${ schemes }):\\/\\/[^\\|]+)\\|(.+?)(?=>|>)(?:>|>)`, 'gm'), (match, url, title) => {
+ const target = url.indexOf(Meteor.absoluteUrl()) === 0 ? '' : '_blank';
+ return addAsToken(`${ s.escapeHTML(title) }`);
+ });
+
+ return msg;
+};
+
+export const markdown = function(message) {
+ message.html = parseNotEscaped(message.html, message);
+ return message;
+};
diff --git a/packages/rocketchat-markdown/lib/parser/original/original.js b/app/markdown/lib/parser/original/original.js
similarity index 100%
rename from packages/rocketchat-markdown/lib/parser/original/original.js
rename to app/markdown/lib/parser/original/original.js
diff --git a/app/markdown/server/index.js b/app/markdown/server/index.js
new file mode 100644
index 000000000000..f4d1855ab52a
--- /dev/null
+++ b/app/markdown/server/index.js
@@ -0,0 +1,2 @@
+import './settings';
+export { Markdown } from '../lib/markdown';
diff --git a/app/markdown/server/settings.js b/app/markdown/server/settings.js
new file mode 100644
index 000000000000..14d16c7e7746
--- /dev/null
+++ b/app/markdown/server/settings.js
@@ -0,0 +1,88 @@
+import { Meteor } from 'meteor/meteor';
+import { settings } from '../../settings';
+
+Meteor.startup(() => {
+ settings.add('Markdown_Parser', 'original', {
+ type: 'select',
+ values: [{
+ key: 'disabled',
+ i18nLabel: 'Disabled',
+ }, {
+ key: 'original',
+ i18nLabel: 'Original',
+ }, {
+ key: 'marked',
+ i18nLabel: 'Marked',
+ }],
+ group: 'Message',
+ section: 'Markdown',
+ public: true,
+ });
+
+ const enableQueryOriginal = { _id: 'Markdown_Parser', value: 'original' };
+ settings.add('Markdown_Headers', false, {
+ type: 'boolean',
+ group: 'Message',
+ section: 'Markdown',
+ public: true,
+ enableQuery: enableQueryOriginal,
+ });
+ settings.add('Markdown_SupportSchemesForLink', 'http,https', {
+ type: 'string',
+ group: 'Message',
+ section: 'Markdown',
+ public: true,
+ i18nDescription: 'Markdown_SupportSchemesForLink_Description',
+ enableQuery: enableQueryOriginal,
+ });
+
+ const enableQueryMarked = { _id: 'Markdown_Parser', value: 'marked' };
+ settings.add('Markdown_Marked_GFM', true, {
+ type: 'boolean',
+ group: 'Message',
+ section: 'Markdown',
+ public: true,
+ enableQuery: enableQueryMarked,
+ });
+ settings.add('Markdown_Marked_Tables', true, {
+ type: 'boolean',
+ group: 'Message',
+ section: 'Markdown',
+ public: true,
+ enableQuery: enableQueryMarked,
+ });
+ settings.add('Markdown_Marked_Breaks', true, {
+ type: 'boolean',
+ group: 'Message',
+ section: 'Markdown',
+ public: true,
+ enableQuery: enableQueryMarked,
+ });
+ settings.add('Markdown_Marked_Pedantic', false, {
+ type: 'boolean',
+ group: 'Message',
+ section: 'Markdown',
+ public: true,
+ enableQuery: [{
+ _id: 'Markdown_Parser',
+ value: 'marked',
+ }, {
+ _id: 'Markdown_Marked_GFM',
+ value: false,
+ }],
+ });
+ settings.add('Markdown_Marked_SmartLists', true, {
+ type: 'boolean',
+ group: 'Message',
+ section: 'Markdown',
+ public: true,
+ enableQuery: enableQueryMarked,
+ });
+ settings.add('Markdown_Marked_Smartypants', true, {
+ type: 'boolean',
+ group: 'Message',
+ section: 'Markdown',
+ public: true,
+ enableQuery: enableQueryMarked,
+ });
+});
diff --git a/app/markdown/tests/client.mocks.js b/app/markdown/tests/client.mocks.js
new file mode 100644
index 000000000000..497763873795
--- /dev/null
+++ b/app/markdown/tests/client.mocks.js
@@ -0,0 +1,60 @@
+import mock from 'mock-require';
+import _ from 'underscore';
+import s from 'underscore.string';
+_.mixin(s.exports());
+
+mock('meteor/meteor', {
+ Meteor: {
+ absoluteUrl() {
+ return 'http://localhost:3000/';
+ },
+ },
+});
+
+mock('meteor/blaze', {
+ Blaze: {},
+});
+
+mock('../../settings', {
+ settings: {
+ get(setting) {
+ switch (setting) {
+ case 'Markdown_SupportSchemesForLink':
+ return 'http,https';
+ case 'Markdown_Parser':
+ return 'original';
+ case 'Markdown_Headers':
+ // case 'Markdown_Marked_GFM':
+ // case 'Markdown_Marked_Tables':
+ // case 'Markdown_Marked_Breaks':
+ // case 'Markdown_Marked_Pedantic':
+ // case 'Markdown_Marked_SmartLists':
+ // case 'Markdown_Marked_Smartypants':
+ return true;
+ default:
+ throw new Error(`Missing setting mock ${ setting }`);
+ }
+ },
+ },
+});
+
+mock('../../callbacks', {
+ callbacks: {
+ add() {
+
+ },
+ priority: {
+ HIGH: 1,
+ },
+ },
+});
+
+mock('meteor/random', {
+ Random: {
+ id() {
+ return Math.random();
+ },
+ },
+});
+
+global.s = s;
diff --git a/app/markdown/tests/client.tests.js b/app/markdown/tests/client.tests.js
new file mode 100644
index 000000000000..f6f5a2495c3f
--- /dev/null
+++ b/app/markdown/tests/client.tests.js
@@ -0,0 +1,291 @@
+/* eslint-env mocha */
+import 'babel-polyfill';
+import assert from 'assert';
+import s from 'underscore.string';
+import './client.mocks.js';
+import { original } from '../lib/parser/original/original';
+import { Markdown } from '../lib/markdown';
+
+const wrapper = (text, tag) => `${ tag }${ text }${ tag }`;
+const boldWrapper = (text) => wrapper(`${ text }`, '*');
+const italicWrapper = (text) => wrapper(`${ text }`, '_');
+const strikeWrapper = (text) => wrapper(`${ text }`, '~');
+const headerWrapper = (text, level) => `${ text }`;
+const quoteWrapper = (text) => `>${ text }
`;
+const linkWrapped = (link, title) => `${ s.escapeHTML(title) }`;
+const inlinecodeWrapper = (text) => wrapper(`${ text }`, '`');
+const codeWrapper = (text, lang) => `\`\`\`
${ text }
\`\`\`
`;
+
+const bold = {
+ '*Hello*': boldWrapper('Hello'),
+ '**Hello**': boldWrapper('Hello'),
+ '**Hello*': boldWrapper('Hello'),
+ '*Hello**': boldWrapper('Hello'),
+ Hello: 'Hello',
+ '*Hello': '*Hello',
+ 'Hello*': 'Hello*',
+ 'He*llo': 'He*llo',
+ '***Hello***': `*${ boldWrapper('Hello') }*`,
+ '***Hello**': `*${ boldWrapper('Hello') }`,
+ '*Hello* this is dog': `${ boldWrapper('Hello') } this is dog`,
+ 'Rocket cat says *Hello*': `Rocket cat says ${ boldWrapper('Hello') }`,
+ 'He said *Hello* to her': `He said ${ boldWrapper('Hello') } to her`,
+ '**Hello** this is dog': `${ boldWrapper('Hello') } this is dog`,
+ 'Rocket cat says **Hello**': `Rocket cat says ${ boldWrapper('Hello') }`,
+ 'He said **Hello** to her': `He said ${ boldWrapper('Hello') } to her`,
+ 'He was a**nn**oyed': `He was a${ boldWrapper('nn') }oyed`,
+ 'There are two o in f*oo*tball': `There are two o in f${ boldWrapper('oo') }tball`,
+};
+
+const italic = {
+ _Hello_: italicWrapper('Hello'),
+ __Hello__: italicWrapper('Hello'),
+ __Hello_: italicWrapper('Hello'),
+ _Hello__: italicWrapper('Hello'),
+ Hello: 'Hello',
+ _Hello: '_Hello',
+ Hello_: 'Hello_',
+ He_llo: 'He_llo',
+ ___Hello___: '___Hello___',
+ ___Hello__: '___Hello__',
+ '_Hello_ this is dog': `${ italicWrapper('Hello') } this is dog`,
+ 'Rocket cat says _Hello_': `Rocket cat says ${ italicWrapper('Hello') }`,
+ 'He said _Hello_ to her': `He said ${ italicWrapper('Hello') } to her`,
+ '__Hello__ this is dog': `${ italicWrapper('Hello') } this is dog`,
+ 'Rocket cat says __Hello__': `Rocket cat says ${ italicWrapper('Hello') }`,
+ 'He said __Hello__ to her': `He said ${ italicWrapper('Hello') } to her`,
+};
+
+const strike = {
+ '~Hello~': strikeWrapper('Hello'),
+ '~~Hello~~': strikeWrapper('Hello'),
+ '~~Hello~': strikeWrapper('Hello'),
+ '~Hello~~': strikeWrapper('Hello'),
+ Hello: 'Hello',
+ '~Hello': '~Hello',
+ 'Hello~': 'Hello~',
+ 'He~llo': 'He~llo',
+ '~~~Hello~~~': '~~~Hello~~~',
+ '~~~Hello~~': '~~~Hello~~',
+ '~Hello~ this is dog': `${ strikeWrapper('Hello') } this is dog`,
+ 'Rocket cat says ~Hello~': `Rocket cat says ${ strikeWrapper('Hello') }`,
+ 'He said ~Hello~ to her': `He said ${ strikeWrapper('Hello') } to her`,
+ '~~Hello~~ this is dog': `${ strikeWrapper('Hello') } this is dog`,
+ 'Rocket cat says ~~Hello~~': `Rocket cat says ${ strikeWrapper('Hello') }`,
+ 'He said ~~Hello~~ to her': `He said ${ strikeWrapper('Hello') } to her`,
+};
+
+const headersLevel1 = {
+ '# Hello': headerWrapper('Hello', 1),
+ '# Rocket.Cat': headerWrapper('Rocket.Cat', 1),
+ '# Hi': headerWrapper('Hi', 1),
+ '# Hello this is dog': headerWrapper('Hello this is dog', 1),
+ '# Rocket cat says Hello': headerWrapper('Rocket cat says Hello', 1),
+ '# He said Hello to her': headerWrapper('He said Hello to her', 1),
+ '#Hello': '#Hello',
+ '#Hello#': '#Hello#',
+ 'He#llo': 'He#llo',
+};
+
+const headersLevel2 = {
+ '## Hello': headerWrapper('Hello', 2),
+ '## Rocket.Cat': headerWrapper('Rocket.Cat', 2),
+ '## Hi': headerWrapper('Hi', 2),
+ '## Hello this is dog': headerWrapper('Hello this is dog', 2),
+ '## Rocket cat says Hello': headerWrapper('Rocket cat says Hello', 2),
+ '## He said Hello to her': headerWrapper('He said Hello to her', 2),
+ '##Hello': '##Hello',
+ '##Hello##': '##Hello##',
+ 'He##llo': 'He##llo',
+};
+
+const headersLevel3 = {
+ '### Hello': headerWrapper('Hello', 3),
+ '### Rocket.Cat': headerWrapper('Rocket.Cat', 3),
+ '### Hi': headerWrapper('Hi', 3),
+ '### Hello this is dog': headerWrapper('Hello this is dog', 3),
+ '### Rocket cat says Hello': headerWrapper('Rocket cat says Hello', 3),
+ '### He said Hello to her': headerWrapper('He said Hello to her', 3),
+ '###Hello': '###Hello',
+ '###Hello###': '###Hello###',
+ 'He###llo': 'He###llo',
+};
+
+const headersLevel4 = {
+ '#### Hello': headerWrapper('Hello', 4),
+ '#### Rocket.Cat': headerWrapper('Rocket.Cat', 4),
+ '#### Hi': headerWrapper('Hi', 4),
+ '#### Hello this is dog': headerWrapper('Hello this is dog', 4),
+ '#### Rocket cat says Hello': headerWrapper('Rocket cat says Hello', 4),
+ '#### He said Hello to her': headerWrapper('He said Hello to her', 4),
+ '####Hello': '####Hello',
+ '####Hello####': '####Hello####',
+ 'He####llo': 'He####llo',
+};
+
+const quote = {
+ '>Hello': s.escapeHTML('>Hello'),
+ '>Rocket.Cat': s.escapeHTML('>Rocket.Cat'),
+ '>Hi': s.escapeHTML('>Hi'),
+ '> Hello this is dog': s.escapeHTML('> Hello this is dog'),
+ '> Rocket cat says Hello': s.escapeHTML('> Rocket cat says Hello'),
+ '> He said Hello to her': s.escapeHTML('> He said Hello to her'),
+ '> He said Hello to her ': s.escapeHTML('> He said Hello to her '),
+ '<Hello': s.escapeHTML('<Hello'),
+ '<Rocket.Cat>': s.escapeHTML('<Rocket.Cat>'),
+ ' >Hi': s.escapeHTML(' >Hi'),
+ 'Hello > this is dog': s.escapeHTML('Hello > this is dog'),
+ 'Roc>ket cat says Hello': s.escapeHTML('Roc>ket cat says Hello'),
+ 'He said Hello to her>': s.escapeHTML('He said Hello to her>'),
+ '>Hello': quoteWrapper('Hello'),
+ '>Rocket.Cat': quoteWrapper('Rocket.Cat'),
+ '>Hi': quoteWrapper('Hi'),
+ '> Hello this is dog': quoteWrapper(' Hello this is dog'),
+ '> Rocket cat says Hello': quoteWrapper(' Rocket cat says Hello'),
+ '> He said Hello to her': quoteWrapper(' He said Hello to her'),
+ '': s.escapeHTML(''),
+ ' >Hi': s.escapeHTML(' >Hi'),
+ 'Hello > this is dog': s.escapeHTML('Hello > this is dog'),
+ 'Roc>ket cat says Hello': s.escapeHTML('Roc>ket cat says Hello'),
+ 'He said Hello to her>': s.escapeHTML('He said Hello to her>'),
+};
+
+const link = {
+ '<http://link|Text>': s.escapeHTML('<http://link|Text>'),
+ '<https://open.rocket.chat/|Open Site For Rocket.Chat>': s.escapeHTML('<https://open.rocket.chat/|Open Site For Rocket.Chat>'),
+ '<https://open.rocket.chat/ | Open Site For Rocket.Chat>': s.escapeHTML('<https://open.rocket.chat/ | Open Site For Rocket.Chat>'),
+ '<https://rocket.chat/|Rocket.Chat Site>': s.escapeHTML('<https://rocket.chat/|Rocket.Chat Site>'),
+ '<https://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>': s.escapeHTML('<https://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>'),
+ '<http://linkText>': s.escapeHTML('<http://linkText>'),
+ '<https:open.rocket.chat/ | Open Site For Rocket.Chat>': s.escapeHTML('<https:open.rocket.chat/ | Open Site For Rocket.Chat>'),
+ 'https://open.rocket.chat/|Open Site For Rocket.Chat': s.escapeHTML('https://open.rocket.chat/|Open Site For Rocket.Chat'),
+ '<www.open.rocket.chat/|Open Site For Rocket.Chat>': s.escapeHTML('<www.open.rocket.chat/|Open Site For Rocket.Chat>'),
+ '<htps://rocket.chat/|Rocket.Chat Site>': s.escapeHTML('<htps://rocket.chat/|Rocket.Chat Site>'),
+ '<ttps://rocket.chat/|Rocket.Chat Site>': s.escapeHTML('<ttps://rocket.chat/|Rocket.Chat Site>'),
+ '<tps://rocket.chat/|Rocket.Chat Site>': s.escapeHTML('<tps://rocket.chat/|Rocket.Chat Site>'),
+ '<open.rocket.chat/|Open Site For Rocket.Chat>': s.escapeHTML('<open.rocket.chat/|Open Site For Rocket.Chat>'),
+ '<htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>': s.escapeHTML('<htts://rocket.chat/docs/developer-guides/testing/#testing|Testing Entry on Rocket.Chat Docs Site>'),
+
+ '': linkWrapped('http://link', 'Text'),
+ '': linkWrapped('https://open.rocket.chat/', 'Open Site For Rocket.Chat'),
+ '': linkWrapped('https://open.rocket.chat/ ', ' Open Site For Rocket.Chat'),
+ '': linkWrapped('https://rocket.chat/', 'Rocket.Chat Site'),
+ '': linkWrapped('https://rocket.chat/docs/developer-guides/testing/#testing', 'Testing Entry on Rocket.Chat Docs Site'),
+ '': s.escapeHTML(''),
+ '': s.escapeHTML(''),
+ '': s.escapeHTML(''),
+ '': s.escapeHTML(''),
+ '': s.escapeHTML(''),
+ '': s.escapeHTML(''),
+ '': s.escapeHTML(''),
+ '': s.escapeHTML(''),
+
+ '[Text](http://link)': linkWrapped('http://link', 'Text'),
+ '[Open Site For Rocket.Chat](https://open.rocket.chat/)': linkWrapped('https://open.rocket.chat/', 'Open Site For Rocket.Chat'),
+ '[ Open Site For Rocket.Chat](https://open.rocket.chat/ )': linkWrapped('https://open.rocket.chat/ ', ' Open Site For Rocket.Chat'),
+ '[Rocket.Chat Site](https://rocket.chat/)': linkWrapped('https://rocket.chat/', 'Rocket.Chat Site'),
+ '[Testing Entry on Rocket.Chat Docs Site](https://rocket.chat/docs/developer-guides/testing/#testing)': linkWrapped('https://rocket.chat/docs/developer-guides/testing/#testing', 'Testing Entry on Rocket.Chat Docs Site'),
+ '[](http://linkText)': '[](http://linkText)',
+ '[text]': '[text]',
+ '[Open Site For Rocket.Chat](https:open.rocket.chat/)': '[Open Site For Rocket.Chat](https:open.rocket.chat/)',
+ '[Open Site For Rocket.Chat](www.open.rocket.chat/)': '[Open Site For Rocket.Chat](www.open.rocket.chat/)',
+ '[Rocket.Chat Site](htps://rocket.chat/)': '[Rocket.Chat Site](htps://rocket.chat/)',
+ '[Rocket.Chat Site](ttps://rocket.chat/)': '[Rocket.Chat Site](ttps://rocket.chat/)',
+ '[Rocket.Chat Site](tps://rocket.chat/)': '[Rocket.Chat Site](tps://rocket.chat/)',
+ '[Open Site For Rocket.Chat](open.rocket.chat/)': '[Open Site For Rocket.Chat](open.rocket.chat/)',
+ '[Testing Entry on Rocket.Chat Docs Site](htts://rocket.chat/docs/developer-guides/testing/#testing)': '[Testing Entry on Rocket.Chat Docs Site](htts://rocket.chat/docs/developer-guides/testing/#testing)',
+ '[Text](http://link?param1=1¶m2=2)': linkWrapped('http://link?param1=1¶m2=2', 'Text'),
+};
+
+const inlinecode = {
+ '`code`': inlinecodeWrapper('code'),
+ '`code` begin': `${ inlinecodeWrapper('code') } begin`,
+ 'End `code`': `End ${ inlinecodeWrapper('code') }`,
+ 'Middle `code` middle': `Middle ${ inlinecodeWrapper('code') } middle`,
+ '`code`begin': `${ inlinecodeWrapper('code') }begin`,
+ 'End`code`': `End${ inlinecodeWrapper('code') }`,
+ 'Middle`code`middle': `Middle${ inlinecodeWrapper('code') }middle`,
+};
+
+const code = {
+ '```code```': codeWrapper('code', 'clean'),
+ '```code': codeWrapper('code\n', 'stylus'),
+ '```code\n': codeWrapper('code\n', 'stylus'),
+ '```\ncode\n```': codeWrapper('code\n', 'stylus'),
+ '```code\n```': codeWrapper('code\n', 'stylus'),
+ '```\ncode```': codeWrapper('code', 'clean'),
+ '```javascript\nvar a = \'log\';\nconsole.log(a);```': codeWrapper('var a = \'log\';\nconsole.log(a);', 'javascript'),
+ '```*code*```': codeWrapper('*code*', 'armasm'),
+ '```**code**```': codeWrapper('**code**', 'armasm'),
+ '```_code_```': codeWrapper('_code_', 'sqf'),
+ '```__code__```': codeWrapper('__code__', 'markdown'),
+};
+
+const nested = {
+ '> some quote\n`window.location.reload();`': `${ quoteWrapper(' some quote') }${ inlinecodeWrapper('window.location.reload();') }`,
+};
+
+const defaultObjectTest = (result, object, objectKey) => assert.equal(result.html, object[objectKey]);
+
+const testObject = (object, parser = original, test = defaultObjectTest) => {
+ Object.keys(object).forEach((objectKey) => {
+ describe(objectKey, () => {
+ const message = {
+ html: s.escapeHTML(objectKey),
+ };
+ const result = Markdown.mountTokensBack(parser(message));
+ it(`should be equal to ${ object[objectKey] }`, () => {
+ test(result, object, objectKey);
+ });
+ });
+ });
+};
+
+describe('Original', function() {
+ describe('Bold', () => testObject(bold));
+
+ describe('Italic', () => testObject(italic));
+
+ describe('Strike', () => testObject(strike));
+
+ describe('Headers', () => {
+ describe('Level 1', () => testObject(headersLevel1));
+
+ describe('Level 2', () => testObject(headersLevel2));
+
+ describe('Level 3', () => testObject(headersLevel3));
+
+ describe('Level 4', () => testObject(headersLevel4));
+ });
+
+ describe('Quote', () => testObject(quote));
+
+ describe('Link', () => testObject(link));
+
+ describe('Inline Code', () => testObject(inlinecode));
+
+ describe('Code', () => testObject(code));
+
+ describe('Nested', () => testObject(nested));
+});
+
+// describe.only('Marked', function() {
+// describe('Bold', () => testObject(bold, marked));
+
+// describe('Italic', () => testObject(italic, marked));
+
+// describe('Strike', () => testObject(strike, marked));
+
+// describe('Headers', () => {
+// describe('Level 1', () => testObject(headersLevel1, marked));
+
+// describe('Level 2', () => testObject(headersLevel2, marked));
+
+// describe('Level 3', () => testObject(headersLevel3, marked));
+
+// describe('Level 4', () => testObject(headersLevel4, marked));
+// });
+
+// describe('Quote', () => testObject(quote, marked));
+// });
diff --git a/app/mentions-flextab/client/actionButton.js b/app/mentions-flextab/client/actionButton.js
new file mode 100644
index 000000000000..63eca8abccb6
--- /dev/null
+++ b/app/mentions-flextab/client/actionButton.js
@@ -0,0 +1,22 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { MessageAction, RoomHistoryManager } from '../../ui-utils';
+import { messageArgs } from '../../ui-utils/client/lib/messageArgs';
+
+Meteor.startup(function() {
+ MessageAction.addButton({
+ id: 'jump-to-message',
+ icon: 'jump',
+ label: 'Jump_to_message',
+ context: ['mentions', 'threads'],
+ action() {
+ const { msg: message } = messageArgs(this);
+ if (window.matchMedia('(max-width: 500px)').matches) {
+ Template.instance().tabBar.close();
+ }
+ RoomHistoryManager.getSurroundingMessages(message, 50);
+ },
+ order: 100,
+ group: 'menu',
+ });
+});
diff --git a/packages/rocketchat-mentions-flextab/client/index.js b/app/mentions-flextab/client/index.js
similarity index 100%
rename from packages/rocketchat-mentions-flextab/client/index.js
rename to app/mentions-flextab/client/index.js
diff --git a/packages/rocketchat-mentions-flextab/client/lib/MentionedMessage.js b/app/mentions-flextab/client/lib/MentionedMessage.js
similarity index 100%
rename from packages/rocketchat-mentions-flextab/client/lib/MentionedMessage.js
rename to app/mentions-flextab/client/lib/MentionedMessage.js
diff --git a/app/mentions-flextab/client/tabBar.js b/app/mentions-flextab/client/tabBar.js
new file mode 100644
index 000000000000..07bd5de84803
--- /dev/null
+++ b/app/mentions-flextab/client/tabBar.js
@@ -0,0 +1,13 @@
+import { Meteor } from 'meteor/meteor';
+import { TabBar } from '../../ui-utils';
+
+Meteor.startup(function() {
+ return TabBar.addButton({
+ groups: ['channel', 'group'],
+ id: 'mentions',
+ i18nTitle: 'Mentions',
+ icon: 'at',
+ template: 'mentionsFlexTab',
+ order: 3,
+ });
+});
diff --git a/app/mentions-flextab/client/views/mentionsFlexTab.html b/app/mentions-flextab/client/views/mentionsFlexTab.html
new file mode 100644
index 000000000000..bf8413811dff
--- /dev/null
+++ b/app/mentions-flextab/client/views/mentionsFlexTab.html
@@ -0,0 +1,21 @@
+
+ {{#if Template.subscriptionsReady}}
+ {{#unless hasMessages}}
+
+ {{/unless}}
+ {{/if}}
+
+
+ {{# with messageContext}}
+ {{#each msg in messages}}{{#nrr nrrargs 'message' msg=msg room=room subscription=subscription settings=settings u=u}}{{/nrr}}{{/each}}
+ {{/with}}
+
+ {{#if hasMore}}
+
+ {{> loading}}
+
+ {{/if}}
+
|
?)@(${ this.pattern }(@(${ this.pattern }))?)`, 'gm');
+ }
+
+ get channelMentionRegex() {
+ return new RegExp(`(^|\\s|
)#(${ this.pattern }(@(${ this.pattern }))?)`, 'gm');
+ }
+
+ replaceUsers = (msg, { mentions, temp }, me) => msg
+ .replace(this.userMentionRegex, (match, prefix, mention) => {
+ const classNames = ['mention-link'];
+
+ if (mention === 'all') {
+ classNames.push('mention-link--all');
+ classNames.push('mention-link--group');
+ } else if (mention === 'here') {
+ classNames.push('mention-link--here');
+ classNames.push('mention-link--group');
+ } else if (mention === me) {
+ classNames.push('mention-link--me');
+ classNames.push('mention-link--user');
+ } else {
+ classNames.push('mention-link--user');
+ }
+
+ const className = classNames.join(' ');
+
+ if (mention === 'all' || mention === 'here') {
+ return `${ prefix }${ mention }`;
+ }
+
+ const label = temp ?
+ mention && s.escapeHTML(mention) :
+ (mentions || [])
+ .filter(({ username }) => username === mention)
+ .map(({ name, username }) => (this.useRealName ? name : username))
+ .map((label) => label && s.escapeHTML(label))[0];
+
+ if (!label) {
+ return match;
+ }
+
+ return `${ prefix }${ label }`;
+ })
+
+ replaceChannels = (msg, { temp, channels }) => msg
+ .replace(/'/g, '\'')
+ .replace(this.channelMentionRegex, (match, prefix, mention) => {
+ if (!temp && !(channels && channels.find((c) => c.name === mention))) {
+ return match;
+ }
+
+ const channel = channels && channels.find(({ name }) => name === mention);
+ const reference = channel ? channel._id : mention;
+ return `${ prefix }${ `#${ mention }` }`;
+ })
+
+ getUserMentions(str) {
+ return (str.match(this.userMentionRegex) || []).map((match) => match.trim());
+ }
+
+ getChannelMentions(str) {
+ return (str.match(this.channelMentionRegex) || []).map((match) => match.trim());
+ }
+
+ parse(message) {
+ let msg = (message && message.html) || '';
+ if (!msg.trim()) {
+ return message;
+ }
+ msg = this.replaceUsers(msg, message, this.me);
+ msg = this.replaceChannels(msg, message, this.me);
+ message.html = msg;
+ return message;
+ }
+}
diff --git a/app/mentions/server/Mentions.js b/app/mentions/server/Mentions.js
new file mode 100644
index 000000000000..0d03dfdcc01c
--- /dev/null
+++ b/app/mentions/server/Mentions.js
@@ -0,0 +1,76 @@
+/*
+* Mentions is a named function that will process Mentions
+* @param {Object} message - The message object
+*/
+import { MentionsParser } from '../lib/MentionsParser';
+
+export default class MentionsServer extends MentionsParser {
+ constructor(args) {
+ super(args);
+ this.messageMaxAll = args.messageMaxAll;
+ this.getChannel = args.getChannel;
+ this.getChannels = args.getChannels;
+ this.getUsers = args.getUsers;
+ this.getUser = args.getUser;
+ this.getTotalChannelMembers = args.getTotalChannelMembers;
+ this.onMaxRoomMembersExceeded = args.onMaxRoomMembersExceeded || (() => {});
+ }
+ set getUsers(m) {
+ this._getUsers = m;
+ }
+ get getUsers() {
+ return typeof this._getUsers === 'function' ? this._getUsers : () => this._getUsers;
+ }
+ set getChannels(m) {
+ this._getChannels = m;
+ }
+ get getChannels() {
+ return typeof this._getChannels === 'function' ? this._getChannels : () => this._getChannels;
+ }
+ set getChannel(m) {
+ this._getChannel = m;
+ }
+ get getChannel() {
+ return typeof this._getChannel === 'function' ? this._getChannel : () => this._getChannel;
+ }
+ set messageMaxAll(m) {
+ this._messageMaxAll = m;
+ }
+ get messageMaxAll() {
+ return typeof this._messageMaxAll === 'function' ? this._messageMaxAll() : this._messageMaxAll;
+ }
+ getUsersByMentions({ msg, rid, u: sender }) {
+ let mentions = this.getUserMentions(msg);
+ const mentionsAll = [];
+ const userMentions = [];
+
+ mentions.forEach((m) => {
+ const mention = m.trim().substr(1);
+ if (mention !== 'all' && mention !== 'here') {
+ return userMentions.push(mention);
+ }
+ if (this.messageMaxAll > 0 && this.getTotalChannelMembers(rid) > this.messageMaxAll) {
+ return this.onMaxRoomMembersExceeded({ sender, rid });
+ }
+ mentionsAll.push({
+ _id: mention,
+ username: mention,
+ });
+ });
+ mentions = userMentions.length ? this.getUsers(userMentions) : [];
+ return [...mentionsAll, ...mentions];
+ }
+ getChannelbyMentions({ msg }) {
+ const channels = this.getChannelMentions(msg);
+ return this.getChannels(channels.map((c) => c.trim().substr(1)));
+ }
+ execute(message) {
+ const mentionsAll = this.getUsersByMentions(message);
+ const channels = this.getChannelbyMentions(message);
+
+ message.mentions = mentionsAll;
+ message.channels = channels;
+
+ return message;
+ }
+}
diff --git a/packages/rocketchat-mentions/server/index.js b/app/mentions/server/index.js
similarity index 100%
rename from packages/rocketchat-mentions/server/index.js
rename to app/mentions/server/index.js
diff --git a/app/mentions/server/methods/getUserMentionsByChannel.js b/app/mentions/server/methods/getUserMentionsByChannel.js
new file mode 100644
index 000000000000..d648ed811d05
--- /dev/null
+++ b/app/mentions/server/methods/getUserMentionsByChannel.js
@@ -0,0 +1,23 @@
+import { Meteor } from 'meteor/meteor';
+import { check } from 'meteor/check';
+import { Rooms, Users, Messages } from '../../../models';
+
+Meteor.methods({
+ getUserMentionsByChannel({ roomId, options }) {
+ check(roomId, String);
+
+ if (!Meteor.userId()) {
+ throw new Meteor.Error('error-invalid-user', 'Invalid user', { method: 'getUserMentionsByChannel' });
+ }
+
+ const room = Rooms.findOneById(roomId);
+
+ if (!room) {
+ throw new Meteor.Error('error-invalid-room', 'Invalid room', { method: 'getUserMentionsByChannel' });
+ }
+
+ const user = Users.findOneById(Meteor.userId());
+
+ return Messages.findVisibleByMentionAndRoomId(user.username, roomId, options).fetch();
+ },
+});
diff --git a/app/mentions/server/server.js b/app/mentions/server/server.js
new file mode 100644
index 000000000000..3012b300379a
--- /dev/null
+++ b/app/mentions/server/server.js
@@ -0,0 +1,38 @@
+import { Meteor } from 'meteor/meteor';
+import { Random } from 'meteor/random';
+import { TAPi18n } from 'meteor/tap:i18n';
+import { settings } from '../../settings';
+import { callbacks } from '../../callbacks';
+import { Notifications } from '../../notifications';
+import { Users, Subscriptions, Rooms } from '../../models';
+import _ from 'underscore';
+import MentionsServer from './Mentions';
+
+const mention = new MentionsServer({
+ pattern: () => settings.get('UTF8_Names_Validation'),
+ messageMaxAll: () => settings.get('Message_MaxAll'),
+ getUsers: (usernames) => Meteor.users.find({ username: { $in: _.unique(usernames) } }, { fields: { _id: true, username: true, name: 1 } }).fetch(),
+ getUser: (userId) => Users.findOneById(userId),
+ getTotalChannelMembers: (rid) => Subscriptions.findByRoomId(rid).count(),
+ getChannels: (channels) => Rooms.find({ name: { $in: _.unique(channels) }, t: { $in: ['c', 'p'] } }, { fields: { _id: 1, name: 1 } }).fetch(),
+ onMaxRoomMembersExceeded({ sender, rid }) {
+ // Get the language of the user for the error notification.
+ const { language } = this.getUser(sender._id);
+ const msg = TAPi18n.__('Group_mentions_disabled_x_members', { total: this.messageMaxAll }, language);
+
+ Notifications.notifyUser(sender._id, 'message', {
+ _id: Random.id(),
+ rid,
+ ts: new Date,
+ msg,
+ groupable: false,
+ });
+
+ // Also throw to stop propagation of 'sendMessage'.
+ throw new Meteor.Error('error-action-not-allowed', msg, {
+ method: 'filterATAllTag',
+ action: msg,
+ });
+ },
+});
+callbacks.add('beforeSaveMessage', (message) => mention.execute(message), callbacks.priority.HIGH, 'mentions');
diff --git a/app/mentions/tests/client.tests.js b/app/mentions/tests/client.tests.js
new file mode 100644
index 000000000000..d3af918771ad
--- /dev/null
+++ b/app/mentions/tests/client.tests.js
@@ -0,0 +1,370 @@
+/* eslint-env mocha */
+import 'babel-polyfill';
+import assert from 'assert';
+import { MentionsParser } from '../lib/MentionsParser';
+
+let mentionsParser;
+beforeEach(function functionName() {
+ mentionsParser = new MentionsParser({
+ pattern: '[0-9a-zA-Z-_.]+',
+ me: () => 'me',
+ });
+});
+
+describe('Mention', function() {
+ describe('get pattern', () => {
+ const regexp = '[0-9a-zA-Z-_.]+';
+ beforeEach(() => mentionsParser.pattern = () => regexp);
+
+ describe('by function', function functionName() {
+ it(`should be equal to ${ regexp }`, () => {
+ assert.equal(regexp, mentionsParser.pattern);
+ });
+ });
+
+ describe('by const', function functionName() {
+ it(`should be equal to ${ regexp }`, () => {
+ assert.equal(regexp, mentionsParser.pattern);
+ });
+ });
+ });
+
+ describe('get useRealName', () => {
+ beforeEach(() => mentionsParser.useRealName = () => true);
+
+ describe('by function', function functionName() {
+ it('should be true', () => {
+ assert.equal(true, mentionsParser.useRealName);
+ });
+ });
+
+ describe('by const', function functionName() {
+ it('should be true', () => {
+ assert.equal(true, mentionsParser.useRealName);
+ });
+ });
+ });
+
+ describe('get me', () => {
+ const me = 'me';
+
+ describe('by function', function functionName() {
+ beforeEach(() => mentionsParser.me = () => me);
+
+ it(`should be equal to ${ me }`, () => {
+ assert.equal(me, mentionsParser.me);
+ });
+ });
+
+ describe('by const', function functionName() {
+ beforeEach(() => mentionsParser.me = me);
+
+ it(`should be equal to ${ me }`, () => {
+ assert.equal(me, mentionsParser.me);
+ });
+ });
+ });
+
+ describe('getUserMentions', function functionName() {
+ describe('for simple text, no mentions', () => {
+ const result = [];
+ [
+ '#rocket.cat',
+ 'hello rocket.cat how are you?',
+ ]
+ .forEach((text) => {
+ it(`should return "${ JSON.stringify(result) }" from "${ text }"`, () => {
+ assert.deepEqual(result, mentionsParser.getUserMentions(text));
+ });
+ });
+ });
+
+ describe('for one user', () => {
+ const result = ['@rocket.cat'];
+ [
+ '@rocket.cat',
+ ' @rocket.cat ',
+ 'hello @rocket.cat',
+ // 'hello,@rocket.cat', // this test case is ignored since is not compatible with the message box behavior
+ '@rocket.cat, hello',
+ '@rocket.cat,hello',
+ 'hello @rocket.cat how are you?',
+ ]
+ .forEach((text) => {
+ it(`should return "${ JSON.stringify(result) }" from "${ text }"`, () => {
+ assert.deepEqual(result, mentionsParser.getUserMentions(text));
+ });
+ });
+
+ it.skip('should return without the "." from "@rocket.cat."', () => {
+ assert.deepEqual(result, mentionsParser.getUserMentions('@rocket.cat.'));
+ });
+
+ it.skip('should return without the "_" from "@rocket.cat_"', () => {
+ assert.deepEqual(result, mentionsParser.getUserMentions('@rocket.cat_'));
+ });
+
+ it.skip('should return without the "-" from "@rocket.cat-"', () => {
+ assert.deepEqual(result, mentionsParser.getUserMentions('@rocket.cat-'));
+ });
+ });
+
+ describe('for two users', () => {
+ const result = ['@rocket.cat', '@all'];
+ [
+ '@rocket.cat @all',
+ ' @rocket.cat @all ',
+ 'hello @rocket.cat and @all',
+ '@rocket.cat, hello @all',
+ 'hello @rocket.cat and @all how are you?',
+ ]
+ .forEach((text) => {
+ it(`should return "${ JSON.stringify(result) }" from "${ text }"`, () => {
+ assert.deepEqual(result, mentionsParser.getUserMentions(text));
+ });
+ });
+ });
+ });
+
+ describe('getChannelMentions', function functionName() {
+ describe('for simple text, no mentions', () => {
+ const result = [];
+ [
+ '@rocket.cat',
+ 'hello rocket.cat how are you?',
+ ]
+ .forEach((text) => {
+ it(`should return "${ JSON.stringify(result) }" from "${ text }"`, () => {
+ assert.deepEqual(result, mentionsParser.getChannelMentions(text));
+ });
+ });
+ });
+
+ describe('for one channel', () => {
+ const result = ['#general'];
+ [
+ '#general',
+ ' #general ',
+ 'hello #general',
+ '#general, hello',
+ 'hello #general, how are you?',
+ ].forEach((text) => {
+ it(`should return "${ JSON.stringify(result) }" from "${ text }"`, () => {
+ assert.deepEqual(result, mentionsParser.getChannelMentions(text));
+ });
+ });
+
+ it.skip('should return without the "." from "#general."', () => {
+ assert.deepEqual(result, mentionsParser.getUserMentions('#general.'));
+ });
+
+ it.skip('should return without the "_" from "#general_"', () => {
+ assert.deepEqual(result, mentionsParser.getUserMentions('#general_'));
+ });
+
+ it.skip('should return without the "-" from "#general."', () => {
+ assert.deepEqual(result, mentionsParser.getUserMentions('#general-'));
+ });
+ });
+
+ describe('for two channels', () => {
+ const result = ['#general', '#other'];
+ [
+ '#general #other',
+ ' #general #other',
+ 'hello #general and #other',
+ '#general, hello #other',
+ 'hello #general #other, how are you?',
+ ].forEach((text) => {
+ it(`should return "${ JSON.stringify(result) }" from "${ text }"`, () => {
+ assert.deepEqual(result, mentionsParser.getChannelMentions(text));
+ });
+ });
+ });
+
+ describe('for url with fragments', () => {
+ const result = [];
+ [
+ 'http://localhost/#general',
+ ].forEach((text) => {
+ it(`should return nothing from "${ text }"`, () => {
+ assert.deepEqual(result, mentionsParser.getChannelMentions(text));
+ });
+ });
+ });
+
+ describe('for messages with url and channels', () => {
+ const result = ['#general'];
+ [
+ 'http://localhost/#general #general',
+ ].forEach((text) => {
+ it(`should return "${ JSON.stringify(result) }" from "${ text }"`, () => {
+ assert.deepEqual(result, mentionsParser.getChannelMentions(text));
+ });
+ });
+ });
+ });
+});
+
+const message = {
+ mentions: [{ username: 'rocket.cat', name: 'Rocket.Cat' }, { username: 'admin', name: 'Admin' }, { username: 'me', name: 'Me' }, { username: 'specialchars', name: '![]()
' }],
+ channels: [{ name: 'general', _id: '42' }, { name: 'rocket.cat', _id: '169' }],
+};
+
+describe('replace methods', function() {
+ describe('replaceUsers', () => {
+ it('should render for @all', () => {
+ const result = mentionsParser.replaceUsers('@all', message, 'me');
+ assert.equal(result, 'all');
+ });
+
+ const str2 = 'rocket.cat';
+
+ it(`should render for "@${ str2 }"`, () => {
+ const result = mentionsParser.replaceUsers(`@${ str2 }`, message, 'me');
+ assert.equal(result, `${ str2 }`);
+ });
+
+ it(`should render for "hello ${ str2 }"`, () => {
+ const result = mentionsParser.replaceUsers(`hello @${ str2 }`, message, 'me');
+ assert.equal(result, `hello ${ str2 }`);
+ });
+
+ it('should render for unknow/private user "hello @unknow"', () => {
+ const result = mentionsParser.replaceUsers('hello @unknow', message, 'me');
+ assert.equal(result, 'hello @unknow');
+ });
+
+ it('should render for me', () => {
+ const result = mentionsParser.replaceUsers('hello @me', message, 'me');
+ assert.equal(result, 'hello me');
+ });
+ });
+
+ describe('replaceUsers (RealNames)', () => {
+ beforeEach(() => {
+ mentionsParser.useRealName = () => true;
+ });
+
+ it('should render for @all', () => {
+ const result = mentionsParser.replaceUsers('@all', message, 'me');
+ assert.equal(result, 'all');
+ });
+
+ const str2 = 'rocket.cat';
+ const str2Name = 'Rocket.Cat';
+
+ it(`should render for "@${ str2 }"`, () => {
+ const result = mentionsParser.replaceUsers(`@${ str2 }`, message, 'me');
+ assert.equal(result, `${ str2Name }`);
+ });
+
+ it(`should render for "hello @${ str2 }"`, () => {
+ const result = mentionsParser.replaceUsers(`hello @${ str2 }`, message, 'me');
+ assert.equal(result, `hello ${ str2Name }`);
+ });
+
+ const specialchars = 'specialchars';
+ const specialcharsName = '<img onerror=alert(hello)>';
+
+ it(`should escape special characters in "hello @${ specialchars }"`, () => {
+ const result = mentionsParser.replaceUsers(`hello @${ specialchars }`, message, 'me');
+ assert.equal(result, `hello ${ specialcharsName }`);
+ });
+
+ it(`should render for "hello
@${ str2 }
"`, () => {
+ const result = mentionsParser.replaceUsers(`hello
@${ str2 }
`, message, 'me');
+ assert.equal(result, `hello
${ str2Name }
`);
+ });
+
+ it('should render for unknow/private user "hello @unknow"', () => {
+ const result = mentionsParser.replaceUsers('hello @unknow', message, 'me');
+ assert.equal(result, 'hello @unknow');
+ });
+
+ it('should render for me', () => {
+ const result = mentionsParser.replaceUsers('hello @me', message, 'me');
+ assert.equal(result, 'hello Me');
+ });
+ });
+
+ describe('replaceChannels', () => {
+ it('should render for #general', () => {
+ const result = mentionsParser.replaceChannels('#general', message);
+ assert.equal('#general', result);
+ });
+
+ const str2 = '#rocket.cat';
+
+ it(`should render for ${ str2 }`, () => {
+ const result = mentionsParser.replaceChannels(str2, message);
+ assert.equal(result, `${ str2 }`);
+ });
+
+ it(`should render for "hello ${ str2 }"`, () => {
+ const result = mentionsParser.replaceChannels(`hello ${ str2 }`, message);
+ assert.equal(result, `hello ${ str2 }`);
+ });
+
+ it('should render for unknow/private channel "hello #unknow"', () => {
+ const result = mentionsParser.replaceChannels('hello #unknow', message);
+ assert.equal(result, 'hello #unknow');
+ });
+ });
+
+ describe('parse all', () => {
+ it('should render for #general', () => {
+ message.html = '#general';
+ const result = mentionsParser.parse(message, 'me');
+ assert.equal(result.html, '#general');
+ });
+
+ it('should render for "#general and @rocket.cat', () => {
+ message.html = '#general and @rocket.cat';
+ const result = mentionsParser.parse(message, 'me');
+ assert.equal(result.html, '#general and rocket.cat');
+ });
+
+ it('should render for "', () => {
+ message.html = '';
+ const result = mentionsParser.parse(message, 'me');
+ assert.equal(result.html, '');
+ });
+
+ it('should render for "simple text', () => {
+ message.html = 'simple text';
+ const result = mentionsParser.parse(message, 'me');
+ assert.equal(result.html, 'simple text');
+ });
+ });
+
+ describe('parse all (RealNames)', () => {
+ beforeEach(() => {
+ mentionsParser.useRealName = () => true;
+ });
+
+ it('should render for #general', () => {
+ message.html = '#general';
+ const result = mentionsParser.parse(message, 'me');
+ assert.equal(result.html, '#general');
+ });
+
+ it('should render for "#general and @rocket.cat', () => {
+ message.html = '#general and @rocket.cat';
+ const result = mentionsParser.parse(message, 'me');
+ assert.equal(result.html, '#general and Rocket.Cat');
+ });
+
+ it('should render for "', () => {
+ message.html = '';
+ const result = mentionsParser.parse(message, 'me');
+ assert.equal(result.html, '');
+ });
+
+ it('should render for "simple text', () => {
+ message.html = 'simple text';
+ const result = mentionsParser.parse(message, 'me');
+ assert.equal(result.html, 'simple text');
+ });
+ });
+});
diff --git a/packages/rocketchat-mentions/tests/server.tests.js b/app/mentions/tests/server.tests.js
similarity index 100%
rename from packages/rocketchat-mentions/tests/server.tests.js
rename to app/mentions/tests/server.tests.js
diff --git a/packages/rocketchat-message-action/client/index.js b/app/message-action/client/index.js
similarity index 100%
rename from packages/rocketchat-message-action/client/index.js
rename to app/message-action/client/index.js
diff --git a/packages/rocketchat-message-action/client/messageAction.html b/app/message-action/client/messageAction.html
similarity index 81%
rename from packages/rocketchat-message-action/client/messageAction.html
rename to app/message-action/client/messageAction.html
index 872c52d58bb3..8d6c73566772 100644
--- a/packages/rocketchat-message-action/client/messageAction.html
+++ b/app/message-action/client/messageAction.html
@@ -9,7 +9,7 @@
{{/if}}
{{#if msg_in_chat_window}}
-
{{/if}}
{{#if msg_in_chat_window}}
-
