From f63d224c6675a634d3581cf431cd7b1ee897b60b Mon Sep 17 00:00:00 2001 From: Kiooeht Date: Sun, 12 Jan 2014 17:49:18 -0800 Subject: [PATCH] Don't save empty NickServ passwords --- profile.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/profile.py b/profile.py index c266330..13c48ea 100644 --- a/profile.py +++ b/profile.py @@ -450,12 +450,16 @@ class userProfile(object): return self.autoidentify def setAutoIdentify(self, b): self.autoidentify = b + if self.chat.handle not in self.passwd: + self.passwd[self.chat.handle] = {} self.passwd[self.chat.handle]["auto"] = b self.saveNickServPass() def getNickServPass(self): return self.nickservpass def setNickServPass(self, pw): self.nickservpass = pw + if self.chat.handle not in self.passwd: + self.passwd[self.chat.handle] = {} self.passwd[self.chat.handle]["pw"] = pw self.saveNickServPass() def save(self): @@ -471,6 +475,10 @@ class userProfile(object): fp.write(jsonoutput) fp.close() def saveNickServPass(self): + # remove profiles with no passwords + for h,t in self.passwd.items(): + if "auto" not in t or "pw" not in t or t["pw"] == "": + del self.passwd[h] try: jsonoutput = json.dumps(self.passwd, indent=4) except ValueError, e: