seen: change format of ACTIONs

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

diff --git a/data/rbot/plugins/reaction.rb b/data/rbot/plugins/reaction.rb
index 8f2a1637d4a180ab7a585e494eca834e9f5739f2..6bbd08e39f10b8a89ebc4034389b1f5053b56e96 100644 (file)
--- a/data/rbot/plugins/reaction.rb
+++ b/data/rbot/plugins/reaction.rb
@@ -263,18 +263,21 @@ class ReactionPlugin < Plugin
     reply = wanted.pick_reply
     debug "picked #{reply}"
     return unless reply
-    args = reply.apply(subs)
-    if args[0] == :cmd
+    act, arg = reply.apply(subs)
+    case act
+    when :cmd
       begin
         # Pass the new message back to the bot.
         # FIXME Maybe we should do it the alias way, only calling
         # @bot.plugins.privmsg() ?
-        fake_message(@bot.nick+": "+args[1], :from => m)
+        fake_message(@bot.nick+": "+arg, :from => m)
       rescue RecurseTooDeep => e
         error e
       end
+    when :reply
+      m.plainreply arg
     else
-      m.__send__(*args)
+      m.__send__(act, arg)
     end
   end