move IRC server settings to database

this is the first step in trying to get the bot to support multiple
servers with different channels, countdown triggers, and so on

this also ends up affecting some configuration around:
* dispatch
* markov
* admin privmsg form

markov/ircplugin.py

@@ -1,23 +1,22 @@
+"""IRC support for Markov chain learning and text generation."""
 import logging
 import re
 
 import irc.client
 from django.conf import settings
 
+import markov.lib as markovlib
 from ircbot.lib import Plugin, reply_destination_for_event
 from ircbot.models import IrcChannel
-import markov.lib as markovlib
 
 log = logging.getLogger('markov.ircplugin')
 
 
 class Markov(Plugin):
-
     """Build Markov chains and reply with them."""
 
     def start(self):
         """Set up the handlers."""
-
         self.connection.add_global_handler('pubmsg', self.handle_chatter, -20)
         self.connection.add_global_handler('privmsg', self.handle_chatter, -20)
 
@@ -29,7 +28,6 @@ class Markov(Plugin):
 
     def stop(self):
         """Tear down handlers."""
-
         self.connection.remove_global_handler('pubmsg', self.handle_chatter)
         self.connection.remove_global_handler('privmsg', self.handle_chatter)
 
@@ -39,7 +37,6 @@ class Markov(Plugin):
 
     def handle_reply(self, connection, event, match):
         """Generate a reply to one line, without learning it."""
-
         target = reply_destination_for_event(event)
 
         min_size = 15
@@ -63,9 +60,9 @@ class Markov(Plugin):
 
     def handle_chatter(self, connection, event):
         """Learn from IRC chatter."""
-
         what = event.arguments[0]
-        all_nicks = '|'.join(settings.ADDITIONAL_NICK_MATCHES + [connection.get_nickname()])
+        all_nicks = '|'.join(connection.server_config.additional_addressed_nicks.split('\n') +
+                             [connection.get_nickname()])
         trimmed_what = re.sub(r'^(({nicks})[:,]|@({nicks}))\s+'.format(nicks=all_nicks), '', what)
         nick = irc.client.NickMask(event.source).nick
         target = reply_destination_for_event(event)