Replace %n with the nick for a custom real name #247

diff --git a/config.example.js b/config.example.js
index e3cfcde210b3c8a57cdae7f5795487a061bc5aea..a86fdb1047920990118bec1bd24dddcfe5597d85 100644 (file)
--- a/config.example.js
+++ b/config.example.js
@@ -74,6 +74,7 @@ conf.default_encoding = 'utf8';
 
 /*
 * Default GECOS (real name) for IRC connections
+* %n will be replaced with the users nick
 */
 //conf.default_gecos = 'Web IRC Client';
 

diff --git a/server/irc/connection.js b/server/irc/connection.js
index 5278ad1f699d8e2e6566df511efd654c841a1439..f7f8e82bb651601fe1fdc05c2d4191f952aa98f7 100644 (file)
--- a/server/irc/connection.js
+++ b/server/irc/connection.js
@@ -564,6 +564,10 @@ var socketConnectHandler = function () {
     global.modules.emit('irc authorize', connect_data).done(function ircAuthorizeCb() {
         var gecos = '[www.kiwiirc.com] ' + that.nick;
 
+        if (global.config.default_gecos) {
+            gecos = global.config.default_gecos.toString().replace('%n', that.nick);
+        }
+
         // Send any initial data for webirc/etc
         if (connect_data.prepend_data) {
             _.each(connect_data.prepend_data, function(data) {
@@ -577,7 +581,7 @@ var socketConnectHandler = function () {
             that.write('PASS ' + that.password);
 
         that.write('NICK ' + that.nick);
-        that.write('USER ' + that.username + ' 0 0 :' + (global.config.default_gecos || gecos));
+        that.write('USER ' + that.username + ' 0 0 :' + gecos);
 
         that.emit('connected');
     });