coretasks: prevent KeyError when untracked user leaves

Fixes #1005
sopel-irc · May 25, 2016 · 20eda29 · 20eda29
1 parent 0ce0b17
commit 20eda29
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/sopel/coretasks.py b/sopel/coretasks.py
@@ -357,6 +357,7 @@ def track_join(bot, trigger):
     user = bot.users.get(trigger.nick)
     if user is None:
         user = User(trigger.nick, trigger.user, trigger.host)
+        bot.users[trigger.nick] = user
     bot.channels[trigger.sender].add_user(user)
 
     if len(trigger.args) > 1 and trigger.args[1] != '*' and (

diff --git a/sopel/tools/target.py b/sopel/tools/target.py
@@ -62,10 +62,10 @@ def __init__(self, name):
         """The topic of the channel."""
 
     def clear_user(self, nick):
-        user = self.users[nick]
-        user.channels.pop(self.name, None)
-        del self.users[nick]
-        del self.privileges[nick]
+        user = self.users.pop(nick, None)
+        self.privileges.pop(nick, None)
+        if user != None:
+            user.channels.pop(self.name, None)
 
     def add_user(self, user):
         assert isinstance(user, User)