Merge branch 'master' of https://github.com/kiwiirc/irc-framework

# Conflicts:
#	src/irclineparser.js

Author: prawnsalad

browser.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * The default irc-framework interface for browsers
  * Usage: var IrcFramework = require('irc-framework/browser');

docs/events.md

@@ -438,7 +438,7 @@ Not all of these options will be available. Some will be missing depending on th
 	user: 'prawn',
 	host: 'manchester.isp.net',
 	actualip: 'sometimes set when using webirc, could be the same as actualhost',
-	actuallhost: 'sometimes set when using webirc',
+	actualhost: 'sometimes set when using webirc',
 	real_name: 'A real prawn',
 	helpop: 'is available for help',
 	bot: 'is a bot',

index.js

@@ -1,3 +1,5 @@
+'use strict';
+
 /**
  * The default irc-framework interface for nodejs
  * Usage: var IrcFramework = require('irc-framework');

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "irc-framework",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "description": "A better IRC framework for node.js",
   "main": "index.js",
   "dependencies": {

package.json

@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('lodash');
 var DuplexStream = require('stream').Duplex;
 

src/channel.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var EventEmitter = require('eventemitter3');
 var _ = require('lodash');
 var MiddlewareHandler = require('middleware-handler');
@@ -247,7 +249,7 @@ IrcClient.prototype.registerToNetwork = function() {
     }
 
     this.raw('NICK', this.user.nick);
-    this.raw('USER', this.user.username, 0, '*', this.user.gecos);
+    this.raw('USER', this.options.username, 0, '*', this.user.gecos);
 };
 
 
@@ -625,8 +627,8 @@ IrcClient.prototype.matchAction = function(match_regex, cb) {
  * Truncate a string into blocks of a set size
  */
 function isHighSurrogate(char_code) {
-    return char_code >= 55296 // d800
-        && char_code <= 56319; // dbff
+    return char_code >= 55296 && // d800
+           char_code <= 56319; // dbff
 }
 
 function truncateString(str, block_size) {
@@ -639,9 +641,9 @@ function truncateString(str, block_size) {
     while (remaining_string.length) {
         // Do not split unicode surrogate pairs
         this_block_size =
-            isHighSurrogate(remaining_string.charCodeAt(block_size - 1))
-            ? block_size - 1
-            : block_size;
+            isHighSurrogate(remaining_string.charCodeAt(block_size - 1)) ?
+            block_size - 1 :
+            block_size;
 
         blocks.push(remaining_string.substr(0, this_block_size));
         remaining_string = remaining_string.substr(this_block_size);

src/client.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('lodash');
 
 module.exports = IrcCommand;

src/commands/command.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('lodash');
 var EventEmitter = require('eventemitter3');
 var irc_numerics = require('./numerics');

src/commands/handler.js

@@ -1,3 +1,5 @@
+'use strict';
+
 var _ = require('lodash');
 var Helpers = require('../../helpers');