[Rocket.Chat](https://rocket.chat) is an open-source fully customizable communications platform developed in JavaScript for organizations with high standards of data protection.
diff --git a/app/analytics/client/loadScript.js b/app/analytics/client/loadScript.js
index 4cd8ad84aefff..491f340e734be 100644
--- a/app/analytics/client/loadScript.js
+++ b/app/analytics/client/loadScript.js
@@ -2,6 +2,7 @@ import { Meteor } from 'meteor/meteor';
import { Template } from 'meteor/templating';
import { settings } from '../../settings';
+import { hex_sha1 } from '../../utils';
Template.body.onRendered(function() {
this.autorun((c) => {
@@ -77,7 +78,19 @@ Template.body.onRendered(function() {
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', googleId, 'auto');
- ga('send', 'pageview');
+
+ // WIDECHAT - obfuscate username in GA
+ const pathArray = document.location.pathname.split('/');
+ if (pathArray[1] === 'direct') {
+ const hashedUsername = hex_sha1(pathArray[2]);
+ const page = document.location.pathname.replace(pathArray[2], hashedUsername);
+
+ ga('set', 'location', page);
+ ga('send', 'pageview', page);
+
+ } else {
+ ga('send', 'pageview');
+ }
/* eslint-enable */
}
}
diff --git a/app/analytics/client/trackEvents.js b/app/analytics/client/trackEvents.js
index 46364603cbdd7..99cfe4ed1b50f 100644
--- a/app/analytics/client/trackEvents.js
+++ b/app/analytics/client/trackEvents.js
@@ -5,6 +5,7 @@ import { Tracker } from 'meteor/tracker';
import { settings } from '../../settings';
import { callbacks } from '../../callbacks';
import { ChatRoom } from '../../models';
+import { hex_sha1 } from '../../utils';
function trackEvent(category, action, label) {
if (window._paq) {
@@ -26,7 +27,14 @@ if (!window._paq || window.ga) {
window._paq.push(['trackPageView']);
}
if (window.ga) {
- window.ga('send', 'pageview', route.path);
+ const pathArray = route.path.split('/');
+ if (pathArray[1] === 'direct') {
+ const hashedUsername = hex_sha1(pathArray[2]);
+ const page = route.path.replace(pathArray[2], hashedUsername);
+ window.ga('send', 'pageview', page);
+ } else {
+ window.ga('send', 'pageview', route.path);
+ }
}
}]);
diff --git a/app/analytics/server/index.js b/app/analytics/server/index.js
index 97097791afdc4..5226ba2273b73 100644
--- a/app/analytics/server/index.js
+++ b/app/analytics/server/index.js
@@ -1 +1,2 @@
import './settings';
+import './trackEvents';
diff --git a/app/analytics/server/trackEvents.js b/app/analytics/server/trackEvents.js
new file mode 100644
index 0000000000000..60413b9ef2722
--- /dev/null
+++ b/app/analytics/server/trackEvents.js
@@ -0,0 +1,34 @@
+import { Meteor } from 'meteor/meteor';
+import { HTTP } from 'meteor/http';
+import { callbacks } from '../../callbacks';
+import { settings } from '../../settings';
+
+const gaEndpoint = 'https://www.google-analytics.com/collect?';
+
+let googleId = '';
+
+Meteor.startup(() => {
+ googleId = settings.get('GoogleAnalytics_enabled') && settings.get('GoogleAnalytics_ID');
+});
+
+// Send Google Analytics
+function trackEvent(category, action, label, cid) {
+ if (googleId) {
+ HTTP.call('POST', gaEndpoint,
+ { params: {
+ v: '1',
+ ds: 'server',
+ tid: googleId,
+ cid: cid,
+ t: 'event',
+ ec: category,
+ ea: action,
+ el: label,
+ } }
+ );
+ }
+}
+
+callbacks.add('customOauthRegisterNewUser', (uid) => {
+ trackEvent('User', 'Registered', 'CustomOauth', uid);
+}, callbacks.priority.MEDIUM, 'analytics-login-state-change');
diff --git a/app/api/server/helpers/getUserInfo.js b/app/api/server/helpers/getUserInfo.js
index 2d2daee1af344..49dc069a5e1e4 100644
--- a/app/api/server/helpers/getUserInfo.js
+++ b/app/api/server/helpers/getUserInfo.js
@@ -33,5 +33,30 @@ API.helperMethods.set('getUserInfo', function _getUserInfo(me) {
},
};
+ me.telephoneNumber = '';
+ let phoneFieldName = '';
+
+ settings.get('Contacts_Phone_Custom_Field_Name', function(name, fieldName) {
+ phoneFieldName = fieldName;
+ });
+
+ let phoneFieldArray = [];
+ if (phoneFieldName) {
+ phoneFieldArray = phoneFieldName.split(',');
+ }
+
+ if (phoneFieldArray.length > 0) {
+ let dict = me;
+ for (let i = 0; i < phoneFieldArray.length - 1; i++) {
+ if (phoneFieldArray[i] in dict) {
+ dict = dict[phoneFieldArray[i]];
+ }
+ }
+ const phone = dict[phoneFieldArray[phoneFieldArray.length - 1]];
+ if (phone) {
+ me.telephoneNumber = phone;
+ }
+ }
+
return me;
});
diff --git a/app/api/server/v1/chat.js b/app/api/server/v1/chat.js
index 047c84e77a68c..077f3187f6de0 100644
--- a/app/api/server/v1/chat.js
+++ b/app/api/server/v1/chat.js
@@ -128,7 +128,23 @@ API.v1.addRoute('chat.pinMessage', { authRequired: true }, {
API.v1.addRoute('chat.postMessage', { authRequired: true }, {
post() {
- const messageReturn = processWebhookMessage(this.bodyParams, this.user)[0];
+ // WIDECHAT only
+ let messageReturn;
+ if (this.user.username === settings.get('Notification_Service_User_Username')) {
+ const { hostname_id } = this.requestParams();
+ if (!hostname_id) {
+ throw new Meteor.Error('error-hostname-id-not-provided', 'Body param "hostname_id" is required');
+ }
+ const hostuser = Users.findOneById(hostname_id);
+ messageReturn = processWebhookMessage(this.bodyParams, hostuser, undefined, true)[0];
+ } else {
+ messageReturn = processWebhookMessage(this.bodyParams, this.user, undefined, true)[0];
+ }
+ //
+
+ // RC code
+ // const messageReturn = processWebhookMessage(this.bodyParams, this.user)[0];
+
if (!messageReturn) {
return API.v1.failure('unknown-error');
diff --git a/app/api/server/v1/misc.js b/app/api/server/v1/misc.js
index 01376658e4eb3..936df8c9ed899 100644
--- a/app/api/server/v1/misc.js
+++ b/app/api/server/v1/misc.js
@@ -222,6 +222,21 @@ API.v1.addRoute('directory', { authRequired: true }, {
},
});
+API.v1.addRoute('manifest', { authRequired: false }, {
+ get() {
+ const manifestFile = require('../../../../public/manifest.json');
+ const gcm_sender_id = settings.get('Gcm_sender_id');
+ const manifest = {
+ ...manifestFile,
+ gcm_sender_id,
+ };
+ return {
+ headers: { 'Content-Type': 'application/json;charset=utf-8' },
+ body: manifest,
+ };
+ },
+});
+
API.v1.addRoute('stdout.queue', { authRequired: true }, {
get() {
if (!hasPermission(this.userId, 'view-logs')) {
diff --git a/app/api/server/v1/settings.js b/app/api/server/v1/settings.js
index c7a7ca33c97f8..4899b32cc370d 100644
--- a/app/api/server/v1/settings.js
+++ b/app/api/server/v1/settings.js
@@ -88,6 +88,21 @@ API.v1.addRoute('settings.addCustomOAuth', { authRequired: true, twoFactorRequir
},
});
+API.v1.addRoute('settings.addCustomOAuthWithSettings', { authRequired: true }, {
+ post() {
+ if (!this.requestParams().name || !this.requestParams().name.trim()) {
+ throw new Meteor.Error('error-name-param-not-provided', 'The parameter "name" is required');
+ }
+
+ Meteor.runAsUser(this.userId, () => {
+ Meteor.call('addOAuthServiceWithSettings', this.requestParams().name, this.requestParams());
+ });
+
+
+ return API.v1.success();
+ },
+});
+
API.v1.addRoute('settings', { authRequired: true }, {
get() {
const { offset, count } = this.getPaginationItems();
diff --git a/app/apps/server/bridges/api.ts b/app/apps/server/bridges/api.ts
index 277fdbd3d7b00..afa9b4649cc75 100644
--- a/app/apps/server/bridges/api.ts
+++ b/app/apps/server/bridges/api.ts
@@ -111,8 +111,12 @@ export class AppApisBridge extends ApiBridge {
res.set(headers);
res.status(status);
res.send(content);
+ if (status !== 200) {
+ this.orch.errorLog(`The endpoint /${ endpoint.path } of the App ${ appId } failed. \n${ JSON.stringify(request) }\nStatus Code: ${ status } Response: ${ JSON.stringify(content) }`);
+ }
})
.catch((reason) => {
+ this.orch.errorLog(reason);
// Should we handle this as an error?
res.status(500).send(reason.message);
});
diff --git a/app/apps/server/bridges/listeners.js b/app/apps/server/bridges/listeners.js
index 8e0bed83f0110..aeae13c12ec66 100644
--- a/app/apps/server/bridges/listeners.js
+++ b/app/apps/server/bridges/listeners.js
@@ -31,6 +31,8 @@ export class AppListenerBridge {
case AppInterface.IPreRoomUserLeave:
case AppInterface.IPostRoomUserLeave:
return 'roomEvent';
+ case AppInterface.IRoomUserTyping:
+ return 'typingEvent';
/**
* @deprecated please prefer the AppInterface.IPostLivechatRoomClosed event
*/
@@ -98,6 +100,10 @@ export class AppListenerBridge {
return this.orch.getConverters().get('rooms').convertAppRoom(result);
}
+ async typingEvent(inte, data) {
+ return this.orch.getManager().getListenerManager().executeListener(inte, data);
+ }
+
async livechatEvent(inte, data) {
switch (inte) {
case AppInterface.IPostLivechatAgentAssigned:
diff --git a/app/apps/server/bridges/scheduler.ts b/app/apps/server/bridges/scheduler.ts
index 0676178c84de6..856d7859eb714 100644
--- a/app/apps/server/bridges/scheduler.ts
+++ b/app/apps/server/bridges/scheduler.ts
@@ -184,6 +184,24 @@ export class AppSchedulerBridge extends SchedulerBridge {
}
}
+ /**
+ * Cancels running jobs given its data query
+ *
+ * @param {object} data
+ *
+ * @returns Promise{Visit_Site_Url_and_try_the_best_open_source_chat_solution_available_today}
{Join_Chat}', { + this.add('Invitation_Email', '{Invitation_Email_Default}', { type: 'code', code: 'text/html', multiline: true, diff --git a/app/lib/server/startup/settings.js b/app/lib/server/startup/settings.js index 18720214f4ed5..217dd9b3eaf82 100644 --- a/app/lib/server/startup/settings.js +++ b/app/lib/server/startup/settings.js @@ -529,6 +529,27 @@ settings.addGroup('Accounts', function() { i18nLabel: 'Enable_message_parser_early_adoption', alert: 'Enable_message_parser_early_adoption_alert', }); + + this.add('Accounts_Default_User_Preferences_discoverability', 'all', { + type: 'select', + values: [ + { + key: 'all', + i18nLabel: 'Everyone', + }, + { + key: 'contacts', + i18nLabel: 'My Contacts', + }, + { + key: 'none', + i18nLabel: 'Nobody', + }, + ], + + public: true, + i18nLabel: 'Discoverability', + }); }); this.section('Avatar', function() { @@ -1021,6 +1042,14 @@ settings.addGroup('General', function() { public: true, i18nDescription: 'Notifications_Max_Room_Members_Description', }); + this.add('Notifications_Always_Notify_Mobile', false, { + type: 'boolean', + public: true, + i18nDescription: 'Notifications_Always_Notify_Mobile_Description', + }); + this.add('Notification_Service_User_Username', 'viasat.notification.service', { + type: 'string', + }); }); this.section('REST API', function() { return this.add('API_User_Limit', 500, { @@ -1101,6 +1130,11 @@ settings.addGroup('Message', function() { type: 'boolean', public: true, }); + this.add('Message_AllowPrefetch_PrefetchRoomLimit', 20, { + type: 'int', + public: true, + i18nDescription: 'Message_AllowPrefetch_PrefetchRoomLimit', + }); this.add('Message_AllowEditing_BlockEditInMinutes', 0, { type: 'int', public: true, @@ -1386,11 +1420,27 @@ settings.addGroup('Push', function() { enableQuery: [], secret: true, }); + this.add('Vapid_public_key', '', { + type: 'string', + public: true, + }); + this.add('Vapid_private_key', '', { + type: 'string', + secret: true, + }); + this.add('Vapid_subject', 'https://www.viasat.com', { + type: 'string', + public: false, + }); this.add('Push_gcm_api_key', '', { type: 'string', enableQuery: [], secret: true, }); + this.add('Gcm_sender_id', '', { + type: 'string', + public: true, + }); return this.add('Push_gcm_project_number', '', { type: 'string', public: true, @@ -1486,6 +1536,58 @@ settings.addGroup('Layout', function() { type: 'boolean', public: true, }); + this.add('UI_DisplayLocalization', true, { + type: 'boolean', + public: true, + }); + this.add('UI_DisplayPrivacy', true, { + type: 'boolean', + public: true, + }); + this.add('UI_DisplayUserPresence', true, { + type: 'boolean', + public: true, + }); + this.add('UI_DisplayNotifications', true, { + type: 'boolean', + public: true, + }); + this.add('UI_DisplayMessages', true, { + type: 'boolean', + public: true, + }); + this.add('UI_DisplaySidebar', true, { + type: 'boolean', + public: true, + }); + this.add('UI_DisplayHighlights', true, { + type: 'boolean', + public: true, + }); + this.add('UI_DisplaySound', true, { + type: 'boolean', + public: true, + }); + this.add('UI_DisplayMyData', true, { + type: 'boolean', + public: true, + }); + this.add('UI_DisplayDirectory', true, { + type: 'boolean', + public: true, + }); + this.add('UI_Display_Security', true, { + type: 'boolean', + public: true, + }); + this.add('UI_Display_Integrations', true, { + type: 'boolean', + public: true, + }); + this.add('UI_Display_Personal_Access_Tokens', true, { + type: 'boolean', + public: true, + }); this.add('UI_Group_Channels_By_Type', true, { type: 'boolean', public: false, diff --git a/app/livechat/client/collections/LivechatFilters.js b/app/livechat/client/collections/LivechatFilters.js new file mode 100644 index 0000000000000..ac2f9619507fa --- /dev/null +++ b/app/livechat/client/collections/LivechatFilters.js @@ -0,0 +1,3 @@ +import { Mongo } from 'meteor/mongo'; + +export const LivechatFilter = new Mongo.Collection('rocketchat_livechat_filter'); diff --git a/app/livechat/imports/server/rest/filters.js b/app/livechat/imports/server/rest/filters.js new file mode 100644 index 0000000000000..0f6ee82e37d42 --- /dev/null +++ b/app/livechat/imports/server/rest/filters.js @@ -0,0 +1,63 @@ +import { Meteor } from 'meteor/meteor'; +import { check } from 'meteor/check'; + +import { API } from '../../../../api/server'; +import { findFilters, findFilterById } from '../../../server/api/lib/filters'; + +API.v1.addRoute('livechat/filter', { authRequired: true }, { + post() { + try { + check(this.bodyParams, { + _id: String, + name: String, + description: String, + enabled: Boolean, + regex: String, + slug: String, + }); + + API.v1.success( + Meteor.runAsUser(this.userId, + () => Meteor.call('livechat:saveFilter', this.bodyParams), + ), + ); + } catch (e) { + return API.v1.failure(e); + } + }, +}); + +API.v1.addRoute('livechat/filters', { authRequired: true }, { + get() { + const { offset, count } = this.getPaginationItems(); + const { sort } = this.parseJsonQuery(); + + const filters = Promise.await(findFilters({ + userId: this.userId, + pagination: { + offset, + count, + sort, + }, + })); + + return API.v1.success(filters); + }, +}); + +API.v1.addRoute('livechat/filters/:_id', { authRequired: true }, { + get() { + check(this.urlParams, { + _id: String, + }); + + const filter = Promise.await(findFilterById({ + userId: this.userId, + filterId: this.urlParams._id, + })); + + return API.v1.success({ + filter, + }); + }, +}); diff --git a/app/livechat/imports/server/rest/triggers.js b/app/livechat/imports/server/rest/triggers.js index de3d0b57f27bd..b766a7455ca95 100644 --- a/app/livechat/imports/server/rest/triggers.js +++ b/app/livechat/imports/server/rest/triggers.js @@ -1,8 +1,34 @@ +import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { API } from '../../../../api/server'; import { findTriggers, findTriggerById } from '../../../server/api/lib/triggers'; +API.v1.addRoute('livechat/trigger', { authRequired: true }, { + post() { + try { + check(this.bodyParams, { + _id: String, + name: String, + description: String, + enabled: Boolean, + runOnce: Boolean, + registeredOnly: Boolean, + conditions: Array, + actions: Array, + }); + + API.v1.success( + Meteor.runAsUser(this.userId, + () => Meteor.call('livechat:saveTrigger', this.bodyParams), + ), + ); + } catch (e) { + return API.v1.failure(e); + } + }, +}); + API.v1.addRoute('livechat/triggers', { authRequired: true }, { get() { const { offset, count } = this.getPaginationItems(); diff --git a/app/livechat/server/api.js b/app/livechat/server/api.js index 6a13dddc86bf8..5a137b0c14d82 100644 --- a/app/livechat/server/api.js +++ b/app/livechat/server/api.js @@ -7,6 +7,7 @@ import '../imports/server/rest/upload.js'; import '../imports/server/rest/inquiries.js'; import '../imports/server/rest/rooms.js'; import '../imports/server/rest/appearance.js'; +import '../imports/server/rest/filters.js'; import '../imports/server/rest/triggers.js'; import '../imports/server/rest/integrations.js'; import '../imports/server/rest/messages.js'; diff --git a/app/livechat/server/api/lib/filters.js b/app/livechat/server/api/lib/filters.js new file mode 100644 index 0000000000000..e6cd76b06e8e5 --- /dev/null +++ b/app/livechat/server/api/lib/filters.js @@ -0,0 +1,33 @@ +import { hasPermissionAsync } from '../../../../authorization/server/functions/hasPermission'; +import { LivechatFilter } from '../../../../models/server/raw'; + +export async function findFilters({ userId, pagination: { offset, count, sort } }) { + if (!await hasPermissionAsync(userId, 'view-livechat-manager')) { + throw new Error('error-not-authorized'); + } + + const cursor = await LivechatFilter.find({}, { + sort: sort || { name: 1 }, + skip: offset, + limit: count, + }); + + const total = await cursor.count(); + + const filters = await cursor.toArray(); + + return { + filters, + count: filters.length, + offset, + total, + }; +} + +export async function findFilterById({ userId, filterId }) { + if (!await hasPermissionAsync(userId, 'view-livechat-manager')) { + throw new Error('error-not-authorized'); + } + + return LivechatFilter.findOneById(filterId); +} diff --git a/app/livechat/server/api/lib/livechat.js b/app/livechat/server/api/lib/livechat.js index a7a29598250f3..701b5f7f3d259 100644 --- a/app/livechat/server/api/lib/livechat.js +++ b/app/livechat/server/api/lib/livechat.js @@ -1,17 +1,25 @@ +import URL from 'url'; + import { Meteor } from 'meteor/meteor'; import { Random } from 'meteor/random'; +import _ from 'underscore'; -import { LivechatRooms, LivechatVisitors, LivechatDepartment, LivechatTrigger, EmojiCustom } from '../../../../models/server'; +import { LivechatRooms, LivechatVisitors, LivechatDepartment, LivechatTrigger, LivechatFilter, EmojiCustom } from '../../../../models/server'; import { Livechat } from '../../lib/Livechat'; import { callbacks } from '../../../../callbacks/server'; import { normalizeAgent } from '../../lib/Helper'; +import { Apps, AppEvents } from '../../../../apps/server'; export function online(department) { return Livechat.online(department); } +export function findFilters() { + return LivechatFilter.findEnabled().fetch().map((filter) => _.pick(filter, '_id', 'regex', 'slug')); +} + export function findTriggers() { - return LivechatTrigger.findEnabled().fetch().map(({ _id, actions, conditions, runOnce }) => ({ _id, actions, conditions, runOnce })); + return LivechatTrigger.findEnabled().fetch().map(({ _id, actions, conditions, runOnce, registeredOnly }) => ({ _id, actions, conditions, runOnce, registeredOnly })); } export function findDepartments() { @@ -58,10 +66,18 @@ export function findOpenRoom(token, departmentId) { }, }; + let room; const rooms = departmentId ? LivechatRooms.findOpenByVisitorTokenAndDepartmentId(token, departmentId, options).fetch() : LivechatRooms.findOpenByVisitorToken(token, options).fetch(); if (rooms && rooms.length > 0) { - return rooms[0]; + room = rooms[0]; } + + if (room) { + Livechat.addTypingListener(room._id, (username, typing, data) => { + Apps.triggerEvent(AppEvents.IRoomUserTyping, { roomId: room._id, username, typing, data }); + }); + } + return room; } export function getRoom({ guest, rid, roomInfo, agent, extraParams }) { @@ -75,6 +91,10 @@ export function getRoom({ guest, rid, roomInfo, agent, extraParams }) { ts: new Date(), }; + Livechat.addTypingListener(rid, (username, typing, data) => { + Apps.triggerEvent(AppEvents.IRoomUserTyping, { roomId: rid, username, typing, data }); + }); + return Livechat.getRoom(guest, message, roomInfo, agent, extraParams); } @@ -86,30 +106,71 @@ export function normalizeHttpHeaderData(headers = {}) { const httpHeaders = Object.assign({}, headers); return { httpHeaders }; } -export function settings() { + +export function settings(url) { const initSettings = Livechat.getInitSettings(); const triggers = findTriggers(); + const filters = findFilters(); const departments = findDepartments(); const sound = `${ Meteor.absoluteUrl() }sounds/chime.mp3`; const emojis = EmojiCustom.find().fetch(); + + const shouldShowRegistrationForm = () => { + if (!url) { + return initSettings.Livechat_registration_form; + } + + let skipOnDomainList = initSettings.Livechat_skip_registration_form_DomainsList; + skipOnDomainList = (!_.isEmpty(skipOnDomainList.trim()) && _.map(skipOnDomainList.split(','), function(domain) { + return domain.trim(); + })) || []; + + const urlObject = URL.parse(url); + const { hostname: urlHost, pathname: urlPath } = urlObject; + + const matchedDomain = skipOnDomainList.find((domain) => { + if (!domain.match(/^[a-zA-Z]+:\/\//)) { + domain = `http://${ domain }`; + } + const domainUrlObject = URL.parse(domain); + const { hostname: domainHost, pathname: domainPath } = domainUrlObject; + + if (domainPath !== '/') { + return domainHost.includes(urlHost) && (domainPath === urlPath); + } + return domainHost.includes(urlHost); + }); + + return initSettings.Livechat_registration_form && !matchedDomain; + }; + return { enabled: initSettings.Livechat_enabled, settings: { - registrationForm: initSettings.Livechat_registration_form, + registrationForm: shouldShowRegistrationForm(), + startSessionOnNewChat: initSettings.Livechat_start_session_on_new_chat, allowSwitchingDepartments: initSettings.Livechat_allow_switching_departments, nameFieldRegistrationForm: initSettings.Livechat_name_field_registration_form, emailFieldRegistrationForm: initSettings.Livechat_email_field_registration_form, + guestDefaultAvatar: initSettings.Assets_livechat_guest_default_avatar, 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, + printTranscript: initSettings.Livechat_enable_print_transcript, historyMonitorType: initSettings.Livechat_history_monitor_type, forceAcceptDataProcessingConsent: initSettings.Livechat_force_accept_data_processing_consent, showConnecting: initSettings.Livechat_Show_Connecting, agentHiddenInfo: initSettings.Livechat_show_agent_info === false, + hideSysMessages: initSettings.Livechat_hide_sys_messages, limitTextLength: initSettings.Livechat_enable_message_character_limit - && (initSettings.Livechat_message_character_limit || initSettings.Message_MaxAllowedSize), + && (initSettings.Livechat_message_character_limit || initSettings.Message_MaxAllowedSize), + + livechat_kill_switch: initSettings.Livechat_kill_switch, + livechat_kill_switch_message: initSettings.Livechat_kill_switch_message, + livechat_friendly_chat: initSettings.Livechat_friendly_chat, + livechat_enable_avatar: initSettings.Livechat_enable_avatar, }, theme: { title: initSettings.Livechat_title, @@ -136,6 +197,7 @@ export function settings() { values: ['1', '2', '3', '4', '5'], }, triggers, + filters, departments, resources: { sound, diff --git a/app/livechat/server/api/v1/config.js b/app/livechat/server/api/v1/config.js index e43509d4ba3ca..245e109800f0b 100644 --- a/app/livechat/server/api/v1/config.js +++ b/app/livechat/server/api/v1/config.js @@ -10,6 +10,7 @@ API.v1.addRoute('livechat/config', { check(this.queryParams, { token: Match.Maybe(String), department: Match.Maybe(String), + url: Match.Maybe(String), }); const enabled = Livechat.enabled(); @@ -17,7 +18,8 @@ API.v1.addRoute('livechat/config', { return API.v1.success({ config: { enabled: false } }); } - const config = settings(); + const { url } = this.queryParams; + const config = settings(url); const { token, department } = this.queryParams; const status = Livechat.online(department); diff --git a/app/livechat/server/api/v1/customField.js b/app/livechat/server/api/v1/customField.js index 641ad960474ee..3f676a3ac5a53 100644 --- a/app/livechat/server/api/v1/customField.js +++ b/app/livechat/server/api/v1/customField.js @@ -34,6 +34,31 @@ API.v1.addRoute('livechat/custom.field', { }, }); +API.v1.addRoute('livechat/custom-field', { authRequired: true }, { + post() { + try { + check(this.bodyParams, { + field: String, + label: String, + scope: String, + visibility: Boolean, + regexp: String, + }); + + const { field, visibility } = this.bodyParams; + const { customField } = Promise.await(findCustomFieldById({ userId: this.userId, customFieldId: field })); + + API.v1.success( + Meteor.runAsUser(this.userId, + () => Meteor.call('livechat:saveCustomField', customField ? field : undefined, { ...this.bodyParams, visibility: visibility ? 'visible' : 'hidden' }), + ), + ); + } catch (e) { + return API.v1.failure(e); + } + }, +}); + API.v1.addRoute('livechat/custom.fields', { post() { check(this.bodyParams, { diff --git a/app/livechat/server/api/v1/message.js b/app/livechat/server/api/v1/message.js index df8ac26a07f7a..fc980bdc84ae2 100644 --- a/app/livechat/server/api/v1/message.js +++ b/app/livechat/server/api/v1/message.js @@ -19,13 +19,14 @@ API.v1.addRoute('livechat/message', { token: String, rid: String, msg: String, + avatar: Match.Optional(String), agent: Match.Maybe({ agentId: String, username: String, }), }); - const { token, rid, agent, msg } = this.bodyParams; + const { token, rid, agent, msg, avatar } = this.bodyParams; const guest = findGuest(token); if (!guest) { @@ -53,6 +54,7 @@ API.v1.addRoute('livechat/message', { _id, rid, msg, + avatar, token, }, agent, diff --git a/app/livechat/server/api/v1/transcript.js b/app/livechat/server/api/v1/transcript.js index f8f3c923d25e0..070cad6eafb97 100644 --- a/app/livechat/server/api/v1/transcript.js +++ b/app/livechat/server/api/v1/transcript.js @@ -1,8 +1,10 @@ +import { Meteor } from 'meteor/meteor'; import { check } from 'meteor/check'; import { TAPi18n } from 'meteor/rocketchat:tap-i18n'; import { API } from '../../../../api/server'; import { Livechat } from '../../lib/Livechat'; +import { hasPermission } from '../../../../authorization'; API.v1.addRoute('livechat/transcript', { post() { @@ -24,3 +26,30 @@ API.v1.addRoute('livechat/transcript', { } }, }); + +API.v1.addRoute('livechat/gettranscript', { authRequired: true }, { + post() { + try { + check(this.bodyParams, { + token: String, + rid: String, + }); + + const { token, rid } = this.bodyParams; + + if (!hasPermission(this.userId, 'send-omnichannel-chat-transcript')) { + throw new Meteor.Error('not-authorized', 'Not Authorized'); + } + + const response = Livechat.getTranscript({ token, rid }); + if (!response) { + return API.v1.failure({ message: TAPi18n.__('Error_sending_livechat_transcript') }); + } + + return API.v1.success(response); + } catch (e) { + Livechat.logger.error(e); + return API.v1.failure(e); + } + }, +}); diff --git a/app/livechat/server/config.js b/app/livechat/server/config.js index 45f59a8b26a90..6234bf1a86a6e 100644 --- a/app/livechat/server/config.js +++ b/app/livechat/server/config.js @@ -1,6 +1,7 @@ import { Meteor } from 'meteor/meteor'; import { settings } from '../../settings'; +import { MessageTypesValues } from '../../lib/lib/MessageTypes'; Meteor.startup(function() { settings.addGroup('Omnichannel'); @@ -11,6 +12,22 @@ Meteor.startup(function() { public: true, }); + settings.add('Livechat_friendly_chat', false, { + type: 'boolean', + group: 'Omnichannel', + section: 'Livechat', + public: true, + i18nDescription: 'Livechat_friendly_chat_description', + }); + + settings.add('Livechat_enable_avatar', true, { + type: 'boolean', + group: 'Omnichannel', + section: 'Livechat', + public: true, + i18nDescription: 'Livechat_enable_avatar_description', + }); + settings.add('Livechat_title', 'Rocket.Chat', { type: 'string', group: 'Omnichannel', @@ -18,6 +35,21 @@ Meteor.startup(function() { public: true, }); + settings.add('Livechat_kill_switch', false, { + type: 'boolean', + group: 'Omnichannel', + section: 'Livechat', + public: true, + i18nDescription: 'Livechat_kill_switch_description', + }); + + settings.add('Livechat_kill_switch_message', 'Livechat is Currently Offline', { + type: 'string', + group: 'Omnichannel', + section: 'Livechat', + public: true, + }); + settings.add('Livechat_title_color', '#C1272D', { type: 'color', editor: 'color', @@ -27,6 +59,19 @@ Meteor.startup(function() { public: true, }); + settings.add('Livechat_hide_sys_messages', [], { + type: 'multiSelect', + group: 'Omnichannel', + section: 'Livechat', + values: [ + ...MessageTypesValues, + { key: 'livechat-started', i18nLabel: 'Message_HideType_livechat_started' }, + { key: 'livechat-close', i18nLabel: 'Message_HideType_livechat_close' }, + { key: 'livechat_transfer_history', i18nLabel: 'Message_HideType_livechat_transfer_history' }, + ], + public: true, + }); + settings.add('Livechat_enable_message_character_limit', false, { type: 'boolean', group: 'Omnichannel', @@ -161,6 +206,24 @@ Meteor.startup(function() { i18nLabel: 'Show_preregistration_form', }); + settings.add('Livechat_start_session_on_new_chat', false, { + type: 'boolean', + group: 'Omnichannel', + section: 'Livechat', + public: true, + i18nLabel: 'Livechat_Start_session_on_new_chat', + }); + + settings.add('Livechat_skip_registration_form_DomainsList', '', { + type: 'string', + group: 'Omnichannel', + section: 'Livechat', + enableQuery: { _id: 'Livechat_registration_form', value: true }, + public: true, + i18nLabel: 'Livechat_SkipRegistrationFormDomainsList', + i18nDescription: 'Domains_on_which_skip_livechat_registration_form', + }); + settings.add('Livechat_name_field_registration_form', true, { type: 'boolean', group: 'Omnichannel', @@ -362,6 +425,13 @@ Meteor.startup(function() { enableQuery: { _id: 'Livechat_enable_transcript', value: true }, }); + settings.add('Livechat_enable_print_transcript', true, { + type: 'boolean', + group: 'Omnichannel', + public: true, + i18nLabel: 'Transcript_Print_Enabled', + }); + settings.add('Livechat_registration_form_message', '', { type: 'string', group: 'Omnichannel', @@ -451,6 +521,14 @@ Meteor.startup(function() { i18nDescription: 'Assign_new_conversations_to_bot_agent_description', }); + settings.add('Livechat_assign_new_conversation_to_department', '', { + type: 'string', + group: 'Omnichannel', + section: 'Routing', + i18nLabel: 'Assign_new_conversations_to_department', + i18nDescription: 'Assign_new_conversations_to_department_description', + }); + settings.add('Livechat_guest_pool_max_number_incoming_livechats_displayed', 0, { type: 'int', group: 'Omnichannel', diff --git a/app/livechat/server/hooks/leadCapture.js b/app/livechat/server/hooks/leadCapture.js index 7dd2092246b67..c2aa193be0ab4 100644 --- a/app/livechat/server/hooks/leadCapture.js +++ b/app/livechat/server/hooks/leadCapture.js @@ -1,6 +1,6 @@ import { callbacks } from '../../../callbacks'; -import { settings } from '../../../settings'; import { LivechatVisitors } from '../../../models'; +import { settings } from '../../../settings'; function validateMessage(message, room) { // skips this callback if the message was edited @@ -45,3 +45,14 @@ callbacks.add('afterSaveMessage', function(message, room) { return message; }, callbacks.priority.LOW, 'leadCapture'); + +callbacks.add('beforeSaveMessage', function(message, room) { + if (settings.get('Livechat_kill_switch')) { + if (room && room.lastMessage.msg !== settings.get('Livechat_kill_switch_message')) { + message.msg = settings.get('Livechat_kill_switch_message'); + message.avatar = ''; + message.u._id = room.servedBy._id; + message.u.username = room.servedBy.username; + } + } +}, callbacks.priority.LOW, 'leadCapture'); diff --git a/app/livechat/server/index.js b/app/livechat/server/index.js index 9d2c6fdf3b355..79e0bf81ef039 100644 --- a/app/livechat/server/index.js +++ b/app/livechat/server/index.js @@ -43,6 +43,7 @@ import './methods/removeAgent'; import './methods/removeAllClosedRooms'; import './methods/removeCustomField'; import './methods/removeDepartment'; +import './methods/removeFilter'; import './methods/removeManager'; import './methods/removeTrigger'; import './methods/removeRoom'; @@ -51,6 +52,7 @@ import './methods/saveAppearance'; import './methods/saveCustomField'; import './methods/saveDepartment'; import './methods/saveDepartmentAgents'; +import './methods/saveFilter'; import './methods/saveInfo'; import './methods/saveIntegration'; import './methods/saveSurveyFeedback'; diff --git a/app/livechat/server/lib/Livechat.js b/app/livechat/server/lib/Livechat.js index 04f08efacd4c3..8d9d688b71d6f 100644 --- a/app/livechat/server/lib/Livechat.js +++ b/app/livechat/server/lib/Livechat.js @@ -40,6 +40,9 @@ import { Apps, AppEvents } from '../../../apps/server'; import { businessHourManager } from '../business-hour'; import notifications from '../../../notifications/server/lib/Notifications'; import { validateEmailDomain } from '../../../lib/server'; +import { Notifications } from '../../../notifications'; + +const rooms = {}; export const Livechat = { Analytics, @@ -51,7 +54,6 @@ export const Livechat = { }, }), - findGuest(token) { return LivechatVisitors.getVisitorByToken(token, { fields: { @@ -64,6 +66,21 @@ export const Livechat = { }); }, + addTypingListener(rid, callback) { + if (rooms[rid]) { + return; + } + rooms[rid] = callback; + return Notifications.onRoom(rid, 'typing', rooms[rid]); + }, + + removeTypingListener(rid) { + if (rooms[rid]) { + Notifications.unRoom(rid, 'typing', rooms[rid]); + delete rooms[rid]; + } + }, + online(department) { if (settings.get('Livechat_accept_chats_with_no_agents')) { return true; @@ -125,6 +142,15 @@ export const Livechat = { getRequiredDepartment(onlineRequired = true) { const departments = LivechatDepartment.findEnabledWithAgents(); + const deparmentName = settings.get('Livechat_assign_new_conversation_to_department'); + + if (deparmentName) { + const department = departments.fetch().find((dept) => dept.name === deparmentName); + if (department) { + return department; + } + } + return departments.fetch().find((dept) => { if (!dept.showOnRegistration) { return false; @@ -350,6 +376,14 @@ export const Livechat = { const params = callbacks.run('livechat.beforeCloseRoom', { room, options }); const { extraData } = params; + const guest = LivechatVisitors.findOneById(room.v._id); + const updateUser = {}; + + // remove department from guest when closing chat. + if (guest.department) { + Object.assign(updateUser, { $unset: { department: 1 } }); + LivechatVisitors.updateById(guest._id, updateUser); + } const now = new Date(); const { _id: rid, servedBy, transcriptRequest } = room; @@ -402,6 +436,7 @@ export const Livechat = { */ Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.ILivechatRoomClosedHandler, room); Apps.getBridges().getListenerBridge().livechatEvent(AppEvents.IPostLivechatRoomClosed, room); + Livechat.removeTypingListener(rid); }); callbacks.runAsync('livechat.closeRoom', room); @@ -418,6 +453,7 @@ export const Livechat = { Messages.removeByRoomId(rid); Subscriptions.removeByRoomId(rid); LivechatInquiry.removeByRoomId(rid); + Livechat.removeTypingListener(rid); return LivechatRooms.removeById(rid); }, @@ -454,13 +490,18 @@ export const Livechat = { const rcSettings = {}; Settings.findNotHiddenPublic([ + 'Livechat_friendly_chat', + 'Livechat_enable_avatar', 'Livechat_title', 'Livechat_title_color', + 'Livechat_kill_switch', + 'Livechat_kill_switch_message', 'Livechat_enable_message_character_limit', 'Livechat_message_character_limit', 'Message_MaxAllowedSize', 'Livechat_enabled', 'Livechat_registration_form', + 'Livechat_start_session_on_new_chat', 'Livechat_allow_switching_departments', 'Livechat_offline_title', 'Livechat_offline_title_color', @@ -473,16 +514,20 @@ export const Livechat = { 'Language', 'Livechat_enable_transcript', 'Livechat_transcript_message', + 'Livechat_enable_print_transcript', 'Livechat_fileupload_enabled', 'FileUpload_Enabled', 'Livechat_conversation_finished_message', 'Livechat_conversation_finished_text', 'Livechat_name_field_registration_form', 'Livechat_email_field_registration_form', + 'Assets_livechat_guest_default_avatar', 'Livechat_registration_form_message', 'Livechat_force_accept_data_processing_consent', 'Livechat_data_processing_consent_text', 'Livechat_show_agent_info', + 'Livechat_skip_registration_form_DomainsList', + 'Livechat_hide_sys_messages', ]).forEach((setting) => { rcSettings[setting._id] = setting.value; }); @@ -1038,6 +1083,37 @@ export const Livechat = { return true; }, + getTranscript({ token, rid, user }) { + check(rid, String); + + const room = LivechatRooms.findOneById(rid); + + const visitor = LivechatVisitors.getVisitorByToken(token, { fields: { _id: 1, token: 1, language: 1, username: 1, name: 1 } }); + + // allow to only user to send transcripts from their own chats + if (!room || room.t !== 'l' || !room.v || room.v.token !== token) { + Livechat.logger.error('getTranscript: Room/Token not valid or Visitor token not allowed to access the room.', { rid, token }); + throw new Meteor.Error('error-invalid-room', 'Invalid room'); + } + + const ignoredMessageTypes = ['livechat_navigation_history', 'livechat_transcript_history', 'command', 'livechat-close', 'livechat_video_call']; + const messages = Messages.findVisibleByRoomIdNotContainingTypes(rid, ignoredMessageTypes, { sort: { ts: 1 } }); + + const response = []; + messages.forEach((message) => { + response.push({ sender: message.u._id === visitor._id ? 'customer' : 'agent', message: message.msg, timestamp: message.ts }); + }); + + let type = 'user'; + if (!user) { + user = Users.findOneById('rocket.cat', { fields: { _id: 1, username: 1, name: 1 } }); + type = 'visitor'; + } + + Messages.createTranscriptHistoryWithRoomIdMessageAndUser(room._id, '', user, { requestData: { type, visitor, user } }); + return response; + }, + requestTranscript({ rid, email, subject, user }) { check(rid, String); check(email, String); diff --git a/app/livechat/server/lib/routing/AutoSelection.js b/app/livechat/server/lib/routing/AutoSelection.js index 7850dd36990be..abf10d38ef0d5 100644 --- a/app/livechat/server/lib/routing/AutoSelection.js +++ b/app/livechat/server/lib/routing/AutoSelection.js @@ -1,6 +1,7 @@ import { RoutingManager } from '../RoutingManager'; import { LivechatDepartmentAgents, Users } from '../../../../models/server'; import { callbacks } from '../../../../callbacks'; +import { settings } from '../../../../settings/server'; /* Auto Selection Queuing method: * @@ -21,7 +22,10 @@ class AutoSelection { } getNextAgent(department, ignoreAgentId) { - const extraQuery = callbacks.run('livechat.applySimultaneousChatRestrictions', { ...department ? { departmentId: department } : {} }); + const extraQuery = callbacks.run('livechat.applySimultaneousChatRestrictions', undefined, { ...department ? { departmentId: department } : {} }); + if (settings.get('Livechat_kill_switch')) { + return null; + } if (department) { return LivechatDepartmentAgents.getNextAgentForDepartment(department, ignoreAgentId, extraQuery); } diff --git a/app/livechat/server/lib/routing/External.js b/app/livechat/server/lib/routing/External.js index 4b104a9d2df07..351c5571cc7d7 100644 --- a/app/livechat/server/lib/routing/External.js +++ b/app/livechat/server/lib/routing/External.js @@ -19,6 +19,9 @@ class ExternalQueue { } getNextAgent(department, ignoreAgentId) { + if (settings.get('Livechat_kill_switch')) { + return null; + } for (let i = 0; i < 10; i++) { try { let queryString = department ? `?departmentId=${ department }` : ''; diff --git a/app/livechat/server/methods/getInitialData.js b/app/livechat/server/methods/getInitialData.js index 9b7a2f22a7055..a00cb996acd85 100644 --- a/app/livechat/server/methods/getInitialData.js +++ b/app/livechat/server/methods/getInitialData.js @@ -1,7 +1,7 @@ import { Meteor } from 'meteor/meteor'; import _ from 'underscore'; -import { LivechatRooms, Users, LivechatDepartment, LivechatTrigger, LivechatVisitors } from '../../../models'; +import { LivechatRooms, Users, LivechatDepartment, LivechatTrigger, LivechatFilter, LivechatVisitors } from '../../../models'; import { Livechat } from '../lib/Livechat'; Meteor.methods({ @@ -11,8 +11,10 @@ Meteor.methods({ title: null, color: null, registrationForm: null, + startSessionOnNewChat: null, room: null, visitor: null, + filters: [], triggers: [], departments: [], allowSwitchingDepartments: null, @@ -28,8 +30,10 @@ Meteor.methods({ conversationFinishedText: null, nameFieldRegistrationForm: null, emailFieldRegistrationForm: null, + guestDefaultAvatar: null, registrationFormMessage: null, showConnecting: false, + hideSysMessages: [], }; const options = { @@ -68,6 +72,7 @@ Meteor.methods({ info.color = initSettings.Livechat_title_color; info.enabled = initSettings.Livechat_enabled; info.registrationForm = initSettings.Livechat_registration_form; + info.startSessionOnNewChat = initSettings.Livechat_start_session_on_new_chat; info.offlineTitle = initSettings.Livechat_offline_title; info.offlineColor = initSettings.Livechat_offline_title_color; info.offlineMessage = initSettings.Livechat_offline_message; @@ -79,17 +84,28 @@ Meteor.methods({ info.fileUpload = initSettings.Livechat_fileupload_enabled && initSettings.FileUpload_Enabled; info.transcript = initSettings.Livechat_enable_transcript; info.transcriptMessage = initSettings.Livechat_transcript_message; + info.printTranscript = initSettings.Livechat_enable_print_transcript; info.conversationFinishedMessage = initSettings.Livechat_conversation_finished_message; info.conversationFinishedText = initSettings.Livechat_conversation_finished_text; info.nameFieldRegistrationForm = initSettings.Livechat_name_field_registration_form; info.emailFieldRegistrationForm = initSettings.Livechat_email_field_registration_form; + info.guestDefaultAvatar = initSettings.Assets_livechat_guest_default_avatar; info.registrationFormMessage = initSettings.Livechat_registration_form_message; info.showConnecting = initSettings.Livechat_Show_Connecting; + info.hideSysMessages = initSettings.Livechat_hide_sys_messages; + info.livechat_kill_switch = initSettings.Livechat_kill_switch; + info.livechat_kill_switch_message = initSettings.Livechat_kill_switch_message; + info.livechat_friendly_chat = initSettings.Livechat_friendly_chat; + info.livechat_enable_avatar = initSettings.Livechat_enable_avatar; info.agentData = room && room[0] && room[0].servedBy && Users.getAgentInfo(room[0].servedBy._id); + LivechatFilter.findEnabled().forEach((filter) => { + info.filters.push(_.pick(filter, '_id', 'regex', 'slug')); + }); + LivechatTrigger.findEnabled().forEach((trigger) => { - info.triggers.push(_.pick(trigger, '_id', 'actions', 'conditions', 'runOnce')); + info.triggers.push(_.pick(trigger, '_id', 'actions', 'conditions', 'runOnce', 'registeredOnly')); }); LivechatDepartment.findEnabledWithAgents().forEach((department) => { diff --git a/app/livechat/server/methods/removeFilter.js b/app/livechat/server/methods/removeFilter.js new file mode 100644 index 0000000000000..825af1090bda8 --- /dev/null +++ b/app/livechat/server/methods/removeFilter.js @@ -0,0 +1,17 @@ +import { Meteor } from 'meteor/meteor'; +import { check } from 'meteor/check'; + +import { hasPermission } from '../../../authorization'; +import { LivechatFilter } from '../../../models'; + +Meteor.methods({ + 'livechat:removeFilter'(filterId) { + if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) { + throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:removeFilter' }); + } + + check(filterId, String); + + return LivechatFilter.removeById(filterId); + }, +}); diff --git a/app/livechat/server/methods/saveAppearance.js b/app/livechat/server/methods/saveAppearance.js index 44a3749d81b43..4c6bfd530be36 100644 --- a/app/livechat/server/methods/saveAppearance.js +++ b/app/livechat/server/methods/saveAppearance.js @@ -29,6 +29,7 @@ Meteor.methods({ 'Livechat_name_field_registration_form', 'Livechat_email_field_registration_form', 'Livechat_registration_form_message', + 'Livechat_hide_sys_messages', ]; const valid = settings.every((setting) => validSettings.indexOf(setting._id) !== -1); diff --git a/app/livechat/server/methods/saveFilter.js b/app/livechat/server/methods/saveFilter.js new file mode 100644 index 0000000000000..826c576b9d944 --- /dev/null +++ b/app/livechat/server/methods/saveFilter.js @@ -0,0 +1,24 @@ +import { Meteor } from 'meteor/meteor'; +import { Match, check } from 'meteor/check'; + +import { hasPermission } from '../../../authorization'; +import { LivechatFilter } from '../../../models'; + +Meteor.methods({ + 'livechat:saveFilter'(filter) { + if (!Meteor.userId() || !hasPermission(Meteor.userId(), 'view-livechat-manager')) { + throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'livechat:saveFilter' }); + } + + check(filter, { + _id: Match.Maybe(String), + name: String, + description: String, + enabled: Boolean, + regex: String, + slug: String, + }); + + return LivechatFilter.insertOrUpsert(filter); + }, +}); diff --git a/app/livechat/server/methods/saveTrigger.js b/app/livechat/server/methods/saveTrigger.js index 6be81479badc5..aa6de0aec07e6 100644 --- a/app/livechat/server/methods/saveTrigger.js +++ b/app/livechat/server/methods/saveTrigger.js @@ -16,13 +16,11 @@ Meteor.methods({ description: String, enabled: Boolean, runOnce: Boolean, + registeredOnly: Boolean, conditions: Array, actions: Array, }); - if (trigger._id) { - return LivechatTrigger.updateById(trigger._id, trigger); - } - return LivechatTrigger.insert(trigger); + return LivechatTrigger.insertOrUpsert(trigger); }, }); diff --git a/app/livechat/server/sendMessageBySMS.js b/app/livechat/server/sendMessageBySMS.js index 6094d1dc62a33..c089a6b841273 100644 --- a/app/livechat/server/sendMessageBySMS.js +++ b/app/livechat/server/sendMessageBySMS.js @@ -36,6 +36,11 @@ callbacks.add('afterSaveMessage', function(message, room) { extraData = Object.assign({}, { rid, userId, fileUpload }); } + if (message.customFields && message.customFields.mediaCardURL) { + const mediaUrl = message.customFields.mediaCardURL; + extraData = Object.assign({}, { mediaUrl }); + } + if (message.location) { const { location } = message; extraData = Object.assign({}, extraData, { location }); @@ -53,6 +58,7 @@ callbacks.add('afterSaveMessage', function(message, room) { return message; } + SMSService.send(room.sms.from, visitor.phone[0].phoneNumber, message.msg, extraData); return message; diff --git a/app/logger/server/server.js b/app/logger/server/server.js index bce22758c551f..d9b6d0a8e84fa 100644 --- a/app/logger/server/server.js +++ b/app/logger/server/server.js @@ -269,6 +269,7 @@ export class Logger { } _log(options, ...args) { + // require('log-timestamp'); if (LoggerManager.enabled === false) { LoggerManager.addToQueue(this, [options, ...args]); return; diff --git a/app/mailer/server/api.js b/app/mailer/server/api.js index 1405841f1b45f..f7be389eda9aa 100644 --- a/app/mailer/server/api.js +++ b/app/mailer/server/api.js @@ -60,13 +60,7 @@ export const replaceEscaped = (str, data = {}) => replace(str, { }, {}), }); -export const wrap = (html, data = {}) => { - if (settings.get('email_plain_text_only')) { - return replace(html, data); - } - - return replaceEscaped(body.replace('{{body}}', html), data); -}; +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 = ''; @@ -119,10 +113,6 @@ export const sendNoWrap = ({ to, from, replyTo, subject, html, text, headers }) text = stripHtml(html).result; } - if (settings.get('email_plain_text_only')) { - html = undefined; - } - Meteor.defer(() => Email.send({ to, from, replyTo, subject, html, text, headers })); }; diff --git a/app/mentions-flextab/client/actionButton.js b/app/mentions-flextab/client/actionButton.js index d6b86681f5897..921720e2a5f23 100644 --- a/app/mentions-flextab/client/actionButton.js +++ b/app/mentions-flextab/client/actionButton.js @@ -17,7 +17,7 @@ Meteor.startup(function() { e.stopPropagation(); const { msg: message } = messageArgs(this); if (window.matchMedia('(max-width: 500px)').matches) { - Template.instance().tabBar.close(); + Template.currentData().instance.tabBar.close(); } if (message.tmid) { return FlowRouter.go(FlowRouter.getRouteName(), { diff --git a/app/message-pin/client/actionButton.js b/app/message-pin/client/actionButton.js index 07c0fde808d38..9650db05f311f 100644 --- a/app/message-pin/client/actionButton.js +++ b/app/message-pin/client/actionButton.js @@ -74,7 +74,7 @@ Meteor.startup(function() { action() { const { msg: message } = messageArgs(this); if (window.matchMedia('(max-width: 500px)').matches) { - Template.instance().tabBar.close(); + Template.currentData().instance.tabBar.close(); } if (message.tmid) { return FlowRouter.go(FlowRouter.getRouteName(), { @@ -89,8 +89,8 @@ Meteor.startup(function() { } return RoomHistoryManager.getSurroundingMessages(message, 50); }, - condition({ subscription }) { - return !!subscription; + condition({ msg, subscription }) { + return msg.pinned && !!subscription; }, order: 100, group: ['message', 'menu'], diff --git a/app/message-star/client/actionButton.js b/app/message-star/client/actionButton.js index 092e3e3c8dc25..5c194b2103f60 100644 --- a/app/message-star/client/actionButton.js +++ b/app/message-star/client/actionButton.js @@ -74,7 +74,7 @@ Meteor.startup(function() { action() { const { msg: message } = messageArgs(this); if (window.matchMedia('(max-width: 500px)').matches) { - Template.instance().tabBar.close(); + Template.currentData().instance.tabBar.close(); } if (message.tmid) { return FlowRouter.go(FlowRouter.getRouteName(), { diff --git a/app/models/client/index.js b/app/models/client/index.js index fbcbee481f5c4..0a82feba69691 100644 --- a/app/models/client/index.js +++ b/app/models/client/index.js @@ -14,7 +14,7 @@ import { CachedChatSubscription } from './models/CachedChatSubscription'; import { CachedUserList } from './models/CachedUserList'; import { ChatRoom } from './models/ChatRoom'; import { ChatSubscription } from './models/ChatSubscription'; -import { ChatMessage } from './models/ChatMessage'; +import { ChatMessage, CachedChatMessage } from './models/ChatMessage'; import { RoomRoles } from './models/RoomRoles'; import { UserAndRoom } from './models/UserAndRoom'; import { UserRoles } from './models/UserRoles'; @@ -48,6 +48,7 @@ export { AuthzCachedCollection, ChatPermissions, ChatMessage, + CachedChatMessage, ChatSubscription, Rooms, CustomSounds, diff --git a/app/models/client/models/ChatMessage.js b/app/models/client/models/ChatMessage.js index 7a3192a535e1c..f891f25f198bc 100644 --- a/app/models/client/models/ChatMessage.js +++ b/app/models/client/models/ChatMessage.js @@ -1,13 +1,35 @@ -import { Mongo } from 'meteor/mongo'; +import { Meteor } from 'meteor/meteor'; +import s from 'underscore.string'; +import { Tracker } from 'meteor/tracker'; -export const ChatMessage = new Mongo.Collection(null); +import { CachedCollection } from '../../../ui-cached-collection'; +import { CachedChatSubscription } from './CachedChatSubscription'; +import { ChatSubscription } from './ChatSubscription'; +import { getConfig } from '../../../ui-utils/client/config'; +import { cleanMessagesAtStartup, triggerOfflineMsgs } from '../../../utils'; +import { renderMessageBody } from '../../../../client/lib/renderMessageBody'; +import { promises } from '../../../promises/client'; +import { callbacks } from '../../../callbacks'; +import { settings } from '../../../settings'; -ChatMessage.setReactions = function(messageId, reactions) { - return this.update({ _id: messageId }, { $set: { reactions } }); +export const CachedChatMessage = new CachedCollection({ name: 'chatMessage' }); + +export const ChatMessage = CachedChatMessage.collection; + +let timeout; + +ChatMessage.find().observe({ + added: CachedChatMessage.save, + changed: CachedChatMessage.save, + removed: CachedChatMessage.save, +}); + +ChatMessage.setReactions = function(messageId, reactions, tempActions) { + return this.update({ _id: messageId }, { $set: { temp: true, tempActions, reactions } }); }; -ChatMessage.unsetReactions = function(messageId) { - return this.update({ _id: messageId }, { $unset: { reactions: 1 } }); +ChatMessage.unsetReactions = function(messageId, tempActions) { + return this.update({ _id: messageId }, { $unset: { reactions: 1 }, $set: { temp: true, tempActions } }); }; ChatMessage.findOneByRoomIdAndMessageId = function(rid, messageId, options) { @@ -18,3 +40,113 @@ ChatMessage.findOneByRoomIdAndMessageId = function(rid, messageId, options) { return this.findOne(query, options); }; + +ChatMessage.setProgress = function(messageId, upload) { + return this.update({ _id: messageId }, { $set: { uploads: upload } }); +}; + +const normalizeThreadMessage = (message) => { + if (message.msg) { + return renderMessageBody(message).replace(/{{{_ provider.description}}}
-{{{_ provider.description}}}
+