lastfm: require num parameter for lastfm action to be an integer

[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 16288030da9eb837b402c25c364bd56a5c45ad2f..ee338e2d38dae244e6487f1a5150dc5663f14956 100644 (file)
--- 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
 
@@ -149,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
@@ -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
@@ -323,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
@@ -388,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+$/ }
@@ -400,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+$/ }