salut plugin: try to reply in the same language we've been addressed

diff --git a/data/rbot/plugins/salut.rb b/data/rbot/plugins/salut.rb
index 02ffca3f8b2e25833b89193cfbfc57aa7b569908..e4295a06655c84323fe9d6fb52a886701a5cfd75 100644 (file)
--- a/data/rbot/plugins/salut.rb
+++ b/data/rbot/plugins/salut.rb
@@ -3,10 +3,8 @@
 # TODO allow online editing of salutations\r
 # TODO *REMEMBER* to set @changed to true after edit\r
 # TODO or changes won't be saved\r
-#\r
-# TODO reply in the language the salutation was in\r
 \r
-unless Array.respond_to?(:pick_one)\r
+unless Array.new.respond_to?(:pick_one)\r
   debug "Defining the pick_one method for Array"\r
   class ::Array\r
     def pick_one\r
@@ -32,7 +30,8 @@ class SalutPlugin < Plugin
 \r
   def initialize\r
     @salutations = Hash.new\r
-    @match = nil\r
+    @match = Hash.new\r
+    @match_langs = Array.new\r
     @main_lang_str = nil\r
     @main_lang = nil\r
     @all_langs = true\r
@@ -46,12 +45,16 @@ class SalutPlugin < Plugin
   end\r
 \r
   def create_match\r
-    @match = Hash.new\r
+    @match.clear\r
     ar_dest = Array.new\r
     ar_in = Array.new\r
     ar_out = Array.new\r
     ar_both = Array.new\r
     @salutations.each { |lang, hash|\r
+      ar_dest.clear\r
+      ar_in.clear\r
+      ar_out.clear\r
+      ar_both.clear\r
       hash.each { |situation, array|\r
         case situation.to_s\r
         when /^generic-dest$/\r
@@ -64,25 +67,34 @@ class SalutPlugin < Plugin
           ar_both += array\r
         end\r
       }\r
+      @match[lang] = Hash.new\r
+      @match[lang][:in] = Regexp.new("\\b(?:" + ar_in.uniq.map { |txt|\r
+        Regexp.escape(txt)\r
+      }.join('|') + ")\\b", Regexp::IGNORECASE) unless ar_in.empty?\r
+      @match[lang][:out] = Regexp.new("\\b(?:" + ar_out.uniq.map { |txt|\r
+        Regexp.escape(txt)\r
+      }.join('|') + ")\\b", Regexp::IGNORECASE) unless ar_out.empty?\r
+      @match[lang][:both] = Regexp.new("\\b(?:" + ar_both.uniq.map { |txt|\r
+        Regexp.escape(txt)\r
+      }.join('|') + ")\\b", Regexp::IGNORECASE) unless ar_both.empty?\r
+      @match[lang][:dest] = Regexp.new("\\b(?:" + ar_dest.uniq.map { |txt|\r
+        Regexp.escape(txt)\r
+      }.join('|') + ")\\b", Regexp::IGNORECASE) unless ar_dest.empty?\r
     }\r
-    @match[:in] = Regexp.new("\\b(?:" + ar_in.uniq.map { |txt|\r
-      Regexp.escape(txt)\r
-    }.join('|') + ")\\b", Regexp::IGNORECASE) unless ar_in.empty?\r
-    @match[:out] = Regexp.new("\\b(?:" + ar_out.uniq.map { |txt|\r
-      Regexp.escape(txt)\r
-    }.join('|') + ")\\b", Regexp::IGNORECASE) unless ar_out.empty?\r
-    @match[:both] = Regexp.new("\\b(?:" + ar_both.uniq.map { |txt|\r
-      Regexp.escape(txt)\r
-    }.join('|') + ")\\b", Regexp::IGNORECASE) unless ar_both.empty?\r
-    debug "Matches: #{@match.inspect}"\r
-    @match[:dest] = Regexp.new("\\b(?:" + ar_dest.uniq.map { |txt|\r
-      Regexp.escape(txt)\r
-    }.join('|') + ")\\b", Regexp::IGNORECASE) unless ar_dest.empty?\r
     @punct = /\s*[.,:!;?]?\s*/ # Punctuation\r
+\r
+    # Languages to match for, in order\r
+    @match_langs.clear\r
+    @match_langs << @main_lang if @match.key?(@main_lang)\r
+    @match_langs << :english if @match.key?(:english)\r
+    @match.each_key { |key|\r
+      @match_langs << key\r
+    }\r
+    @match_langs.uniq!\r
   end\r
 \r
   def listen(m)\r
-    return unless @match\r
+    return if @match.empty?\r
     return unless m.kind_of?(PrivMessage)\r
     return if m.address? and m.plugin == 'config'\r
     to_me = m.address? || m.message =~ /#{Regexp.escape(@bot.nick)}/i\r
@@ -90,18 +102,20 @@ class SalutPlugin < Plugin
       return unless to_me\r
     end\r
     salut = nil\r
-    [:both, :in, :out].each { |k|\r
-      next unless @match[k]\r
-      # debug "Checking salutations #{k} (#{@match[k].inspect})"\r
-      if m.message =~ @match[k]\r
-        salut = k\r
-        break\r
-      end\r
+    @match_langs.each { |lang|\r
+      [:both, :in, :out].each { |k|\r
+        next unless @match[lang][k]\r
+        if m.message =~ @match[lang][k]\r
+          salut = [@match[lang][k], lang, k]\r
+          break\r
+        end\r
+      }\r
+      break if salut\r
     }\r
     return unless salut\r
     # If the bot wasn't addressed, we continue only if the match was exact\r
     # (apart from space and punctuation) or if @match[:dest] matches too\r
-    return unless to_me or m.message =~ @match[:dest] or m.message =~ /^#{@punct}#{@match[salut]}#{@punct}$/\r
+    return unless to_me or m.message =~ /^#{@punct}#{salut.first}#{@punct}$/ or m.message =~ @match[salut[1]][:dest] \r
     h = Time.new.hour\r
     case h\r
     when 4...12\r
@@ -113,8 +127,12 @@ class SalutPlugin < Plugin
     end\r
   end\r
 \r
-  def salut_reply(m, k, time)\r
-    debug "Replying to #{k} in the #{time}"\r
+  def salut_reply(m, salut, time)\r
+    lang = salut[1]\r
+    k = salut[2]\r
+    debug "Replying to #{salut.first} (#{lang} #{k}) in the #{time}"\r
+    # salut_ar = @salutations[@main_lang].update @salutations[:english].update @salutations[lang]\r
+    salut_ar = @salutations[lang]\r
     case k\r
     when :both\r
       sfx = ""\r
@@ -123,10 +141,10 @@ class SalutPlugin < Plugin
     end\r
     debug "Building array ..."\r
     rep_ar = Array.new\r
-    rep_ar += @salutations[@main_lang].fetch("#{time}#{sfx}".to_sym, [])\r
-    rep_ar += @salutations[@main_lang].fetch("#{time}".to_sym, []) unless sfx.empty?\r
-    rep_ar += @salutations[@main_lang].fetch("generic#{sfx}".to_sym, [])\r
-    rep_ar += @salutations[@main_lang].fetch("generic".to_sym, []) unless sfx.empty?\r
+    rep_ar += salut_ar.fetch("#{time}#{sfx}".to_sym, [])\r
+    rep_ar += salut_ar.fetch("#{time}".to_sym, []) unless sfx.empty?\r
+    rep_ar += salut_ar.fetch("generic#{sfx}".to_sym, [])\r
+    rep_ar += salut_ar.fetch("generic".to_sym, []) unless sfx.empty?\r
     debug "Choosing reply in #{rep_ar.inspect} ..."\r
     if rep_ar.empty?\r
       if m.public? # and (m.address? or m =~ /#{Regexp.escape(@bot.nick)}/)\r