Merge pull request #7326 from jangmarker/dont-rate-limit-bots-on-crea…

…teDirectMessage [NEW] Do not rate limit bots on createDirectMessage
RocketChat · Jul 25, 2017 · 320145a · 320145a
2 parents e2abd92 + 6f64e37
commit 320145a
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/server/methods/createDirectMessage.js b/server/methods/createDirectMessage.js
@@ -109,10 +109,8 @@ Meteor.methods({
 	}
 });
 
-DDPRateLimiter.addRule({
-	type: 'method',
-	name: 'createDirectMessage',
-	connectionId() {
-		return true;
+RocketChat.RateLimiter.limitMethod('createDirectMessage', 10, 60000, {
+	userId(userId) {
+		return !RocketChat.authz.hasPermission(userId, 'send-many-messages');
 	}
-}, 10, 60000);
+});