Merge remote-tracking branch 'origin/master' into socket.io1.x

public/src/app.js

@@ -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));
 			}
 		});
 	};

src/middleware/ratelimit.js

@@ -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;