X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/7631844f5bbb005b130cccc33d2dce9510c0f9df..c889fbb1f64a7eac7de813eb24326139c58c7b18:/bot.py

diff --git a/bot.py b/bot.py
index d7502ba..b65a5ae 100644
--- a/bot.py
+++ b/bot.py
@@ -80,7 +80,7 @@ class Bot(object):
 		elif pieces[1] == "PART":
 			nick = pieces[0].split('!')[0][1:]
 			chan = self.parent.channel(pieces[2])
-			
+
 			if nick != self.nick:
 				self.parent.user(nick).part(chan)
 				chan.userpart(self.parent.user(nick))
@@ -94,14 +94,15 @@ class Bot(object):
 		elif pieces[1] == "NICK":
 			oldnick = pieces[0].split('!')[0][1:]
 			newnick = pieces[2][1:]
-			self.parent.users[newnick.lower()] = self.parent.users[oldnick.lower()]
-			del self.parent.users[oldnick.lower()]
-			self.parent.user(newnick).nick(newnick)
+			if newnick.lower() != oldnick.lower():
+				self.parent.users[newnick.lower()] = self.parent.users[oldnick.lower()]
+				del self.parent.users[oldnick.lower()]
+			self.parent.users[newnick.lower()].nickchange(newnick)
 
 		elif pieces[1] == "MODE": #TODO parse for ops/voices (at least)
 			pass
 
-	
+
 	def parsemsg(self, user, target, msg):
 		chan = None
 		if len(msg) == 0: