Service Accounts Notifications and broadcast added

.meteor/packages

@@ -71,7 +71,6 @@ raix:handlebar-helpers
 rocketchat:push
 raix:ui-dropped-event
 todda00:friendly-slugs
-yasinuslu:blaze-meta
 
 tap:i18n
 underscore@1.0.10

.meteor/versions

@@ -70,7 +70,7 @@ konecty:change-case@2.3.0
 konecty:delayed-task@1.0.0
 konecty:mongo-counter@0.0.5_3
 konecty:multiple-instances-status@1.1.0
-konecty:user-presence@2.4.0
+konecty:user-presence@2.5.0
 launch-screen@1.1.1
 less@2.8.0
 littledata:synced-cron@1.5.1
@@ -159,4 +159,3 @@ underscore@1.0.10
 url@1.2.0
 webapp@1.7.2
 webapp-hashing@1.0.9
-yasinuslu:blaze-meta@0.3.3

app/channel-settings/client/views/channelSettings.html

@@ -122,9 +122,9 @@
 			<div class="rc-user-info__row rc-user-info__row--separator">
 				<div class="rc-switch-double">
 					<div class="rc-switch-double__label {{equal false value 'disabled'}}">
-						{{_ "React_when_read_only"}}
+						{{_ "Disallow_reacting"}}
 						<div class="rc-switch-double__description">
-							{{_ "React_when_read_only"}}
+							{{_ "Disallow_reacting_Description"}}
 						</div>
 					</div>
 					<div class="rc-switch rc-switch--blue">
@@ -136,9 +136,9 @@
 						</label>
 					</div>
 					<div class="rc-switch-double__label {{equal true value 'disabled'}}">
-						{{_ "Disallow_reacting"}}
+						{{_ "React_when_read_only"}}
 						<div class="rc-switch-double__description">
-							{{_ "Disallow_reacting_Description"}}
+							{{_ "React_when_read_only"}}
 						</div>
 					</div>
 				</div>

app/custom-oauth/server/custom_oauth_server.js

@@ -151,6 +151,7 @@ export class CustomOAuth {
 		const params = {};
 		const headers = {
 			'User-Agent': this.userAgent, // http://doc.gitlab.com/ce/api/users.html#Current-user
+			Accept: 'application/json',
 		};
 
 		if (this.identityTokenSentVia === 'header') {

app/emoji-custom/client/admin/adminEmoji.js

@@ -42,6 +42,18 @@ Template.adminEmoji.helpers({
 			data: Template.instance().tabBarData.get(),
 		};
 	},
+	onTableScroll() {
+		const instance = Template.instance();
+		return function(currentTarget) {
+			if ((currentTarget.offsetHeight + currentTarget.scrollTop) < (currentTarget.scrollHeight - 100)) {
+				return;
+			}
+			if (Template.instance().limit.get() > Template.instance().customemoji().length) {
+				return false;
+			}
+			instance.limit.set(instance.limit.get() + 50);
+		};
+	},
 	onTableItemClick() {
 		const instance = Template.instance();
 		return function({ _id }) {

app/federation/server/config.js

@@ -0,0 +1,74 @@
+import mem from 'mem';
+
+import { getWorkspaceAccessToken } from '../../cloud/server';
+import { FederationKeys } from '../../models/server';
+import { settings } from '../../settings/server';
+import * as SettingsUpdater from './settingsUpdater';
+import { logger } from './logger';
+
+const defaultConfig = {
+	hub: {
+		active: null,
+		url: null,
+	},
+	peer: {
+		uniqueId: null,
+		domain: null,
+		url: null,
+		public_key: null,
+	},
+	cloud: {
+		token: null,
+	},
+};
+
+const getConfigLocal = () => {
+	const _enabled = settings.get('FEDERATION_Enabled');
+
+	if (!_enabled) { return defaultConfig; }
+
+	// If it is enabled, check if the settings are there
+	const _uniqueId = settings.get('FEDERATION_Unique_Id');
+	const _domain = settings.get('FEDERATION_Domain');
+	const _discoveryMethod = settings.get('FEDERATION_Discovery_Method');
+	const _hubUrl = settings.get('FEDERATION_Hub_URL');
+	const _peerUrl = settings.get('Site_Url');
+
+	if (!_domain || !_discoveryMethod || !_hubUrl || !_peerUrl) {
+		SettingsUpdater.updateStatus('Could not enable, settings are not fully set');
+
+		logger.setup.error('Could not enable Federation, settings are not fully set');
+
+		return defaultConfig;
+	}
+
+	logger.setup.info('Updating settings...');
+
+	// Normalize the config values
+	return {
+		hub: {
+			active: _discoveryMethod === 'hub',
+			url: _hubUrl.replace(/\/+$/, ''),
+		},
+		peer: {
+			uniqueId: _uniqueId,
+			domain: _domain.replace('@', '').trim(),
+			url: _peerUrl.replace(/\/+$/, ''),
+			public_key: FederationKeys.getPublicKeyString(),
+		},
+		cloud: {
+			token: getWorkspaceAccessToken(),
+		},
+	};
+};
+
+export const getConfig = mem(getConfigLocal);
+
+const updateValue = () => mem.clear(getConfig);
+
+settings.get('FEDERATION_Enabled', updateValue);
+settings.get('FEDERATION_Unique_Id', updateValue);
+settings.get('FEDERATION_Domain', updateValue);
+settings.get('FEDERATION_Status', updateValue);
+settings.get('FEDERATION_Discovery_Method', updateValue);
+settings.get('FEDERATION_Hub_URL', updateValue);

app/federation/server/index.js

@@ -13,9 +13,9 @@ import './methods/dashboard';
 import { addUser } from './methods/addUser';
 import { searchUsers } from './methods/searchUsers';
 import { ping } from './methods/ping';
-import { getWorkspaceAccessToken } from '../../cloud/server';
 import { FederationKeys } from '../../models';
 import { settings } from '../../settings';
+import { getConfig } from './config';
 
 const peerClient = new PeerClient();
 const peerDNS = new PeerDNS();
@@ -73,39 +73,7 @@ const updateSettings = _.debounce(Meteor.bindEnvironment(function() {
 
 	if (!_enabled) { return; }
 
-	// If it is enabled, check if the settings are there
-	const _uniqueId = settings.get('FEDERATION_Unique_Id');
-	const _domain = settings.get('FEDERATION_Domain');
-	const _discoveryMethod = settings.get('FEDERATION_Discovery_Method');
-	const _hubUrl = settings.get('FEDERATION_Hub_URL');
-	const _peerUrl = settings.get('Site_Url');
-
-	if (!_domain || !_discoveryMethod || !_hubUrl || !_peerUrl) {
-		SettingsUpdater.updateStatus('Could not enable, settings are not fully set');
-
-		logger.setup.error('Could not enable Federation, settings are not fully set');
-
-		return;
-	}
-
-	logger.setup.info('Updating settings...');
-
-	// Normalize the config values
-	const config = {
-		hub: {
-			active: _discoveryMethod === 'hub',
-			url: _hubUrl.replace(/\/+$/, ''),
-		},
-		peer: {
-			uniqueId: _uniqueId,
-			domain: _domain.replace('@', '').trim(),
-			url: _peerUrl.replace(/\/+$/, ''),
-			public_key: FederationKeys.getPublicKeyString(),
-		},
-		cloud: {
-			token: getWorkspaceAccessToken(),
-		},
-	};
+	const config = getConfig();
 
 	// If the settings are correctly set, let's update the configuration
 

app/ldap/server/sync.js

@@ -144,7 +144,7 @@ export function getDataToSyncUserData(ldapUser, user) {
 							if (currKey === lastKey) {
 								obj[currKey] = tmpLdapField;
 							} else {
-								obj[currKey] = obj[currKey];
+								obj[currKey] = obj[currKey] || {};
 							}
 							return obj[currKey];
 						}, userData);

app/lib/client/methods/sendMessage.js

@@ -1,17 +1,23 @@
 import { Meteor } from 'meteor/meteor';
 import { TimeSync } from 'meteor/mizzao:timesync';
 import s from 'underscore.string';
+import toastr from 'toastr';
 
 import { ChatMessage } from '../../../models';
 import { settings } from '../../../settings';
 import { callbacks } from '../../../callbacks';
 import { promises } from '../../../promises/client';
+import { t } from '../../../utils/client';
 
 Meteor.methods({
 	sendMessage(message) {
 		if (!Meteor.userId() || s.trim(message.msg) === '') {
 			return false;
 		}
+		const messageAlreadyExists = message._id && ChatMessage.findOne({ _id: message._id });
+		if (messageAlreadyExists) {
+			return toastr.error(t('Message_Already_Sent'));
+		}
 		const user = Meteor.user();
 		message.ts = isNaN(TimeSync.serverOffset()) ? new Date() : new Date(Date.now() + TimeSync.serverOffset());
 		message.u = {

app/lib/server/functions/checkUsernameAvailability.js

@@ -8,7 +8,7 @@ let usernameBlackList = [];
 const toRegExp = (username) => new RegExp(`^${ s.escapeRegExp(username).trim() }$`, 'i');
 
 settings.get('Accounts_BlockedUsernameList', (key, value) => {
-	usernameBlackList = value.split(',').map(toRegExp);
+	usernameBlackList = ['all', 'here'].concat(value.split(',')).map(toRegExp);
 });
 
 const usernameIsBlocked = (username, usernameBlackList) => usernameBlackList.length

app/lib/server/functions/notifications/serviceAccount.js

@@ -0,0 +1,31 @@
+import { metrics } from '../../../../metrics';
+import { Notifications } from '../../../../notifications';
+
+export function shouldNotifyServiceAccountOwner({
+	statusConnection,
+	hasMentionToAll,
+	hasMentionToHere,
+	isHighlighted,
+	hasMentionToUser,
+	hasReplyToThread,
+	roomType,
+}) {
+	if (statusConnection === 'online') {
+		return false;
+	}
+	return roomType === 'd' || hasMentionToAll || hasMentionToHere || isHighlighted || hasMentionToUser || hasReplyToThread;
+}
+
+export function notifyServiceAccountOwner(receiver, ownerId, message, room) {
+	metrics.notificationsSent.inc({ notification_type: 'sa' });
+	Notifications.notifyUser(ownerId, 'sa-notification', {
+		payload: {
+			_id: message._id,
+			rid: message.rid,
+			sender: message.u,
+			receiver: receiver.username,
+			type: room.t,
+			name: room.name,
+		},
+	});
+}

app/lib/server/functions/sendMessage.js

@@ -198,6 +198,10 @@ export const sendMessage = function(user, message, room, upsert = false) {
 			}, message);
 			message._id = _id;
 		} else {
+			const messageAlreadyExists = message._id && Messages.findOneById(message._id, { fields: { _id: 1 } });
+			if (messageAlreadyExists) {
+				return;
+			}
 			message._id = Messages.insert(message);
 		}
 

app/lib/server/functions/setStatusText.js

@@ -45,7 +45,7 @@ export const _setStatusText = function(userId, statusText) {
 	return true;
 };
 
-export const setStatusText = RateLimiter.limitFunction(_setStatusText, 1, 60000, {
+export const setStatusText = RateLimiter.limitFunction(_setStatusText, 5, 60000, {
 	0() {
 		// Administrators have permission to change others status, so don't limit those
 		return !Meteor.userId() || !hasPermission(Meteor.userId(), 'edit-other-user-info');

app/lib/server/lib/sendNotificationsOnMessage.js

@@ -11,6 +11,7 @@ import { sendEmail, shouldNotifyEmail } from '../functions/notifications/email';
 import { sendSinglePush, shouldNotifyMobile } from '../functions/notifications/mobile';
 import { notifyDesktopUser, shouldNotifyDesktop } from '../functions/notifications/desktop';
 import { notifyAudioUser, shouldNotifyAudio } from '../functions/notifications/audio';
+import { notifyServiceAccountOwner, shouldNotifyServiceAccountOwner } from '../functions/notifications/serviceAccount';
 
 export const sendNotification = async ({
 	subscription,
@@ -46,6 +47,7 @@ export const sendNotification = async ({
 					status: 1,
 					statusConnection: 1,
 					username: 1,
+					u: 1,
 				},
 			}),
 		];
@@ -149,6 +151,18 @@ export const sendNotification = async ({
 			return false;
 		});
 	}
+
+	if (receiver.u && shouldNotifyServiceAccountOwner({
+		statusConnection: receiver.statusConnection,
+		hasMentionToAll,
+		hasMentionToHere,
+		isHighlighted,
+		hasMentionToUser,
+		hasReplyToThread,
+		roomType,
+	})) {
+		notifyServiceAccountOwner(receiver, receiver.u._id, message, room);
+	}
 };
 
 const project = {
@@ -168,6 +182,7 @@ const project = {
 		'receiver.status': 1,
 		'receiver.statusConnection': 1,
 		'receiver.username': 1,
+		'receiver.u': 1,
 	},
 };
 

app/livechat/server/api/v1/pageVisited.js

@@ -1,17 +1,15 @@
-import { Meteor } from 'meteor/meteor';
 import { Match, check } from 'meteor/check';
 import _ from 'underscore';
 
 import { API } from '../../../../api';
-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,
+				rid: Match.Maybe(String),
 				pageInfo: Match.ObjectIncluding({
 					change: String,
 					title: String,
@@ -22,17 +20,6 @@ API.v1.addRoute('livechat/page.visited', {
 			});
 
 			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');

app/message-pin/client/actionButton.js

@@ -64,7 +64,7 @@ Meteor.startup(function() {
 		id: 'jump-to-pin-message',
 		icon: 'jump',
 		label: 'Jump_to_message',
-		context: ['pinned'],
+		context: ['pinned', 'message', 'message-mobile'],
 		action() {
 			const { msg: message } = messageArgs(this);
 			if (window.matchMedia('(max-width: 500px)').matches) {

app/message-star/client/actionButton.js

@@ -63,7 +63,7 @@ Meteor.startup(function() {
 		id: 'jump-to-star-message',
 		icon: 'jump',
 		label: 'Jump_to_message',
-		context: ['starred', 'threads'],
+		context: ['starred', 'threads', 'message', 'message-mobile'],
 		action() {
 			const { msg: message } = messageArgs(this);
 			if (window.matchMedia('(max-width: 500px)').matches) {