Added an admins config option

4 files changed, 9 insertions, 4 deletions

diff --git a/conf/__init__.py b/conf/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/conf/__init__.py
+++ /dev/null
diff --git a/conf/users.py b/conf/users.py
deleted file mode 100644
index e8fbe38..0000000
--- a/conf/users.py
+++ /dev/null
@@ -1,2 +0,0 @@
-user = []
-user.append('com4')
diff --git a/settings.py b/settings.py
index 7884422..947b5bb 100644
--- a/settings.py
+++ b/settings.py
@@ -1,10 +1,16 @@
+# warmachine
+#
+
+# choose the nickname for you bot.
 NICKNAME = 'warmachine'
 
 SERVER = 'irc.freenode.org'
 PORT = 6667
 IDENT = 'warmachine'
 
-CHANNELS = ('#antitech-dev',)
+CHANNELS = ('#warmachine-dev',)
+
+ADMINS = ('com4',)
 
 try:
     from local_settings.py import *
diff --git a/wmd/irc.py b/wmd/irc.py
index 49907c0..98e8245 100644
--- a/wmd/irc.py
+++ b/wmd/irc.py
@@ -2,9 +2,10 @@ import socket
 
 from actions.ActionMap import *
 from passiveactions.PassiveActionMap import *
-from conf.users import *
 from wmd import parser
 
+import settings
+
 class IRC(object):
 
     def __init__(self, server=None, nick=None, name=None, port=6667):