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 d358000c8582945ee5961a5468cd63221dad6535..6bbd08e39f10b8a89ebc4034389b1f5053b56e96 100644 (file)
--- a/data/rbot/plugins/reaction.rb
+++ b/data/rbot/plugins/reaction.rb
@@ -69,7 +69,9 @@ class ::Reaction
       @trigger << Regexp.new(rex, true)
     else
       rex.sub!(/^(["'])(.*)\1$/, '\2')
-      @trigger << Regexp.new(/\b#{Regexp.escape(rex)}(?:\b|$)/ui)
+      prepend = ( rex =~ /^\w/ ? '(?:\b)' : '')
+      append = ( rex =~ /\w$/ ? '(?:\b|$)' : '')
+      @trigger << Regexp.new(/#{prepend}#{Regexp.escape(rex)}#{append}/ui)
     end
   end
 
@@ -170,7 +172,7 @@ class ReactionPlugin < Plugin
     super
     if @registry.has_key?(:reactions)
       @reactions = @registry[:reactions]
-      raise unless @reactions
+      raise LoadError, "corrupted reaction database" unless @reactions
     else
       @reactions = []
     end
@@ -207,7 +209,7 @@ class ReactionPlugin < Plugin
       "between 0 and 1 (i.e. 0% and 100%). A reaction can have multiple replies, each with a different chance; if the total of the chances is less than one, " +
       "there is a chance that the trigger will not actually cause a reply. Otherwise, the chances express the relative frequency of the replies."
     when :trigger, :triggers
-      "reaction triggers can have one of the format: single_word 'multiple words' \"multiple words \" /regular_expression/ !regular_expression!. " + 
+      "reaction triggers can have one of the format: single_word 'multiple words' \"multiple words \" /regular_expression/ !regular_expression!. " +
       "If prefixed by 'act:' (e.g. act:/(order|command)s/) the bot will only respond if a CTCP ACTION matches the trigger"
     when :reply, :replies
       "reaction replies are simply messages that the bot will reply when a trigger is matched. " +
@@ -261,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