@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
# 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
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), " +
debug "picked #{reply}"
return unless reply
args = reply.apply(subs)
- m.__send__(*args)
+ 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?
+ else
+ m.__send__(*args)
+ end
end
def find_reaction(trigger)
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
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+$/ }
: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+$/ }