{{_ "Sorry_page_you_requested_does_not_exists_or_was_deleted"}}
+ diff --git a/client/routes/roomRoute.js b/client/routes/roomRoute.js index f77e4d9b70ba..dc36397d3fb4 100644 --- a/client/routes/roomRoute.js +++ b/client/routes/roomRoute.js @@ -1,5 +1,5 @@ FlowRouter.goToRoomById = (roomId) => { - const subscription = ChatSubscription.findOne({rid: roomId}); + const subscription = ChatSubscription.findOne({ rid: roomId }); if (subscription) { RocketChat.roomTypes.openRouteLink(subscription.t, subscription, FlowRouter.current().queryParams); } diff --git a/client/routes/router.js b/client/routes/router.js index 67d0f4870e5e..69b69dac0b5a 100644 --- a/client/routes/router.js +++ b/client/routes/router.js @@ -38,7 +38,7 @@ FlowRouter.route('/', { c.stop(); } }); - } + }, }); @@ -47,7 +47,7 @@ FlowRouter.route('/login', { action() { FlowRouter.go('home'); - } + }, }); FlowRouter.route('/home', { @@ -59,25 +59,25 @@ FlowRouter.route('/home', { Accounts.callLoginMethod({ methodArguments: [{ saml: true, - credentialToken: queryParams.saml_idp_credentialToken + credentialToken: queryParams.saml_idp_credentialToken, }], - userCallback() { BlazeLayout.render('main', {center: 'home'}); } + userCallback() { BlazeLayout.render('main', { center: 'home' }); }, }); } else { - BlazeLayout.render('main', {center: 'home'}); + BlazeLayout.render('main', { center: 'home' }); } - } + }, }); FlowRouter.route('/directory', { name: 'directory', action() { - BlazeLayout.render('main', {center: 'directory'}); + BlazeLayout.render('main', { center: 'directory' }); }, triggersExit: [function() { $('.main-content').addClass('rc-old'); - }] + }], }); FlowRouter.route('/account/:group?', { @@ -92,7 +92,7 @@ FlowRouter.route('/account/:group?', { }, triggersExit: [function() { $('.main-content').addClass('rc-old'); - }] + }], }); FlowRouter.route('/terms-of-service', { @@ -101,7 +101,7 @@ FlowRouter.route('/terms-of-service', { action() { Session.set('cmsPage', 'Layout_Terms_of_Service'); BlazeLayout.render('cmsPage'); - } + }, }); FlowRouter.route('/privacy-policy', { @@ -110,16 +110,16 @@ FlowRouter.route('/privacy-policy', { action() { Session.set('cmsPage', 'Layout_Privacy_Policy'); BlazeLayout.render('cmsPage'); - } + }, }); FlowRouter.route('/room-not-found/:type/:name', { name: 'room-not-found', action(params) { - Session.set('roomNotFound', {type: params.type, name: params.name}); - BlazeLayout.render('main', {center: 'roomNotFound'}); - } + Session.set('roomNotFound', { type: params.type, name: params.name }); + BlazeLayout.render('main', { center: 'roomNotFound' }); + }, }); FlowRouter.route('/fxos', { @@ -127,13 +127,13 @@ FlowRouter.route('/fxos', { action() { BlazeLayout.render('fxOsInstallPrompt'); - } + }, }); FlowRouter.route('/register/:hash', { name: 'register-secret-url', - action(/*params*/) { + action(/* params*/) { BlazeLayout.render('secretURL'); // if RocketChat.settings.get('Accounts_RegistrationForm') is 'Secret URL' @@ -146,5 +146,28 @@ FlowRouter.route('/register/:hash', { // BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' } // else // BlazeLayout.render 'logoLayout', { render: 'invalidSecretURL' } - } + }, }); + +FlowRouter.route('/setup-wizard', { + name: 'setup-wizard', + + action() { + BlazeLayout.render('setupWizard'); + }, +}); + +FlowRouter.route('/setup-wizard/final', { + name: 'setup-wizard-final', + + action() { + BlazeLayout.render('setupWizardFinal'); + }, +}); + +FlowRouter.notFound = { + action() { + BlazeLayout.render('pageNotFound'); + }, +}; + diff --git a/client/startup/i18n.js b/client/startup/i18n.js new file mode 100644 index 000000000000..5e426f4dd698 --- /dev/null +++ b/client/startup/i18n.js @@ -0,0 +1,80 @@ +/* globals isRtl */ + +import moment from 'moment'; + +const currentLanguage = new ReactiveVar(); + +Meteor.startup(() => { + TAPi18n.conf.i18n_files_route = Meteor._relativeToSiteRootUrl('/tap-i18n'); + currentLanguage.set(localStorage.getItem('userLanguage')); + + const availableLanguages = TAPi18n.getLanguages(); + + const filterLanguage = (language) => { + // Fix browsers having all-lowercase language settings eg. pt-br, en-us + const regex = /([a-z]{2})-([a-z]{2})/; + const matches = regex.exec(language); + if (matches) { + return `${ matches[1] }-${ matches[2].toUpperCase() }`; + } + + return language; + }; + + const getBrowserLanguage = () => filterLanguage(window.navigator.userLanguage || window.navigator.language); + + const loadMomentLocale = (language) => new Promise((resolve, reject) => { + if (moment.locales().includes(language.toLowerCase())) { + resolve(language); + return; + } + + Meteor.call('loadLocale', language, (error, localeSrc) => { + if (error) { + reject(error); + return; + } + + Function(localeSrc).call({ moment }); + resolve(language); + }); + }); + + const applyLanguage = (language = 'en') => { + language = filterLanguage(language); + + if (!availableLanguages[language]) { + language = language.split('-').shift(); + } + + if (!language) { + return; + } + + document.documentElement.classList[isRtl(language) ? 'add' : 'remove']('rtl'); + TAPi18n.setLanguage(language); + loadMomentLocale(language).then((locale) => moment.locale(locale), (error) => console.error(error)); + }; + + const setLanguage = (language) => { + const lang = filterLanguage(language); + currentLanguage.set(lang); + localStorage.setItem('userLanguage', lang); + }; + window.setLanguage = setLanguage; + + const defaultUserLanguage = () => RocketChat.settings.get('Language') || getBrowserLanguage() || 'en'; + window.defaultUserLanguage = defaultUserLanguage; + + Tracker.autorun(() => { + const user = RocketChat.models.Users.findOne(Meteor.userId(), { fields: { language: 1 } }); + + setLanguage((user && user.language) || defaultUserLanguage()); + }); + + Tracker.autorun(() => { + if (currentLanguage.get()) { + applyLanguage(currentLanguage.get()); + } + }); +}); diff --git a/client/startup/loginViaQuery.js b/client/startup/loginViaQuery.js new file mode 100644 index 000000000000..5804be24b3bb --- /dev/null +++ b/client/startup/loginViaQuery.js @@ -0,0 +1,7 @@ +Meteor.startup(() => { + if (FlowRouter.getQueryParam('resumeToken')) { + Meteor.loginWithToken(FlowRouter.getQueryParam('resumeToken'), () => { + FlowRouter.go('/home'); + }); + } +}); diff --git a/client/startup/roomObserve.js b/client/startup/roomObserve.js index f2b6bafd8acd..6681b89f8f7a 100644 --- a/client/startup/roomObserve.js +++ b/client/startup/roomObserve.js @@ -8,6 +8,6 @@ Meteor.startup(function() { }, removed(data) { Session.set(`roomData${ data._id }`, undefined); - } + }, }); }); diff --git a/client/startup/startup.js b/client/startup/startup.js index 8279db3373a5..d29aae306a91 100644 --- a/client/startup/startup.js +++ b/client/startup/startup.js @@ -1,6 +1,5 @@ -/* globals UserPresence, fireGlobalEvent, isRtl */ +/* globals UserPresence, fireGlobalEvent */ -import moment from 'moment'; import toastr from 'toastr'; import hljs from 'highlight.js'; import 'highlight.js/styles/github.css'; @@ -17,115 +16,50 @@ if (window.DISABLE_ANIMATION) { Meteor.startup(function() { TimeSync.loggingEnabled = false; - const userHasPreferences = (user) => { - if (!user) { - return false; - } - - const userHasSettings = user.hasOwnProperty('settings'); - - if (!userHasSettings) { - return false; - } - - return user.settings.hasOwnProperty('preferences'); - }; - - Meteor.subscribe('activeUsers'); - Session.setDefault('AvatarRandom', 0); window.lastMessageWindow = {}; window.lastMessageWindowHistory = {}; - TAPi18n.conf.i18n_files_route = Meteor._relativeToSiteRootUrl('/tap-i18n'); - - const defaultAppLanguage = function() { - let lng = window.navigator.userLanguage || window.navigator.language || 'en'; - // Fix browsers having all-lowercase language settings eg. pt-br, en-us - const re = /([a-z]{2}-)([a-z]{2})/; - if (re.test(lng)) { - lng = lng.replace(re, (match, ...parts) => { - return parts[0] + parts[1].toUpperCase(); - }); + Tracker.autorun(function(computation) { + if (!Meteor.userId() && !RocketChat.settings.get('Accounts_AllowAnonymousRead')) { + return; } - return lng; - }; - - window.defaultUserLanguage = function() { - return RocketChat.settings.get('Language') || defaultAppLanguage(); - }; - - const availableLanguages = TAPi18n.getLanguages(); - const loadedLanguages = []; + Meteor.subscribe('userData'); + Meteor.subscribe('activeUsers'); + computation.stop(); + }); - window.setLanguage = function(language) { - if (!language) { + let status = undefined; + Tracker.autorun(function() { + if (!Meteor.userId()) { return; } + const user = RocketChat.models.Users.findOne(Meteor.userId(), { + fields: { + status: 1, + 'settings.preferences.idleTimeLimit': 1, + 'settings.preferences.enableAutoAway': 1, + }, + }); - if (loadedLanguages.indexOf(language) > -1) { + if (!user) { return; } - loadedLanguages.push(language); - - if (isRtl(language)) { - $('html').addClass('rtl'); + if (RocketChat.getUserPreference(user, 'enableAutoAway')) { + const idleTimeLimit = RocketChat.getUserPreference(user, 'idleTimeLimit') || 300; + UserPresence.awayTime = idleTimeLimit * 1000; } else { - $('html').removeClass('rtl'); - } - - if (!availableLanguages[language]) { - language = language.split('-').shift(); + delete UserPresence.awayTime; + UserPresence.stopTimer(); } - TAPi18n.setLanguage(language); + UserPresence.start(); - language = language.toLowerCase(); - if (language !== 'en') { - Meteor.call('loadLocale', language, (err, localeFn) => { - Function(localeFn).call({moment}); - moment.locale(language); - }); + if (user.status !== status) { + status = user.status; + fireGlobalEvent('status-changed', status); } - }; - - const defaultIdleTimeLimit = 300000; - - Meteor.subscribe('userData', function() { - const user = Meteor.user(); - const userLanguage = user && user.language ? user.language : window.defaultUserLanguage(); - - if (!userHasPreferences(user)) { - UserPresence.awayTime = defaultIdleTimeLimit; - UserPresence.start(); - } else { - UserPresence.awayTime = user.settings.preferences.idleTimeLimit || defaultIdleTimeLimit; - - if (user.settings.preferences.hasOwnProperty('enableAutoAway')) { - user.settings.preferences.enableAutoAway && UserPresence.start(); - } else { - UserPresence.start(); - } - } - - if (localStorage.getItem('userLanguage') !== userLanguage) { - localStorage.setItem('userLanguage', userLanguage); - } - - window.setLanguage(userLanguage); - - let status = undefined; - Tracker.autorun(function() { - if (!Meteor.userId()) { - return; - } - - if (user && user.status !== status) { - status = user.status; - fireGlobalEvent('status-changed', status); - } - }); }); }); diff --git a/client/startup/unread.js b/client/startup/unread.js index f124cf6d75d7..7313f1b7a38b 100644 --- a/client/startup/unread.js +++ b/client/startup/unread.js @@ -5,7 +5,7 @@ Meteor.startup(function() { let unreadCount = 0; let unreadAlert = false; - const subscriptions = ChatSubscription.find({open: true, hideUnreadStatus: { $ne: true }}, { fields: { unread: 1, alert: 1, rid: 1, t: 1, name: 1, ls: 1, unreadAlert: 1 } }); + const subscriptions = ChatSubscription.find({ open: true, hideUnreadStatus: { $ne: true } }, { fields: { unread: 1, alert: 1, rid: 1, t: 1, name: 1, ls: 1, unreadAlert: 1 } }); let openedRoomId = undefined; Tracker.nonreactive(function() { @@ -63,7 +63,7 @@ Meteor.startup(function() { Meteor.startup(function() { window.favico = new Favico({ position: 'up', - animation: 'none' + animation: 'none', }); Tracker.autorun(function() { @@ -74,7 +74,7 @@ Meteor.startup(function() { if (favico) { favico.badge(unread, { - bgColor: typeof unread !== 'number' ? '#3d8a3a' : '#ac1b1b' + bgColor: typeof unread !== 'number' ? '#3d8a3a' : '#ac1b1b', }); } diff --git a/client/startup/userSetUtcOffset.js b/client/startup/userSetUtcOffset.js index d41f644fe67f..7916222214b3 100644 --- a/client/startup/userSetUtcOffset.js +++ b/client/startup/userSetUtcOffset.js @@ -2,7 +2,7 @@ import moment from 'moment'; Meteor.startup(function() { Tracker.autorun(function() { - const user = Meteor.user(); + const user = RocketChat.models.Users.findOne({ _id: Meteor.userId() }, { fields: { statusConnection: 1, utcOffset: 1 } }); if (user && user.statusConnection === 'online') { const utcOffset = moment().utcOffset() / 60; if (user.utcOffset !== utcOffset) { diff --git a/client/startup/usersObserve.js b/client/startup/usersObserve.js index 2dbddf942059..3ed237430286 100644 --- a/client/startup/usersObserve.js +++ b/client/startup/usersObserve.js @@ -11,6 +11,6 @@ Meteor.startup(function() { removed(user) { Session.set(`user_${ user.username }_status`, null); RoomManager.updateUserStatus(user, 'offline', null); - } + }, }); }); diff --git a/docker-compose.yml b/docker-compose.yml index d1cfa596080c..430214bc3263 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -28,7 +28,7 @@ services: volumes: - ./data/db:/data/db #- ./data/dump:/dump - command: mongod --smallfiles --oplogSize 128 --replSet rs0 + command: mongod --smallfiles --oplogSize 128 --replSet rs0 --storageEngine=mmapv1 labels: - "traefik.enable=false" diff --git a/example-build-run.sh b/example-build-run.sh index 97fc98bd6680..83792b97d940 100644 --- a/example-build-run.sh +++ b/example-build-run.sh @@ -10,6 +10,7 @@ DEPLOY_DIR=/var/www/rocket.chat ### BUILD meteor npm install +meteor npm run postinstall # on the very first build, meteor build command should fail due to a bug on emojione package (related to phantomjs installation) # the command below forces the error to happen before build command (not needed on subsequent builds) diff --git a/imports/message-read-receipt/client/main.js b/imports/message-read-receipt/client/main.js index c2711f6663dd..a40a8b0a6190 100644 --- a/imports/message-read-receipt/client/main.js +++ b/imports/message-read-receipt/client/main.js @@ -3,5 +3,5 @@ Template.main.helpers({ if (RocketChat.settings.get('Message_Read_Receipt_Store_Users')) { return 'read-receipts-enabled'; } - } + }, }); diff --git a/imports/message-read-receipt/client/message.js b/imports/message-read-receipt/client/message.js index 9a89d937b6c4..8c08a2b502d5 100644 --- a/imports/message-read-receipt/client/message.js +++ b/imports/message-read-receipt/client/message.js @@ -7,7 +7,7 @@ Template.message.helpers({ } return { - readByEveryone: (!this.unread && 'read') || 'color-component-color' + readByEveryone: (!this.unread && 'read') || 'color-component-color', }; - } + }, }); diff --git a/imports/message-read-receipt/client/readReceipts.js b/imports/message-read-receipt/client/readReceipts.js index b1a9cde21644..bfdac29a99e1 100644 --- a/imports/message-read-receipt/client/readReceipts.js +++ b/imports/message-read-receipt/client/readReceipts.js @@ -16,7 +16,7 @@ Template.readReceipts.helpers({ }, isLoading() { return Template.instance().loading.get(); - } + }, }); Template.readReceipts.onCreated(function readReceiptsOnCreated() { diff --git a/imports/message-read-receipt/client/room.js b/imports/message-read-receipt/client/room.js index dc5cde1e4a6b..89f61ccab43a 100644 --- a/imports/message-read-receipt/client/room.js +++ b/imports/message-read-receipt/client/room.js @@ -9,16 +9,16 @@ RocketChat.MessageAction.addButton({ title: t('Message_info'), content: 'readReceipts', data: { - messageId: message._id + messageId: message._id, }, showConfirmButton: true, showCancelButton: false, - confirmButtonText: t('Close') + confirmButtonText: t('Close'), }); }, condition() { return RocketChat.settings.get('Message_Read_Receipt_Store_Users'); }, order: 1, - group: 'menu' + group: 'menu', }); diff --git a/imports/message-read-receipt/server/api/methods/getReadReceipts.js b/imports/message-read-receipt/server/api/methods/getReadReceipts.js index da9c7ecbe995..4c8a10096960 100644 --- a/imports/message-read-receipt/server/api/methods/getReadReceipts.js +++ b/imports/message-read-receipt/server/api/methods/getReadReceipts.js @@ -24,5 +24,5 @@ Meteor.methods({ } return ReadReceipt.getReceipts(message); - } + }, }); diff --git a/imports/message-read-receipt/server/dbIndexes.js b/imports/message-read-receipt/server/dbIndexes.js index b88d4021a7bf..3d82fc7be455 100644 --- a/imports/message-read-receipt/server/dbIndexes.js +++ b/imports/message-read-receipt/server/dbIndexes.js @@ -1,5 +1,5 @@ RocketChat.models.Messages.tryEnsureIndex({ - unread: 1 + unread: 1, }, { - sparse: true + sparse: true, }); diff --git a/imports/message-read-receipt/server/lib/ReadReceipt.js b/imports/message-read-receipt/server/lib/ReadReceipt.js index 8cde6157ab29..04261faadee8 100644 --- a/imports/message-read-receipt/server/lib/ReadReceipt.js +++ b/imports/message-read-receipt/server/lib/ReadReceipt.js @@ -55,15 +55,13 @@ export const ReadReceipt = { storeReadReceipts(messages, roomId, userId) { if (RocketChat.settings.get('Message_Read_Receipt_Store_Users')) { const ts = new Date(); - const receipts = messages.map(message => { - return { - _id: Random.id(), - roomId, - userId, - messageId: message._id, - ts - }; - }); + const receipts = messages.map((message) => ({ + _id: Random.id(), + roomId, + userId, + messageId: message._id, + ts, + })); if (receipts.length === 0) { return; @@ -78,9 +76,9 @@ export const ReadReceipt = { }, getReceipts(message) { - return ModelReadReceipts.findByMessageId(message._id).map(receipt => ({ + return ModelReadReceipts.findByMessageId(message._id).map((receipt) => ({ ...receipt, - user: RocketChat.models.Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 }}) + user: RocketChat.models.Users.findOneById(receipt.userId, { fields: { username: 1, name: 1 } }), })); - } + }, }; diff --git a/imports/message-read-receipt/server/models/ReadReceipts.js b/imports/message-read-receipt/server/models/ReadReceipts.js index 4749ae5bb281..5d62edb1fdde 100644 --- a/imports/message-read-receipt/server/models/ReadReceipts.js +++ b/imports/message-read-receipt/server/models/ReadReceipts.js @@ -1,13 +1,13 @@ class ModelReadReceipts extends RocketChat.models._Base { - constructor() { - super(...arguments); + constructor(...args) { + super(...args); this.tryEnsureIndex({ roomId: 1, userId: 1, - messageId: 1 + messageId: 1, }, { - unique: 1 + unique: 1, }); } diff --git a/imports/message-read-receipt/server/settings.js b/imports/message-read-receipt/server/settings.js index 5349ab399b8b..39d3bd33f2e2 100644 --- a/imports/message-read-receipt/server/settings.js +++ b/imports/message-read-receipt/server/settings.js @@ -1,12 +1,12 @@ RocketChat.settings.add('Message_Read_Receipt_Enabled', false, { group: 'Message', type: 'boolean', - public: true + public: true, }); RocketChat.settings.add('Message_Read_Receipt_Store_Users', false, { group: 'Message', type: 'boolean', public: true, - enableQuery: { _id: 'Message_Read_Receipt_Enabled', value: true } + enableQuery: { _id: 'Message_Read_Receipt_Enabled', value: true }, }); diff --git a/imports/personal-access-tokens/client/index.js b/imports/personal-access-tokens/client/index.js new file mode 100644 index 000000000000..621ead8218b0 --- /dev/null +++ b/imports/personal-access-tokens/client/index.js @@ -0,0 +1 @@ +import './personalAccessTokens'; diff --git a/imports/personal-access-tokens/client/personalAccessTokens.html b/imports/personal-access-tokens/client/personalAccessTokens.html new file mode 100644 index 000000000000..31a0e7e3adab --- /dev/null +++ b/imports/personal-access-tokens/client/personalAccessTokens.html @@ -0,0 +1,68 @@ + +{{_ "You_are_not_authorized_to_view_this_page"}}
+ {{else}} +{{{_ "Chatpal_Get_more_information_about_chatpal_on_our_website"}}}
+ + {{#if apiKey}} +Please copy the key and insert it in the key field of the Chatpal Provider in the Search Admin Page.
++ {{_ "Chatpal_Welcome"}} +
+ {{/unless}} + {{#if $eq resultType "All"}} + {{#if result.user.docs}} +{{theError}}
+