X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Freaction.rb;h=cf7685ec3935cdf7dee954909c268d6cf93173e3;hb=3f8710a19b6989cd1c67629a92fd992968579456;hp=ee8abbd54b67237778ac292f18ecc8031dfa815b;hpb=b19343b91d2e02ee6e26898f2e80b5780a420cb4;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git diff --git a/data/rbot/plugins/reaction.rb b/data/rbot/plugins/reaction.rb index ee8abbd5..cf7685ec 100644 --- a/data/rbot/plugins/reaction.rb +++ b/data/rbot/plugins/reaction.rb @@ -68,22 +68,30 @@ class ::Reaction if rex.sub!(%r@^([/!])(.*)\1$@, '\2') @trigger << Regexp.new(rex, true) else + rex.sub!(/^(["'])(.*)\1$/, '\2') @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) + return @raw_replies.delete_at(num-1) + end + def find_reply(expr) @replies[@raw_replies.index(expr)] rescue nil end @@ -138,6 +146,10 @@ class ReactionPlugin < Plugin 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 @@ -147,6 +159,10 @@ class ReactionPlugin < Plugin return MOVE_SYNTAX end + def trigger_syntax + return TRIGGER_SYNTAX + end + attr :reactions def initialize @@ -184,7 +200,7 @@ class ReactionPlugin < Plugin when :add help(:react) when :remove, :delete, :rm, :del - "reaction #{topic} => removes the reaction to expression " + "reaction #{topic} [] => removes reactions to expression . If (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, " + @@ -195,11 +211,12 @@ class ReactionPlugin < Plugin 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 use the %%{key} syntax to access one of the following keys: " + + "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 @@ -219,17 +236,22 @@ class ReactionPlugin < Plugin }.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] - stuff = match.post_match.strip - target, what = stuff.split(/\s+/, 2) + before = match.pre_match.strip + after = match.post_match.strip + target, what = after.split(/\s+/, 2) extra = { :who => m.sourcenick, :match => matched, :target => target, :what => what, - :stuff => stuff + :before => before, + :after => after } match.to_a.each_with_index { |d, i| extra[:"match#{i}"] = d @@ -239,7 +261,13 @@ class ReactionPlugin < Plugin 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) @@ -295,11 +323,28 @@ class ReactionPlugin < Plugin 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 @@ -343,14 +388,7 @@ 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+$/ } @@ -358,17 +396,14 @@ plugin.map 'reaction list [:page]', :action => 'handle_list', 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+$/ }