(#11) Respond to CTCP SOURCE

Adam Roses Wight · Adam Roses Wight · commit da1eb8ede548 · 2014-01-17T14:39:05.000-08:00
diff --git a/README.md b/README.md
@@ -53,8 +53,9 @@ This is... sort of the configuration file used for the CiviCRM project:
     # Measured in seconds
     poll_interval: 60
 
-    # Override the builtin URL so people know how to contribute.
-    project_url: https://svn.civicrm.org/tools/trunk/bin/scripts/ircbot-civi.py
+    # Override the builtin URL if you have forked this project, so people know
+    # how to contribute.
+    source_url: https://svn.civicrm.org/tools/trunk/bin/scripts/ircbot-civi.py
 
 Running
 =======
diff --git a/brain.py b/brain.py
@@ -7,14 +7,13 @@ class Brain(object):
     def __init__(self, config, sink=None):
         self.config = config
         self.sink = sink
-        self.project_url = "https://github.com/adamwight/slander"
         if "irc" in self.config:
             if "ownermail" in self.config["irc"]:
                 self.config["irc"]["ownermail"] = "xxx@example.com"
             if "regverify" in self.config["irc"]:
                 self.config["irc"]["regverify"] = "*******"
-        if "project_url" in self.config:
-            self.project_url = self.config["project_url"]
+
+        self.source_url = self.config["source_url"]
 
     def say(self, message, force=False):
         if not force and 'mute' in self.config and int(self.config['mute']):
@@ -24,7 +23,7 @@ def say(self, message, force=False):
 
     def respond(self, user, message):
         if re.search(r'\bhelp\b', message):
-            self.say("If I only had a brain: %s -- Commands: help config kill last" % (self.project_url, ))
+            self.say("If I only had a brain: %s -- Commands: help config kill last" % (self.source_url, ))
         elif re.search(r'\bconfig\b', message):
             match = re.search(r'\b(?P<name>[^=\s]+)\s*=\s*(?P<value>\S+)', message)
             if match:
diff --git a/irc.py b/irc.py
@@ -23,6 +23,8 @@ def connectionMade(self):
         if "maxlen" in self.config["irc"]:
             text.maxlen = self.config["irc"]["maxlen"]
 
+        self.sourceURL = self.config["source_url"]
+
         irc.IRCClient.connectionMade(self)
 
         if "pass" in self.config["irc"]:
diff --git a/slander.py b/slander.py
@@ -36,6 +36,10 @@ def parse_args(args):
     if not config:
         sys.exit(args[0] + ": No config!")
 
+    # normalize some stuff :(
+    if "source_url" not in config:
+        config["source_url"] = "https://github.com/adamwight/slander"
+
     global test
     test = False
     if "test" in config:
