X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Freaction.rb;h=d358000c8582945ee5961a5468cd63221dad6535;hb=1fa68bb86705b0e1e70d9d655bbfd8e1e13eb093;hp=fa2dcf41efe441533b86d713ad7bcf9a2ab6089e;hpb=08c170aa7a87a22f5dc08be2b950077f82dca8e7;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/reaction.rb b/data/rbot/plugins/reaction.rb
index fa2dcf41..d358000c 100644
--- a/data/rbot/plugins/reaction.rb
+++ b/data/rbot/plugins/reaction.rb
@@ -69,24 +69,27 @@ class ::Reaction
       @trigger << Regexp.new(rex, true)
     else
       rex.sub!(/^(["'])(.*)\1$/, '\2')
-      @trigger << Regexp.new(/\b#{Regexp.escape(rex)}\b/ui)
+      @trigger << Regexp.new(/\b#{Regexp.escape(rex)}(?:\b|$)/ui)
     end
   end
 
   def add_reply(expr, *args)
     @raw_replies << expr.dup
-    act = false
+    act = :reply
     rex = expr.dup
     if rex.sub!(/^act:/,'')
-      act = true
+      act = :act
+    elsif rex.sub!(/^(?:cmd|command):/,'')
+      act = :cmd
     end
-    @replies << Reply.new(self, act ? :act : :reply, rex, *args)
+    @replies << Reply.new(self, act, rex, *args)
     make_ranges
     return @replies.last
   end
 
   def rm_reply(num)
     @replies.delete_at(num-1)
+    make_ranges
     return @raw_replies.delete_at(num-1)
   end
 
@@ -147,7 +150,7 @@ class ReactionPlugin < Plugin
   # We'd like to use backreferences for the trigger syntax
   # but we can't because it will be merged with the Plugin#map()
   # regexp
-  TRIGGER_SYNTAX = /^(?:act:)?(?:!.*?!|\/.*?\/|".*?"|'.*?')/
+  TRIGGER_SYNTAX = /^(?:act:)?(?:!.*?!|\/.*?\/|".*?"|'.*?'|\S+)/
 
   def add_syntax
     return ADD_SYNTAX
@@ -209,6 +212,7 @@ class ReactionPlugin < Plugin
     when :reply, :replies
       "reaction replies are simply messages that the bot will reply when a trigger is matched. " +
       "Replies can be prefixed by 'act:' (e.g. act:goes shopping) to signify that the bot should act instead of saying the message. " +
+      "Replies can be prefixed by 'cmd:' or 'command:' (e.g. cmd:lart %{who}) to issue a command to the bot. " +
       "Replies can use the %{key} syntax to access one of the following keys: " +
       "who (the user that said the trigger), bot (the bot's own nick), " +
       "target (the first word following the trigger), what (whatever follows target), " +
@@ -258,7 +262,18 @@ class ReactionPlugin < Plugin
     debug "picked #{reply}"
     return unless reply
     args = reply.apply(subs)
-    m.__send__(*args)
+    if args[0] == :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)
+      rescue RecurseTooDeep => e
+        error e
+      end
+    else
+      m.__send__(*args)
+    end
   end
 
   def find_reaction(trigger)
@@ -314,7 +329,8 @@ class ReactionPlugin < Plugin
 
   def handle_rm(m, params)
     trigger = params[:trigger].to_s
-    n = params[:n].to_i rescue nil
+    n = params[:n]
+    n = n.to_i if n
     debug trigger.inspect
     found = find_reaction(trigger)
     purged = nil
@@ -379,7 +395,6 @@ plugin = ReactionPlugin.new
 
 plugin.map plugin.add_syntax, :action => 'handle_add',
   :requirements => { :trigger => plugin.trigger_syntax }
-plugin.map plugin.add_syntax.sub('*', ':'), :action => 'handle_add'
 
 plugin.map 'reaction list [:page]', :action => 'handle_list',
   :requirements => { :page => /^\d+$/ }
@@ -391,8 +406,6 @@ plugin.map plugin.move_syntax, :action => 'handle_move',
     :source => plugin.trigger_syntax,
     :dest => plugin.trigger_syntax
   }
-plugin.map plugin.move_syntax.sub('*', ':'), :action => 'handle_move'
-
 
 plugin.map 'reaction del[ete] *trigger [:n]', :action => 'handle_rm', :auth_path => 'del!',
   :requirements => { :trigger => plugin.trigger_syntax, :n => /^\d+$/ }