diff --git a/client/views/actions/nick.tpl b/client/views/actions/nick.tpl
index dc6ed133..567aeaa7 100644
--- a/client/views/actions/nick.tpl
+++ b/client/views/actions/nick.tpl
@@ -1,3 +1,3 @@
-{{mode}}{{from}}
+{{mode}}{{nick}}
is now known as
-{{mode}}{{text}}
+{{mode}}{{newnick}}
diff --git a/src/plugins/irc-events/nick.js b/src/plugins/irc-events/nick.js
index ca51bbde..93926db4 100644
--- a/src/plugins/irc-events/nick.js
+++ b/src/plugins/irc-events/nick.js
@@ -5,11 +5,10 @@ module.exports = function(irc, network) {
var client = this;
irc.on("nick", function(data) {
var self = false;
- var nick = data["new"];
- if (nick === irc.user.nick) {
+ if (data.nick === irc.user.nick) {
var lobby = network.channels[0];
var msg = new Msg({
- text: "You're now known as " + nick,
+ text: "You're now known as " + data.newnick,
});
lobby.messages.push(msg);
client.emit("msg", {
@@ -20,23 +19,25 @@ module.exports = function(irc, network) {
client.save();
client.emit("nick", {
network: network.id,
- nick: nick
+ nick: data.newnick
});
}
+
network.channels.forEach(function(chan) {
var user = _.find(chan.users, {name: data.nick});
if (typeof user === "undefined") {
return;
}
- user.name = nick;
+ user.name = data.newnick;
chan.sortUsers();
client.emit("users", {
chan: chan.id
});
var msg = new Msg({
type: Msg.Type.NICK,
- from: data.nick,
- text: nick,
+ mode: chan.getMode(data.newnick),
+ nick: data.nick,
+ newnick: data.newnick,
self: self
});
chan.messages.push(msg);