X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Freaction.rb;h=ee338e2d38dae244e6487f1a5150dc5663f14956;hb=edbd40c4a968645bd340a7300b429bd4856ee5b8;hp=cf7685ec3935cdf7dee954909c268d6cf93173e3;hpb=3f8710a19b6989cd1c67629a92fd992968579456;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/reaction.rb b/data/rbot/plugins/reaction.rb
index cf7685ec..ee338e2d 100644
--- a/data/rbot/plugins/reaction.rb
+++ b/data/rbot/plugins/reaction.rb
@@ -69,7 +69,7 @@ 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
 
@@ -89,6 +89,7 @@ class ::Reaction
 
   def rm_reply(num)
     @replies.delete_at(num-1)
+    make_ranges
     return @raw_replies.delete_at(num-1)
   end
 
@@ -169,7 +170,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
@@ -262,9 +263,14 @@ class ReactionPlugin < Plugin
     return unless reply
     args = reply.apply(subs)
     if args[0] == :cmd
-      new_m = PrivMessage.new(@bot, m.server, m.source, m.target, @bot.nick+": "+args[1])
-      @bot.plugins.delegate "listen", new_m
-      @bot.plugins.privmsg(new_m) if new_m.address?
+      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