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

* 'master' of https://github.com/kiwiirc/irc-framework:
  Fix nick collisions where uuid's are sent from the server
  Force \r\n for all network rights, as per RFC
  Fix documentation links
  Add documentation links

Author: prawnsalad

README.md

@@ -1,5 +1,5 @@
 # irc-framework
-A better IRC framework for node.js. For bots and full clients
+A better IRC framework for node.js. For bots and full clients. Read the [documentation](https://github.com/kiwiirc/irc-framework/blob/master/docs/clientapi.md).
 
 ### Aims
 * Lightweight

docs/clientapi.md

@@ -1,6 +1,6 @@
 ### irc-framework Client instance API
 
-Inherits EventEmitter (https://nodejs.org/api/events.html)
+Inherits [EventEmitter](https://nodejs.org/api/events.html). Read more on the Events available [here](https://github.com/kiwiirc/irc-framework/blob/master/docs/events.md).
 
 #### Constructor
 ~~~javascript

src/client.js

@@ -225,6 +225,11 @@ module.exports = class IrcClient extends EventEmitter {
 
         commands.on('nick', function(event) {
             if (client.user.nick === event.nick) {
+                // nicks starting with numbers are reserved for uuids
+                // we dont want to store these as they cannot be used
+                if (event.new_nick.match(/^\d/)) {
+                    return;
+                }
                 client.user.nick = event.new_nick;
             }
         });

src/transports/net.js

@@ -37,9 +37,9 @@ module.exports = class Connection extends EventEmitter {
     writeLine(line, cb) {
     	if (this.socket && this.isConnected()) {
     		if (this.encoding !== 'utf8') {
-    			this.socket.write(iconv.encode(line + '\n', this.encoding), cb);
+    			this.socket.write(iconv.encode(line + '\r\n', this.encoding), cb);
     		} else {
-    			this.socket.write(line + '\n', cb);
+    			this.socket.write(line + '\r\n', cb);
     		}
     	}
     }