Merge branch 'master' of /home/matthew/programming/irc/bot/

[irc.git] / Servus-chiark.py

diff --git a/Servus-chiark.py b/Servus-chiark.py
index 128300a53822a3e28429c9a0f1c29647fe1f440f..8e308bab74bfb76bcc067604480b76272e274f9e 100644 (file)
--- a/Servus-chiark.py
+++ b/Servus-chiark.py
@@ -160,14 +160,15 @@ commands = {"karma": (c.karmaq,karmadb),
            "die": quit,
             "google": c.googleq,
            "units": c.unitq,
-#          "define": c.defineq,
+           "help": c.helpq,
+           "define": c.defineq,
 #          "game": (c.gameq,game),
             "say": c.sayq,
             "do": c.doq }
 # disconnect and hop annoy people
 #            "disconnect": c.disconnq,
 #            "hop": c.disconnq }
-commands["list"]=(c.listkeysq,commands)
+commands["list"]=(c.listkeysq,commands,True)
 
 triggers = ("!", "~") # what character should the bot be invoked by:
                       # eg !trout, ~trout etc.