@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
super
if @registry.has_key?(:reactions)
@reactions = @registry[:reactions]
- raise unless @reactions
+ raise LoadError, "corrupted reaction database" unless @reactions
else
@reactions = []
end
help(:react)
when :remove, :delete, :rm, :del
"reaction #{topic} <trigger> [<n>] => removes reactions to expression <trigger>. If <n> (a positive integer) is specified, only remove the n-th reaction, otherwise remove the trigger completely"
+ when :move
+ "reaction move <trigger> to <other> => move all reactions to <trigger> to the new trigger <other>"
when :chance, :chances
"reaction chances are expressed either in terms of percentage (like 30%) or in terms of floating point numbers (like 0.3), and are clipped to be " +
"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. " +
when :show
"reaction show <trigger>: list the programmed replies to trigger <trigger>"
else
- "reaction topics: add, remove, delete, rm, del, triggers, replies, chance, list, show"
+ "reaction topics: add, remove, delete, rm, del, move, triggers, replies, chance, list, show"
end
end
reply = wanted.pick_reply
debug "picked #{reply}"
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?
+ 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+": "+arg, :from => m)
+ rescue RecurseTooDeep => e
+ error e
+ end
+ when :reply
+ m.plainreply arg
else
- m.__send__(*args)
+ m.__send__(act, arg)
end
end