From 7d243948149157c9a34b674131ce718a6f059c2c Mon Sep 17 00:00:00 2001
From: Pavel Djundik <github@xpaw.me>
Date: Tue, 29 Mar 2016 22:09:56 +0300
Subject: [PATCH] Update irc-framework and fix issue when changing your own
 nick

---
 client/views/actions/nick.tpl  |  2 +-
 package.json                   |  2 +-
 src/plugins/irc-events/nick.js | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/client/views/actions/nick.tpl b/client/views/actions/nick.tpl
index 8b7304f4..2481e914 100644
--- a/client/views/actions/nick.tpl
+++ b/client/views/actions/nick.tpl
@@ -1,3 +1,3 @@
 <a href="#" class="user" data-name="{{nick}}">{{mode}}{{nick}}</a>
 is now known as
-<a href="#" class="user" data-name="{{newnick}}">{{mode}}{{newnick}}</a>
+<a href="#" class="user" data-name="{{new_nick}}">{{mode}}{{new_nick}}</a>
diff --git a/package.json b/package.json
index 9bdf4bbf..5dcb8804 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "event-stream": "3.3.2",
     "express": "4.13.4",
     "lodash": "4.6.1",
-    "irc-framework": "1.0.8",
+    "irc-framework": "1.0.10",
     "mkdirp": "0.5.1",
     "moment": "2.12.0",
     "read": "1.0.7",
diff --git a/src/plugins/irc-events/nick.js b/src/plugins/irc-events/nick.js
index a3719cb8..25e2b609 100644
--- a/src/plugins/irc-events/nick.js
+++ b/src/plugins/irc-events/nick.js
@@ -8,7 +8,7 @@ module.exports = function(irc, network) {
 		if (data.nick === irc.user.nick) {
 			var lobby = network.channels[0];
 			var msg = new Msg({
-				text: "You're now known as " + data.newnick,
+				text: "You're now known as " + data.new_nick,
 			});
 			lobby.messages.push(msg);
 			client.emit("msg", {
@@ -19,7 +19,7 @@ module.exports = function(irc, network) {
 			client.save();
 			client.emit("nick", {
 				network: network.id,
-				nick: data.newnick
+				nick: data.new_nick
 			});
 		}
 
@@ -28,7 +28,7 @@ module.exports = function(irc, network) {
 			if (typeof user === "undefined") {
 				return;
 			}
-			user.name = data.newnick;
+			user.name = data.new_nick;
 			chan.sortUsers(irc);
 			client.emit("users", {
 				chan: chan.id
@@ -36,9 +36,9 @@ module.exports = function(irc, network) {
 			var msg = new Msg({
 				time: data.time,
 				type: Msg.Type.NICK,
-				mode: chan.getMode(data.newnick),
+				mode: chan.getMode(data.new_nick),
 				nick: data.nick,
-				newnick: data.newnick,
+				new_nick: data.new_nick,
 				self: self
 			});
 			chan.messages.push(msg);