From e9755a6486b14de6c83d75f65c673159808df99c Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@progval.net>
Date: Sun, 4 Nov 2012 01:28:24 +0100
Subject: [PATCH] Add fix missing in previous commit.

---
 src/drivers/conf/userdata.conf |  0
 src/drivers/logs/messages.log  |  4 +++
 src/ircdb.py                   | 47 +++++++++++++++++++++++++++++++++-
 3 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100644 src/drivers/conf/userdata.conf
 create mode 100644 src/drivers/logs/messages.log

diff --git a/src/drivers/conf/userdata.conf b/src/drivers/conf/userdata.conf
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/drivers/logs/messages.log b/src/drivers/logs/messages.log
new file mode 100644
index 000000000..745ac104f
--- /dev/null
+++ b/src/drivers/logs/messages.log
@@ -0,0 +1,4 @@
+INFO 2012-10-10T20:08:20 supybot Shutdown initiated.
+INFO 2012-10-10T20:08:20 supybot Killing Driver objects.
+INFO 2012-10-10T20:08:20 supybot Killing Irc objects.
+INFO 2012-10-10T20:08:20 supybot Shutdown complete.
diff --git a/src/ircdb.py b/src/ircdb.py
index 3d7bd8e5f..f5c388c0a 100644
--- a/src/ircdb.py
+++ b/src/ircdb.py
@@ -205,7 +205,8 @@ class UserCapabilitySet(CapabilitySet):
 class IrcUser(object):
     """This class holds the capabilities and authentications for a user."""
     def __init__(self, ignore=False, password='', name='',
-                 capabilities=(), hostmasks=None, secure=False, hashed=False):
+                 capabilities=(), hostmasks=None, nicks=None,
+                 secure=False, hashed=False):
         self.id = None
         self.auth = [] # The (time, hostmask) list of auth crap.
         self.name = name # The name of the user.
@@ -220,6 +221,10 @@ class IrcUser(object):
             self.hostmasks = ircutils.IrcSet() # hostmasks used for recognition
         else:
             self.hostmasks = hostmasks
+        if nicks is None:
+            self.nicks = {} # {'network1': ['foo', 'bar'], 'network': ['baz']}
+        else:
+            self.nicks = nicks
 
     def __repr__(self):
         return format('%s(id=%s, ignore=%s, password="", name=%q, hashed=%r, '
@@ -300,6 +305,29 @@ class IrcUser(object):
         """Removes a hostmask from the user's hostmasks."""
         self.hostmasks.remove(hostmask)
 
+    def checkNick(self, network, nick):
+        """Checks a given nick against the user's nicks."""
+        return nick in self.nicks[network]
+
+    def addNick(self, network, nick):
+        """Adds a nick to the user's registered nicks on the network."""
+        global users
+        assert isinstance(network, basestring)
+        assert ircutils.isNick(nick), 'got %s' % nick
+        if users.getUserFromNick(network, nick) is not None:
+            raise KeyError
+        if network not in self.nicks:
+            self.nicks[network] = []
+        if nick not in self.nicks[network]:
+            self.nicks[network].append(nick)
+
+    def removeNick(self, network, nick):
+        """Removes a nick from the user's registered nicks on the network."""
+        assert isinstance(network, basestring)
+        if nick not in self.nicks[network]:
+            raise KeyError
+        self.nicks[network].remove(nick)
+
     def addAuth(self, hostmask):
         """Sets a user's authenticated hostmask.  This times out in 1 hour."""
         if self.checkHostmask(hostmask, useAuth=False) or not self.secure:
@@ -327,6 +355,8 @@ class IrcUser(object):
             write('capability %s' % capability)
         for hostmask in self.hostmasks:
             write('hostmask %s' % hostmask)
+        for network, nicks in self.nicks.items():
+            write('nicks %s %s' % (network, ' '.join(nicks)))
         fd.write(os.linesep)
 
 
@@ -496,6 +526,11 @@ class IrcUserCreator(Creator):
         self._checkId()
         self.u.hostmasks.add(rest)
 
+    def nicks(self, rest, lineno):
+        self._checkId()
+        network, nicks = rest.split(' ', 2)
+        self.u.nicks[network] = nicks.split(' ')
+
     def capability(self, rest, lineno):
         self._checkId()
         self.u.capabilities.add(rest)
@@ -682,6 +717,16 @@ class UsersDictionary(utils.IterableMap):
         u.id = id
         return u
 
+    def getUserFromNick(self, network, nick):
+        """Return a user given its nick."""
+        for user in self.users.values():
+            try:
+                if nick in user.nicks[network]:
+                    return user
+            except KeyError:
+                pass
+        return None
+
     def hasUser(self, id):
         """Returns the database has a user given its id, name, or hostmask."""
         try: