X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=data%2Frbot%2Fplugins%2Flinkbot.rb;h=b9e7f5119afaabfc072795ba42b1bed80c9da878;hb=cc241a9709593491b6a67810ed8a5a5054e19208;hp=a922883f44a46b1a4ce54e674ac9dbddd82cb80f;hpb=a456a84088209c9bbfb087ffee81af0f34a0d066;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/data/rbot/plugins/linkbot.rb b/data/rbot/plugins/linkbot.rb
index a922883f..b9e7f511 100644
--- a/data/rbot/plugins/linkbot.rb
+++ b/data/rbot/plugins/linkbot.rb
@@ -22,56 +22,51 @@
 # servers to make this even easier.
 
 class LinkBot < Plugin
-  BotConfig.register BotConfigArrayValue.new('linkbot.nicks',
+  Config.register Config::ArrayValue.new('linkbot.nicks',
     :default => [],
     :desc => "Nick(s) of the bots that act as channel links across networks")
 
-  BotConfig.register BotConfigArrayValue.new('linkbot.message_patterns',
+  Config.register Config::ArrayValue.new('linkbot.message_patterns',
     :default => ['^<(\S+?)@(\S+?)>\s+(.*)$', '^\((\S+?)@(\S+?)\)\s+(.*)$'],
-    :desc => "List of regexp which match linkbot messages; each regexp needs to have three captures, which in order are the nickname of the original speaker, network, and original message")
+    :desc => "List of regexp which match linkbot messages; each regexp needs to have three captures, which in order are the nickname of the original speaker, network, and original message",
+    :on_change => proc {|bot, v| bot.plugins['linkbot'].update_patterns})
   # TODO use template strings instead of regexp for user friendliness
-  
+
   # Initialize the plugin
   def initialize
     super
-    
+    update_patterns
+  end
+
+  def update_patterns
     @message_patterns = @bot.config['linkbot.message_patterns'].map {|p|
       Regexp.new(p)
     }
   end
 
   # Main method
-  def listen(m)
+  def message(m)
     linkbots = @bot.config['linkbot.nicks']
     return if linkbots.empty?
     return unless linkbots.include?(m.sourcenick)
-    return unless m.kind_of?(PrivMessage)
     # Now we know that _m_ is a PRIVMSG from a linkbot. Let's split it
     # in nick, network, message
-    if @message_patterns.any? {|p| m.message.match p}
+    if @message_patterns.any? {|p| m.message =~ p}
       # if the regexp doesn't contain all parts, the default values get used
       new_nick = $1 || 'unknown_nick'
       network = $2 || 'unknown_network'
       message = $3 || 'unknown_message'
-
+      # strip any formatting codes in the new_nick. some people configure their linkbots
+      # to embed these codes in nicknames (such as to\B\Bm), to avoid triggering the
+      # person's highlight
+      new_nick.gsub!(/[#{Bold}#{Underline}#{Reverse}#{Italic}#{NormalText}]/, '')
       debug "#{m.sourcenick} reports that #{new_nick} said #{message.inspect} on #{network}"
-      # One way to pass the new message back to the bot is to create a PrivMessage
-      # and delegate it to the plugins
-      new_m = PrivMessage.new(@bot, m.server, m.server.user(new_nick), m.target, message)
-      @bot.plugins.delegate "listen", new_m
-      @bot.plugins.privmsg(new_m) if new_m.address?
-
-      ## Another way is to create a data Hash with source, target and message keys
-      ## and then letting the bot client :privmsg handler handle it
-      ## Note that this will also create irclog entries for the fake PRIVMSG
-      ## TODO we could probably add a :no_irc_log entry to the data passed to the
-      ## @bot.client handlers, or something like that
-      # data = {
-      #   :source => m.server.user(new_nick)
-      #   :target => m.target
-      #   :message => message
-      # }
-      # @bot.client[:privmsg].call(data)
+      begin
+        # Pass the new message back to the bot
+        fake_message(message, :from => m, :source => m.server.user(new_nick))
+      rescue RecurseTooDeep => e
+        error e
+      end
     end
   end
 end