X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Freaction.rb;h=4f757ddd5adf0be122a90c6385d1a66b74e85250;hb=9084fa0b0c62988319548157b3a10608c35b2120;hp=28d9f30604844570b82a1ff516db76e8adfaa9c5;hpb=5ebe5c74cbc88ed6dec78860a646b8e077abefb2;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/reaction.rb b/data/rbot/plugins/reaction.rb
index 28d9f306..4f757ddd 100644
--- a/data/rbot/plugins/reaction.rb
+++ b/data/rbot/plugins/reaction.rb
@@ -16,16 +16,32 @@ class ::Reaction
   attr_reader :raw_trigger, :raw_replies
 
   class ::Reply
-    attr_accessor :act, :reply, :pct, :range
-    attr_accessor :author, :date, :channel
-    def initialize(act, expr, pct, author, date, channel, range=nil)
+    attr_reader :act, :reply, :pct
+    attr_accessor :range
+    attr_reader :author, :date, :channel
+    attr_writer :date
+
+    def pct=(val)
+      @pct = val
+      @reaction.make_ranges
+    end
+
+    def author=(name)
+      @author = name.to_s
+    end
+
+    def channel=(name)
+      @channel = name.to_s
+    end
+
+    def initialize(reaction, act, expr, pct, author, date, channel)
+      @reaction = reaction
       @act = act
       @reply = expr
-      @pct = pct
-      @author = author.to_s
+      self.pct = pct
+      self.author = author
       @date = date
-      @channel = channel.to_s
-      @range = range
+      self.channel = channel
     end
 
     def to_s
@@ -50,9 +66,10 @@ class ::Reaction
     end
     @trigger = [act]
     if rex.sub!(%r@^([/!])(.*)\1$@, '\2')
-      @trigger << Regexp.new(rex)
+      @trigger << Regexp.new(rex, true)
     else
-      @trigger << Regexp.new(/\b#{Regexp.escape(rex)}\b/u)
+      rex.sub!(/^(["'])(.*)\1$/, '\2')
+      @trigger << Regexp.new(/\b#{Regexp.escape(rex)}\b/ui)
     end
   end
 
@@ -63,8 +80,13 @@ class ::Reaction
     if rex.sub!(/^act:/,'')
       act = true
     end
-    @replies << Reply.new(act ? :act : :reply, rex, *args)
+    @replies << Reply.new(self, act ? :act : :reply, rex, *args)
     make_ranges
+    return @replies.last
+  end
+
+  def find_reply(expr)
+    @replies[@raw_replies.index(expr)] rescue nil
   end
 
   def make_ranges
@@ -115,12 +137,17 @@ end
 
 class ReactionPlugin < Plugin
 
-  ADD_SYNTAX = 'react to *trigger with *reply at :chance chance'
+  ADD_SYNTAX = 'react to *trigger with *reply [at :chance chance]'
+  MOVE_SYNTAX = 'reaction move *source to *dest'
 
   def add_syntax
     return ADD_SYNTAX
   end
 
+  def move_syntax
+    return MOVE_SYNTAX
+  end
+
   attr :reactions
 
   def initialize
@@ -169,10 +196,11 @@ 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 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)"
+      "stuff (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
@@ -186,20 +214,28 @@ class ReactionPlugin < Plugin
     return unless PrivMessage === m
     debug "testing #{m} for reactions"
     return if @reactions.empty?
-    wanted = @reactions.find { |react|
-      react === m
-    }
-    return unless wanted
-    match = wanted === m
+    candidates = @reactions.map { |react|
+      blob = react === m
+      blob ? [blob, react] : nil
+    }.compact
+    return if candidates.empty?
+    match, wanted = candidates.sort { |m1, m2|
+      m1.first[0].length <=> m2.first[0].length
+    }.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
     }
     subs = @subs.dup.merge extra
     reply = wanted.pick_reply
@@ -211,7 +247,7 @@ class ReactionPlugin < Plugin
 
   def find_reaction(trigger)
     @reactions.find { |react|
-      react.raw_trigger == trigger
+      react.raw_trigger.downcase == trigger.downcase
     }
   end
 
@@ -232,10 +268,34 @@ class ReactionPlugin < Plugin
       @reactions << reaction
       m.reply "Ok, I'll start reacting to #{reaction.raw_trigger}"
     end
-    reaction.add_reply(reply, pct, m.sourcenick, Time.now, m.channel)
+    found = reaction.find_reply(reply)
+    if found
+      found.pct = pct
+      found.author = m.sourcenick
+      found.date = Time.now
+      found.channel = m.channel
+    else
+      found = reaction.add_reply(reply, pct, m.sourcenick, Time.now, m.channel)
+    end
     m.reply "I'll react to #{reaction.raw_trigger} with #{reaction.raw_replies.last} (#{(reaction.replies.last.pct * 100).to_i}%)"
   end
 
+  def handle_move(m, params)
+    source = params[:source].to_s
+    dest = params[:dest].to_s
+    found = find_reaction(source)
+    if not found
+      m.reply "I don't react to #{source}"
+      return
+    end
+    if find_reaction(dest)
+      m.reply "I already react to #{dest}, so I won't move #{source} to #{dest}"
+      return
+    end
+    found.trigger=dest
+    m.reply "Ok, I'll react to #{found.raw_trigger} now"
+  end
+
   def handle_rm(m, params)
     trigger = params[:trigger].to_s
     debug trigger.inspect
@@ -300,6 +360,17 @@ 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'