Some improvements from more-streams

packages/rocketchat-action-links/server/actionLinkHandler.js

@@ -16,7 +16,7 @@ Meteor.methods({
 			throw new Meteor.Error('error-invalid-actionlink', 'Invalid action link', { method: 'actionLinkHandler' });
 		}
 
-		var room = RocketChat.models.Rooms.findOne({ _id: message.rid });
+		var room = RocketChat.models.Rooms.findOneById(message.rid);
 		if (Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) === -1) {
 			throw new Meteor.Error('error-not-allowed', 'Not allowed', { method: 'actionLinkHandler' });
 		}

packages/rocketchat-api/server/routes.coffee

@@ -103,7 +103,7 @@ RocketChat.API.v1.addRoute 'channels.create', authRequired: true,
 			return RocketChat.API.v1.failure e.name + ': ' + e.message
 
 		return RocketChat.API.v1.success
-			channel: RocketChat.models.Rooms.findOne({_id: id.rid})
+			channel: RocketChat.models.Rooms.findOneById(id.rid)
 
 # List Private Groups a user has access to
 RocketChat.API.v1.addRoute 'groups.list', authRequired: true,
@@ -123,7 +123,7 @@ RocketChat.API.v1.addRoute 'channel.addall', authRequired: true,
 			return RocketChat.API.v1.failure e.name + ': ' + e.message
 
 		return RocketChat.API.v1.success
-			channel: RocketChat.models.Rooms.findOne({_id: @bodyParams.roomId})
+			channel: RocketChat.models.Rooms.findOneById(@bodyParams.roomId)
 
 # List all users
 RocketChat.API.v1.addRoute 'users.list', authRequired: true,
@@ -255,5 +255,4 @@ RocketChat.API.v1.addRoute 'groups.create', authRequired: true,
 			return RocketChat.API.v1.failure e.name + ': ' + e.message
 
 		return RocketChat.API.v1.success
-			group: RocketChat.models.Rooms.findOne({_id: id.rid})
-
+			group: RocketChat.models.Rooms.findOneById(id.rid)

packages/rocketchat-channel-settings/client/startup/trackSettingsChange.coffee

@@ -12,7 +12,7 @@ Meteor.startup ->
 
 		return msg
 
-	RocketChat.callbacks.add 'streamMessage', roomSettingsChangedCallback, RocketChat.callbacks.priority.HIGH
+	RocketChat.callbacks.add 'streamMessage', roomSettingsChangedCallback, RocketChat.callbacks.priority.HIGH, 'room-settings-changed'
 
 	roomNameChangedCallback = (msg) ->
 		Tracker.nonreactive ->
@@ -24,4 +24,4 @@ Meteor.startup ->
 
 		return msg
 
-	RocketChat.callbacks.add 'streamMessage', roomNameChangedCallback, RocketChat.callbacks.priority.HIGH
+	RocketChat.callbacks.add 'streamMessage', roomNameChangedCallback, RocketChat.callbacks.priority.HIGH, 'room-name-changed'

packages/rocketchat-highlight-words/client.coffee

@@ -22,4 +22,4 @@ class HighlightWordsClient
     message.html = msg
     return message
 
-RocketChat.callbacks.add 'renderMessage', HighlightWordsClient, RocketChat.callbacks.priority.MEDIUM + 1
+RocketChat.callbacks.add 'renderMessage', HighlightWordsClient, RocketChat.callbacks.priority.MEDIUM, 'highlight-words'

packages/rocketchat-highlight/highlight.coffee

@@ -61,5 +61,5 @@ class Highlight
 
 		return message
 
-RocketChat.callbacks.add 'renderMessage', Highlight, RocketChat.callbacks.priority.HIGH
+RocketChat.callbacks.add 'renderMessage', Highlight, RocketChat.callbacks.priority.HIGH, 'highlight'
 RocketChat.Highlight = true

packages/rocketchat-integrations/server/processWebhookMessage.js

@@ -22,15 +22,7 @@ this.processWebhookMessage = function(messageObj, user, defaultValues) {
 
 		switch (channelType) {
 			case '#':
-				room = RocketChat.models.Rooms.findOne({
-					$or: [
-						{
-							_id: channel
-						}, {
-							name: channel
-						}
-					]
-				});
+				room = RocketChat.models.Rooms.findOneByIdOrName(channel);
 				if (!_.isObject(room)) {
 					throw new Meteor.Error('invalid-channel');
 				}
@@ -52,18 +44,14 @@ this.processWebhookMessage = function(messageObj, user, defaultValues) {
 					]
 				}) || {};
 				rid = [user._id, roomUser._id].sort().join('');
-				room = RocketChat.models.Rooms.findOne({
-					_id: {
-						$in: [rid, channel]
-					}
-				});
+				room = RocketChat.models.Rooms.findOneById({$in: [rid, channel]});
 				if (!_.isObject(roomUser) && !_.isObject(room)) {
 					throw new Meteor.Error('invalid-channel');
 				}
 				if (!room) {
 					Meteor.runAsUser(user._id, function() {
 						Meteor.call('createDirectMessage', roomUser.username);
-						room = RocketChat.models.Rooms.findOne(rid);
+						room = RocketChat.models.Rooms.findOneById(rid);
 					});
 				}
 				break;

packages/rocketchat-katex/katex.coffee

@@ -171,7 +171,7 @@ class Katex
 RocketChat.katex = new Katex
 
 cb = RocketChat.katex.render_message.bind(RocketChat.katex)
-RocketChat.callbacks.add 'renderMessage', cb, RocketChat.callbacks.priority.HIGH - 1
+RocketChat.callbacks.add 'renderMessage', cb, RocketChat.callbacks.priority.HIGH - 1, 'katex'
 
 if Meteor.isClient
 	Blaze.registerHelper 'RocketChatKatex', (text) ->

packages/rocketchat-lib/README.md

@@ -13,8 +13,8 @@ RocketChat.settings.addGroup('Settings_Group', function() {
 
     this.section('Group_Section', function() {
         this.add('Setting_Inside_Section', 'default_value', {
-            type: 'boolean', 
-            public: true, 
+            type: 'boolean',
+            public: true,
             enableQuery: { 
                 _id: 'SettingInGroup', 
                 value: true 

packages/rocketchat-lib/client/MessageAction.coffee

@@ -120,9 +120,7 @@ Meteor.startup ->
 				input.updateAutogrow()
 			, 200
 		validation: (message) ->
-			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
-
-			if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
+			if not RocketChat.models.Subscriptions.findOne({ rid: message.rid })?
 				return false
 
 			hasPermission = RocketChat.authz.hasAtLeastOnePermission('edit-message', message.rid)
@@ -153,9 +151,7 @@ Meteor.startup ->
 			RocketChat.MessageAction.hideDropDown()
 			chatMessages[Session.get('openedRoom')].confirmDeleteMsg(message)
 		validation: (message) ->
-			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
-
-			if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
+			if not RocketChat.models.Subscriptions.findOne({ rid: message.rid })?
 				return false
 
 			hasPermission = RocketChat.authz.hasAtLeastOnePermission('delete-message', message.rid)
@@ -188,9 +184,7 @@ Meteor.startup ->
 			$(event.currentTarget).attr('data-clipboard-text', RocketChat.MessageAction.getPermaLink(message._id));
 			toastr.success(TAPi18n.__('Copied'))
 		validation: (message) ->
-			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
-
-			if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
+			if not RocketChat.models.Subscriptions.findOne({ rid: message.rid })?
 				return false
 
 			return true
@@ -211,9 +205,7 @@ Meteor.startup ->
 			$(event.currentTarget).attr('data-clipboard-text', message)
 			toastr.success(TAPi18n.__('Copied'))
 		validation: (message) ->
-			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
-
-			if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
+			if not RocketChat.models.Subscriptions.findOne({ rid: message.rid })?
 				return false
 
 			return true
@@ -238,9 +230,7 @@ Meteor.startup ->
 			input.focus()
 			RocketChat.MessageAction.hideDropDown()
 		validation: (message) ->
-			room = RocketChat.models.Rooms.findOne({ _id: message.rid })
-
-			if Array.isArray(room.usernames) && room.usernames.indexOf(Meteor.user().username) is -1
+			if not RocketChat.models.Subscriptions.findOne({ rid: message.rid })?
 				return false
 
 			return true

packages/rocketchat-lib/lib/settings.coffee

@@ -4,11 +4,9 @@
 ###
 RocketChat.settings =
 	callbacks: {}
+	regexCallbacks: {}
 	ts: new Date
 
-	get: (_id) ->
-		return Meteor.settings?[_id]
-
 	get: (_id, callback) ->
 		if callback?
 			RocketChat.settings.onload _id, callback
@@ -17,9 +15,22 @@ RocketChat.settings =
 					callback key, value
 				return
 
+			if _.isRegExp(_id)
+				for key, value of Meteor.settings when _id.test(key)
+					callback key, value
+				return
+
 			if Meteor.settings?[_id]?
 				callback _id, Meteor.settings?[_id]
 		else
+			if _.isRegExp(_id)
+				items = []
+				for key, value of Meteor.settings when _id.test(key)
+					items.push
+						key: key
+						value: value
+				return items
+
 			return Meteor.settings?[_id]
 
 	set: (_id, value, callback) ->
@@ -46,6 +57,10 @@ RocketChat.settings =
 			for callback in RocketChat.settings.callbacks['*']
 				callback key, value, initialLoad
 
+		for key, value of RocketChat.settings.regexCallbacks
+			if value.regex.test(key)
+				callback(key, value) for callback in value.callbacks
+
 
 	onload: (key, callback) ->
 		# if key is '*'
@@ -57,5 +72,12 @@ RocketChat.settings =
 		keys = [].concat key
 
 		for k in keys
-			RocketChat.settings.callbacks[k] ?= []
-			RocketChat.settings.callbacks[k].push callback
+			if _.isRegExp k
+				RocketChat.settings.regexCallbacks[k.source] ?= {
+					regex: k
+					callbacks: []
+				}
+				RocketChat.settings.regexCallbacks[k.source].callbacks.push callback
+			else
+				RocketChat.settings.callbacks[k] ?= []
+				RocketChat.settings.callbacks[k].push callback

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

@@ -33,4 +33,4 @@ RocketChat.callbacks.add('beforeSaveMessage', function(message) {
 
 	return message;
 
-}, 1);
+}, 1, 'filterATAllTag');

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

@@ -18,4 +18,4 @@ RocketChat.callbacks.add('beforeSaveMessage', function(message) {
 
 	return message;
 
-}, 1);
+}, 1, 'filterBadWords');

packages/rocketchat-lib/server/methods/joinDefaultChannels.coffee

@@ -1,6 +1,5 @@
 Meteor.methods
 	joinDefaultChannels: (silenced) ->
-
 		check silenced, Match.Optional(Boolean)
 
 		if not Meteor.userId()

packages/rocketchat-lib/server/models/Messages.coffee

@@ -256,7 +256,7 @@ RocketChat.models.Messages = new class extends RocketChat.models._Base
 		update =
 			$set:
 				attachments: attachments
-		console.log(query, update);
+
 		return @update query, update
 
 

packages/rocketchat-lib/server/models/Rooms.coffee

@@ -16,6 +16,17 @@ RocketChat.models.Rooms = new class extends RocketChat.models._Base
 
 		return @findOne query, options
 
+	findOneByIdOrName: (_idOrName, options) ->
+		query = {
+			$or: [{
+				_id: _idOrName
+			}, {
+				name: _idOrName
+			}]
+		}
+
+		return this.findOne(query, options)
+
 	findOneByImportId: (_id, options) ->
 		query =
 			importIds: _id

packages/rocketchat-lib/server/models/Subscriptions.coffee

@@ -71,6 +71,12 @@ RocketChat.models.Subscriptions = new class extends RocketChat.models._Base
 
 		return @find query, options
 
+	findByRoomId: (roomId, options) ->
+		query =
+			"rid": roomId
+
+		return @find query, options
+
 	getLastSeen: (options = {}) ->
 		query = { ls: { $exists: 1 } }
 		options.sort = { ls: -1 }

packages/rocketchat-livechat/client/views/app/tabbar/visitorInfo.js

@@ -135,9 +135,8 @@ Template.visitorInfo.helpers({
 
 		const data = Template.currentData();
 		if (data && data.rid) {
-			const room = RocketChat.models.Rooms.findOne(data.rid);
-			const user = Meteor.user();
-			return room.usernames.indexOf(user && user.username) !== -1;
+			const subscription = RocketChat.models.Subscriptions.findOne({ rid: data.rid });
+			return subscription !== undefined;
 		}
 		return false;
 	}

packages/rocketchat-livechat/server/hooks/offlineMessage.js

@@ -14,4 +14,4 @@ RocketChat.callbacks.add('livechat.offlineMessage', (data) => {
 	};
 
 	RocketChat.Livechat.sendRequest(postData);
-});
+}, RocketChat.callbacks.priority.MEDIUM, 'livechat-send-email-offline-message');

packages/rocketchat-livechat/server/hooks/sendToCRM.js

@@ -39,8 +39,8 @@ function sendToCRM(hook, room) {
 
 RocketChat.callbacks.add('livechat.closeRoom', (room) => {
 	return sendToCRM('closeRoom', room);
-});
+}, RocketChat.callbacks.priority.MEDIUM, 'livechat-send-crm-close-room');
 
 RocketChat.callbacks.add('livechat.saveInfo', (room) => {
 	return sendToCRM('saveLivechatInfo', room);
-});
+}, RocketChat.callbacks.priority.MEDIUM, 'livechat-send-crm-save-info');

packages/rocketchat-livechat/server/startup.js

@@ -28,5 +28,5 @@ Meteor.startup(() => {
 		throw new Meteor.Error(TAPi18n.__('You_cant_leave_a_livechat_room_Please_use_the_close_button', {
 			lng: user.language || RocketChat.settings.get('language') || 'en'
 		}));
-	}, RocketChat.callbacks.priority.LOW);
+	}, RocketChat.callbacks.priority.LOW, 'cant-leave-room');
 });

packages/rocketchat-markdown/markdown.coffee

@@ -79,7 +79,7 @@ class Markdown
 
 
 RocketChat.Markdown = Markdown
-RocketChat.callbacks.add 'renderMessage', Markdown    , RocketChat.callbacks.priority.HIGH
+RocketChat.callbacks.add 'renderMessage', Markdown, RocketChat.callbacks.priority.HIGH, 'markdown'
 
 if Meteor.isClient
 	Blaze.registerHelper 'RocketChatMarkdown', (text) ->

packages/rocketchat-markdown/markdowncode.coffee

@@ -82,4 +82,4 @@ class MarkdownCode
 RocketChat.MarkdownCode = MarkdownCode
 
 # MarkdownCode gets higher priority over Markdown so it's possible place a callback in between (katex for exmaple)
-RocketChat.callbacks.add 'renderMessage', MarkdownCode, RocketChat.callbacks.priority.HIGH - 2
+RocketChat.callbacks.add 'renderMessage', MarkdownCode, RocketChat.callbacks.priority.HIGH - 2, 'markdowncode'

packages/rocketchat-mentions/client.coffee

@@ -51,5 +51,5 @@ class MentionsClient
 			message.html = msg
 		return message
 
-RocketChat.callbacks.add 'renderMessage', MentionsClient
-RocketChat.callbacks.add 'renderMentions', MentionsClient
+RocketChat.callbacks.add 'renderMessage', MentionsClient, RocketChat.callbacks.priority.MEDIUM, 'mentions-message'
+RocketChat.callbacks.add 'renderMentions', MentionsClient, RocketChat.callbacks.priority.MEDIUM, 'mentions-mentions'

packages/rocketchat-mentions/server.coffee

@@ -49,4 +49,4 @@ class MentionsServer
 				message.channels = verifiedChannels
 		return message
 
-RocketChat.callbacks.add 'beforeSaveMessage', MentionsServer, RocketChat.callbacks.priority.HIGH
+RocketChat.callbacks.add 'beforeSaveMessage', MentionsServer, RocketChat.callbacks.priority.HIGH, 'mentions'