Merge pull request RocketChat#5733 from ggazzo/xk-task1

(slash commands) invite all users to another room, create a private channel and send a direct message

Author: engelgabriel

.meteor/packages

@@ -96,10 +96,12 @@ rocketchat:slashcommands-archive
 rocketchat:slashcommands-asciiarts
 rocketchat:slashcommands-create
 rocketchat:slashcommands-invite
+rocketchat:slashcommands-invite-all
 rocketchat:slashcommands-join
 rocketchat:slashcommands-kick
 rocketchat:slashcommands-leave
 rocketchat:slashcommands-me
+rocketchat:slashcommands-msg
 rocketchat:slashcommands-mute
 rocketchat:slashcommands-open
 rocketchat:slashcommands-topic

.meteor/versions

@@ -182,10 +182,12 @@ rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
+rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
+rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]
 rocketchat:[email protected]

packages/rocketchat-i18n/i18n/en.i18n.json

@@ -270,7 +270,8 @@
   "Change_Room_Type": "Changing the Room Type",
   "channel": "channel",
   "Channel": "Channel",
-  "Channel_already_exist": "The channel '#%s' already exists.",
+  "Channel_already_exist": "The channel `#%s` already exists.",
+  "Channel_created": "Channel `#%s` created.",
   "Channel_already_Unarchived": "Channel with name `#%s` is already in Unarchived state",
   "Channel_Archived": "Channel with name `#%s` has been archived successfully",
   "Channel_doesnt_exist": "The channel `#%s` does not exist.",
@@ -494,6 +495,7 @@
   "error-user-is-not-activated": "User is not activated",
   "error-user-not-in-room": "User is not in this room",
   "error-user-registration-disabled": "User registration is disabled",
+  "error-user-limit-exceeded" : "The number of users you are trying to invite to #channel_name exceeds the limit set by the administrator",
   "error-user-registration-secret": "User registration is only allowed via Secret URL",
   "error-you-are-last-owner": "You are the last owner. Please set new owner before leaving the room.",
   "Error_changing_password": "Error changing password",
@@ -660,6 +662,8 @@
   "Invitation_Subject": "Invitation Subject",
   "Invitation_Subject_Default": "You have been invited to [Site_Name]",
   "Invite_user_to_join_channel": "Invite one user to join this channel",
+  "Invite_user_to_join_channel_all_to": "Invite all users from this channel to join [#channel]",
+  "Invite_user_to_join_channel_all_from": "Invite all users from [#channel] to join this channel", 
   "Invite_Users": "Invite Users",
   "is_also_typing": "is also typing",
   "is_also_typing_female": "is also typing",
@@ -1466,6 +1470,7 @@
   "Username_title": "Register username",
   "Username_wants_to_start_otr_Do_you_want_to_accept": "__username__ wants to start OTR. Do you want to accept?",
   "Users": "Users",
+  "Users_added": "The users have been added",
   "Users_in_role": "Users in role",
   "UTF8_Names_Slugify": "UTF8 Names Slugify",
   "UTF8_Names_Validation": "UTF8 Names Validation",

packages/rocketchat-lib/package.js

@@ -121,6 +121,7 @@ Package.onUse(function(api) {
 	api.addFiles('server/methods/addOAuthService.coffee', 'server');
 	api.addFiles('server/methods/refreshOAuthService.js', 'server');
 	api.addFiles('server/methods/addUserToRoom.coffee', 'server');
+	api.addFiles('server/methods/addUsersToRoom.js', 'server');
 	api.addFiles('server/methods/archiveRoom.coffee', 'server');
 	api.addFiles('server/methods/blockUser.js', 'server');
 	api.addFiles('server/methods/checkRegistrationSecretURL.coffee', 'server');

packages/rocketchat-lib/server/methods/addUsersToRoom.js

@@ -0,0 +1,40 @@
+Meteor.methods({
+	addUsersToRoom: function(data) {
+		var fromId, room;
+		if (!Meteor.userId()) {
+			throw new Meteor.Error('error-invalid-user', 'Invalid user', {
+				method: 'addUserToRoom'
+			});
+		}
+		if (!Match.test(data != null ? data.rid : void 0, String)) {
+			throw new Meteor.Error('error-invalid-room', 'Invalid room', {
+				method: 'addUserToRoom'
+			});
+		}
+
+		room = RocketChat.models.Rooms.findOneById(data.rid);
+		if (room.usernames.indexOf(Meteor.user().username) === -1) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+				method: 'addUserToRoom'
+			});
+		}
+
+		fromId = Meteor.userId();
+		if (!RocketChat.authz.hasPermission(fromId, 'add-user-to-room', room._id)) {
+			throw new Meteor.Error('error-not-allowed', 'Not allowed', {
+				method: 'addUserToRoom'
+			});
+		}
+		if (room.t === 'd') {
+			throw new Meteor.Error('error-cant-invite-for-direct-room', 'Can\'t invite user to direct rooms', {
+				method: 'addUserToRoom'
+			});
+		}
+		data.users = Array.isArray(data.users) ? data.users : [];
+		data.users.forEach(function(username) {
+			let newUser = RocketChat.models.Users.findOneByUsername(username);
+			RocketChat.addUserToRoom(data.rid, newUser, Meteor.user());
+		});
+		return true;
+	}
+});

packages/rocketchat-slashcommands-create/server.js

@@ -1,9 +1,22 @@
 function Create(command, params, item) {
+	function getParams(str) {
+		const regex = /(--(\w+))+/g;
+		let m, result = [];
+		while ((m = regex.exec(str)) !== null) {
+			if (m.index === regex.lastIndex) {
+				regex.lastIndex++;
+			}
+			result.push(m[2]);
+		}
+		return result;
+	}
 	var channel, room, user;
+	var regexp = /#?([\d-_\w]+)/g;
 	if (command !== 'create' || !Match.test(params, String)) {
 		return;
 	}
-	channel = params.trim();
+	channel = regexp.exec(params.trim());
+	channel = channel ? channel[1] : '';
 	if (channel === '') {
 		return;
 	}
@@ -22,7 +35,12 @@ function Create(command, params, item) {
 		});
 		return;
 	}
+
+	if (getParams(params).indexOf('private') > -1) {
+		return Meteor.call('createPrivateGroup', channel, []);
+	}
+
 	Meteor.call('createChannel', channel, []);
 }
 
-RocketChat.slashCommands.add('create', Create);
+RocketChat.slashCommands.add('create', Create);

packages/rocketchat-slashcommands-inviteall/client.js

@@ -0,0 +1,8 @@
+RocketChat.slashCommands.add('invite-all-to', undefined, {
+	description: 'Invite_user_to_join_channel_all_to',
+	params: '#room'
+});
+RocketChat.slashCommands.add('invite-all-from', undefined, {
+	description: 'Invite_user_to_join_channel_all_from',
+	params: '#room'
+});

packages/rocketchat-slashcommands-inviteall/package.js

@@ -0,0 +1,21 @@
+Package.describe({
+	name: 'rocketchat:slashcommands-invite-all',
+	version: '0.0.1',
+	summary: 'Message pre-processor that will translate /invite-all commands',
+	git: ''
+});
+
+Package.onUse(function(api) {
+
+	api.use([
+		'ecmascript',
+		'coffeescript',
+		'check',
+		'rocketchat:lib'
+	]);
+
+	api.use('templating', 'client');
+
+	api.addFiles('client.js', 'client');
+	api.addFiles('server.js', 'server');
+});

packages/rocketchat-slashcommands-inviteall/server.js

@@ -0,0 +1,81 @@
+/*
+ * Invite is a named function that will replace /invite commands
+ * @param {Object} message - The message object
+ */
+
+function inviteAll(type) {
+
+	return function inviteAll(command, params, item) {
+
+		if (!/invite\-all-(to|from)/.test(command) || !Match.test(params, String)) {
+			return;
+		}
+
+		let regexp = /#?([\d-_\w]+)/g,
+			[, channel] = regexp.exec(params.trim());
+
+		if (!channel) {
+			return;
+		}
+
+		let currentUser = Meteor.users.findOne(Meteor.userId());
+		let baseChannel = type === 'to' ? RocketChat.models.Rooms.findOneById(item.rid) : RocketChat.models.Rooms.findOneByName(channel);
+		let targetChannel = type === 'from' ? RocketChat.models.Rooms.findOneById(item.rid) : RocketChat.models.Rooms.findOneByName(channel);
+
+		if (!baseChannel) {
+			return RocketChat.Notifications.notifyUser(Meteor.userId(), 'message', {
+				_id: Random.id(),
+				rid: item.rid,
+				ts: new Date(),
+				msg: TAPi18n.__('Channel_doesnt_exist', {
+					postProcess: 'sprintf',
+					sprintf: [channel]
+				}, currentUser.language)
+			});
+		}
+		let users = baseChannel.usernames || [];
+
+		try {
+			if (users.length > RocketChat.settings.get('API_User_Limit')) {
+				throw new Meteor.Error('error-user-limit-exceeded', 'User Limit Exceeded', {
+					method: 'addAllToRoom'
+				});
+			}
+
+			if (!targetChannel && ['c', 'p'].indexOf(baseChannel.t) > -1) {
+				Meteor.call(baseChannel.t === 'c' ? 'createChannel' : 'createPrivateGroup', channel, users);
+				RocketChat.Notifications.notifyUser(Meteor.userId(), 'message', {
+					_id: Random.id(),
+					rid: item.rid,
+					ts: new Date(),
+					msg: TAPi18n.__('Channel_created', {
+						postProcess: 'sprintf',
+						sprintf: [channel]
+					}, currentUser.language)
+				});
+			} else {
+				Meteor.call('addUsersToRoom', {
+					rid: targetChannel._id,
+					users: users
+				});
+			}
+			return RocketChat.Notifications.notifyUser(Meteor.userId(), 'message', {
+				_id: Random.id(),
+				rid: item.rid,
+				ts: new Date(),
+				msg: TAPi18n.__('Users_added', null, currentUser.language)
+			});
+		} catch (e) {
+			let msg = e.error === 'cant-invite-for-direct-room' ? 'Cannot_invite_users_to_direct_rooms' : e.error;
+			RocketChat.Notifications.notifyUser(Meteor.userId(), 'message', {
+				_id: Random.id(),
+				rid: item.rid,
+				ts: new Date(),
+				msg: TAPi18n.__(msg, null, currentUser.language)
+			});
+		}
+	};
+}
+RocketChat.slashCommands.add('invite-all-to', inviteAll('to'));
+RocketChat.slashCommands.add('invite-all-from', inviteAll('from'));
+module.exports = inviteAll;