quiz: stop quizzes and timers on cleanup

[user/henk/code/ruby/rbot.git] / data / rbot / plugins / dictclient.rb

diff --git a/data/rbot/plugins/dictclient.rb b/data/rbot/plugins/dictclient.rb
index d7e5091c3600d804fb3c1cf5d65e2acdb1526585..f55defa42cdd3ee261769696c7633394409d9062 100644 (file)
--- a/data/rbot/plugins/dictclient.rb
+++ b/data/rbot/plugins/dictclient.rb
@@ -17,6 +17,11 @@
 # requires Ruby/DICT <http://www.caliban.org/ruby/ruby-dict.shtml>
 begin
   require 'dict'
+  class ::DICTError
+    def initialize(msg, code = 1)
+      super(msg)
+    end
+  end
 rescue LoadError
   raise LoadError, "Ruby/DICT not found, grab it from http://www.caliban.org/ruby/ruby-dict.shtml"
 end
@@ -86,7 +91,7 @@ class DictClientPlugin < Plugin
   # the DICT object is automatically disconnected. the return value of the block
   # is returned from this method.
   # if an IRC message argument is passed, the error message will be replied
-  def with_dict(m=nil &block)
+  def with_dict(m=nil, &block)
     server, port = @bot.config['dictclient.server'].split ':' if @bot.config['dictclient.server']
     server ||= 'dict.org'
     port ||= DICT::DEFAULT_PORT
@@ -154,7 +159,7 @@ class DictClientPlugin < Plugin
       if results
         results.collect {|database, matches|
           @bot.config['dictclient.match_format'].gsub(
-            '<matches>', matches.collect {|m| format_headword m}.join(', ')
+            '<matches>', matches.collect {|hit| format_headword hit}.join(', ')
           ).gsub(
             '<database>', format_database(database)
           )