Merge pull request #1 from LinuxMercedes/bleeding

Get the actual hostname from a whois call
matrix-org · Jul 31, 2015 · c9474ba · c9474ba
2 parents 94ba720 + 842ab05
commit c9474ba
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/irc.js b/lib/irc.js
@@ -128,6 +128,11 @@ function Client(server, nick, opt) {
                 self.hostMask = welcomeStringWords[welcomeStringWords.length - 1];
                 self._updateMaxLineLength();
                 self.emit('registered', message);
+                self.whois(self.nick, function(args) {
+                    self.nick = args.nick;
+                    self.hostMask = args.user + "@" + args.host;
+                    self._updateMaxLineLength();
+                });
                 break;
             case 'rpl_myinfo':
                 self.supported.usermodes = message.args[3];
@@ -952,7 +957,7 @@ Client.prototype.notice = function(target, text) {
 
 Client.prototype._speak = function(kind, target, text) {
     var self = this;
-    var maxLength = this.maxLineLength - target.length;
+    var maxLength = Math.min(this.maxLineLength - target.length, this.opt.messageSplit);
     if (typeof text !== 'undefined') {
         text.toString().split(/\r?\n/).filter(function(line) {
             return line.length > 0;