@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
+
def find_reply(expr)
@replies[@raw_replies.index(expr)] rescue nil
end
ADD_SYNTAX = 'react to *trigger with *reply [at :chance chance]'
MOVE_SYNTAX = 'reaction move *source to *dest'
+ # 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:)?(?:!.*?!|\/.*?\/|".*?"|'.*?'|\S+)/
def add_syntax
return ADD_SYNTAX
return MOVE_SYNTAX
end
+ def trigger_syntax
+ return TRIGGER_SYNTAX
+ end
+
attr :reactions
def initialize
super
if @registry.has_key?(:reactions)
@reactions = @registry[:reactions]
- raise unless @reactions
+ raise LoadError, "corrupted reaction database" unless @reactions
else
@reactions = []
end
when :add
help(:react)
when :remove, :delete, :rm, :del
- "reaction #{topic} <trigger> => removes the reaction to expression <trigger>"
+ "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 :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. " +
"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), " +
- "stuff (everything that follows the trigger), match (the actual matched text), " +
- "match1, match2, ... (the i-th capture)"
+ "before (everything that precedes the trigger), after, (everything that follows the trigger), " +
+ "match (the actual matched text), match1, match2, ... (the i-th capture)"
when :list
"reaction list [n]: lists the n-the page of programmed reactions (30 reactions are listed per page)"
when :show
}.compact
return if candidates.empty?
match, wanted = candidates.sort { |m1, m2|
- m1.first[0].length <=> m2.first[0].length
+ # Order by longest matching text first,
+ # and by number of captures second
+ longer = m1.first[0].length <=> m2.first[0].length
+ longer == 0 ? m1.first.length <=> m2.first.length : longer
}.last
matched = match[0]
before = match.pre_match.strip
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)
def handle_rm(m, params)
trigger = params[:trigger].to_s
+ n = params[:n]
+ n = n.to_i if n
debug trigger.inspect
found = find_reaction(trigger)
+ purged = nil
if found
- @reactions.delete(found)
- m.reply "I won't react to #{found.raw_trigger} anymore"
+ if n
+ if n < 1 or n > found.replies.length
+ m.reply "Please specify an index between 1 and #{found.replies.length}"
+ return
+ end
+ purged = found.rm_reply(n)
+ if found.replies.length == 0
+ @reactions.delete(found)
+ purged = nil
+ else
+ purged = " with #{purged}"
+ end
+ else
+ @reactions.delete(found)
+ end
+ m.reply "I won't react to #{found.raw_trigger}#{purged} anymore"
else
m.reply "no reaction programmed for #{trigger}"
end
plugin = ReactionPlugin.new
plugin.map plugin.add_syntax, :action => 'handle_add',
- :requirements => { :trigger => /^(?:act:)?!.*?!/ }
-plugin.map plugin.add_syntax, :action => 'handle_add',
- :requirements => { :trigger => /^(?:act:)?\/.*?\// }
-plugin.map plugin.add_syntax, :action => 'handle_add',
- :requirements => { :trigger => /^(?:act:)?".*?"/ }
-plugin.map plugin.add_syntax, :action => 'handle_add',
- :requirements => { :trigger => /^(?:act:)?'.*?'/ }
-plugin.map plugin.add_syntax.sub('*', ':'), :action => 'handle_add'
+ :requirements => { :trigger => plugin.trigger_syntax }
plugin.map 'reaction list [:page]', :action => 'handle_list',
:requirements => { :page => /^\d+$/ }
plugin.map 'reaction show *trigger', :action => 'handle_show'
plugin.map plugin.move_syntax, :action => 'handle_move',
- :requirements => { :source => /^(?:act:)?!.*?!/ }
-plugin.map plugin.move_syntax, :action => 'handle_move',
- :requirements => { :source => /^(?:act:)?\/.*?\// }
-plugin.map plugin.move_syntax, :action => 'handle_move',
- :requirements => { :source => /^(?:act:)?".*?"/ }
-plugin.map plugin.move_syntax, :action => 'handle_move',
- :requirements => { :source => /^(?:act:)?'.*?'/ }
-plugin.map plugin.move_syntax.sub('*', ':'), :action => 'handle_move'
-
-
-plugin.map 'reaction del[ete] *trigger', :action => 'handle_rm'
-plugin.map 'reaction delete *trigger', :action => 'handle_rm'
-plugin.map 'reaction remove *trigger', :action => 'handle_rm'
-plugin.map 'reaction rm *trigger', :action => 'handle_rm'
+ :requirements => {
+ :source => plugin.trigger_syntax,
+ :dest => plugin.trigger_syntax
+ }
+
+plugin.map 'reaction del[ete] *trigger [:n]', :action => 'handle_rm', :auth_path => 'del!',
+ :requirements => { :trigger => plugin.trigger_syntax, :n => /^\d+$/ }
+plugin.map 'reaction remove *trigger [:n]', :action => 'handle_rm', :auth_path => 'del!',
+ :requirements => { :trigger => plugin.trigger_syntax, :n => /^\d+$/ }
+plugin.map 'reaction rm *trigger [:n]', :action => 'handle_rm', :auth_path => 'del!',
+ :requirements => { :trigger => plugin.trigger_syntax, :n => /^\d+$/ }
projects / user / henk / code / ruby / rbot.git / blobdiff