mirror of
https://github.com/NodeBB/NodeBB.git
synced 2026-07-06 04:37:51 +02:00
Merge remote-tracking branch 'origin/master' into socket.io1.x
This commit is contained in:
@@ -269,8 +269,8 @@ var socket,
|
||||
selector = selector || $('a');
|
||||
selector.each(function() {
|
||||
var href = $(this).attr('href');
|
||||
if (href && app.userslug && href.indexOf('_') !== -1) {
|
||||
$(this).attr('href', href.replace(/_/g, app.userslug));
|
||||
if (href && app.userslug && href.indexOf('user/_self_') !== -1) {
|
||||
$(this).attr('href', href.replace(/user\/_self_/g, 'user/' + app.userslug));
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
@@ -5,7 +5,7 @@ var winston = require('winston');
|
||||
|
||||
var ratelimit = {};
|
||||
|
||||
var allowedCallsPerSecond = 10;
|
||||
var allowedCallsPerSecond = 20;
|
||||
|
||||
|
||||
ratelimit.isFlooding = function(socket) {
|
||||
@@ -32,4 +32,4 @@ ratelimit.isFlooding = function(socket) {
|
||||
return false;
|
||||
};
|
||||
|
||||
module.exports = ratelimit;
|
||||
module.exports = ratelimit;
|
||||
|
||||
Reference in New Issue
Block a user