X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Freaction.rb;h=55fabcdbe4eea4a537e7bd95606aaa2e600f8373;hb=16336b4a240a4265d1f2df1e30d7b68d3a924287;hp=c493c271a4564f167750417708f66dfb9484879a;hpb=10d483c38cb1ca260bdc089d511e8d812d4882ba;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/reaction.rb b/data/rbot/plugins/reaction.rb index c493c271..55fabcdb 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 @@ -206,7 +207,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. " + @@ -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