rbot 0.9.14 → 0.9.15

data/data/rbot/plugins/twitter.rb

@@ -50,6 +50,8 @@ class TwitterPlugin < Plugin
 
     nick = params[:nick] || @registry[m.sourcenick + "_username"]
 
+    friends = params[:friends]
+
     if not nick
       m.reply "you should specify the username of the twitter touse, or identify using 'twitter identify [username] [password]'"
       return false
@@ -58,11 +60,18 @@ class TwitterPlugin < Plugin
     user = URI.escape(nick)
 
     count = @bot.config['twitter.status_count']
-    unless params[:friends]
+    unless friends
       uri = "http://twitter.com/statuses/user_timeline/#{user}.xml?count=#{count}"
     else
       count = @bot.config['twitter.friends_status_count']
-      uri = "http://twitter.com/statuses/friends_timeline/#{user}.xml"
+      auth = ""
+      if m.private?
+        auth << URI.escape(@registry[m.sourcenick + "_username"])
+        auth << ":"
+        auth << URI.escape(@registry[m.sourcenick + "_password"])
+        auth << "@"
+      end
+      uri = "http://#{auth}twitter.com/statuses/friends_timeline/#{user}.xml"
     end
 
     response = @bot.httputil.get(uri, :headers => @header, :cache => false)
@@ -83,24 +92,34 @@ class TwitterPlugin < Plugin
           delta = ((time > now) ? time - now : now - time)
           msg = st.elements['text'].to_s + " (#{Utils.secs_to_string(delta.to_i)} ago via #{st.elements['source'].to_s})"
           author = ""
-          if params[:friends]
+          if friends
             author = Utils.decode_html_entities(st.elements['user'].elements['name'].text) + ": " rescue ""
           end
           texts << author+Utils.decode_html_entities(msg).ircify_html
         }
-        if params[:friends]
+        if friends
           # friends always return the latest 20 updates, so we clip the count
           texts[count..-1]=nil
         end
       rescue
         error $!
-        m.reply "could not parse status for #{nick}"
+        if friends
+          m.reply "could not parse status for #{nick}'s friends"
+        else
+          m.reply "could not parse status for #{nick}"
+        end
         return false
       end
       m.reply texts.reverse.join("\n")
       return true
     else
-      m.reply "could not get status for #{nick}"
+      if friends
+        rep = "could not get status for #{nick}'s friends"
+        rep << ", try asking in private" unless m.private?
+      else
+        rep = "could not get status for #{nick}"
+      end
+      m.reply rep
       return false
     end
   end

data/data/rbot/plugins/urban.rb

@@ -17,11 +17,13 @@ class UrbanPlugin < Plugin
     u = URBAN + URI.escape(word)
     u += '&page=' + p.to_s if p > 1
     s = @bot.httputil.get(u)
-    return m.reply "Couldn't get the urban dictionary definition for #{word}" if s.nil?
+    return m.reply("Couldn't get the urban dictionary definition for #{word}") if s.nil?
 
-    notfound = s.match %r{<div style="color: #669FCE"><i>.*?</i> isn't defined}
+    notfound = s.match %r{<i>.*?</i> isn't defined}
 
-    numpages = s[%r{<div id='paginator'>.*?</div>}m].scan(/\d+/).collect {|x| x.to_i}.max || 1
+    numpages = if s[%r{<div id='paginator'>.*?</div>}m]
+      $&.scan(/\d+/).collect {|x| x.to_i}.max || 1
+    else 1 end
 
     rv = Array.new
     s.scan(%r{<td class='index'[^>]*>.*?(\d+)\..*?</td>.*?<td class='word'>(?:<a.*?>)?([^>]+)(?:</a>)?</td>.*?<div class='definition'>(.+?)</div>.*?<div class='example'>(.+?)</div>}m) do |num, wrd, desc, ex|
@@ -48,7 +50,7 @@ class UrbanPlugin < Plugin
       resp = @bot.httputil.head('http://www.urbandictionary.com/random.php',
                                :max_redir => -1,
                                :cache => false)
-      return m.reply "Couldn't get a random urban dictionary word" if resp.nil?
+      return m.reply("Couldn't get a random urban dictionary word") if resp.nil?
       if resp.code == "302" && (loc = resp['location'])
         words = URI.unescape(loc.match(/define.php\?term=(.*)$/)[1]) rescue nil
       end

data/data/rbot/plugins/url.rb

@@ -28,7 +28,12 @@ class UrlPlugin < Plugin
     :default => ['localhost', '^192\.168\.', '^10\.', '^127\.', '^172\.(1[6-9]|2\d|31)\.'],
     :on_change => Proc.new { |bot, v| bot.plugins['url'].reset_no_info_hosts },
     :desc => "A list of regular expressions matching hosts for which no info should be provided")
-
+  Config.register Config::ArrayValue.new('url.only_on_channels',
+    :desc => "Show link info only on these channels",
+    :default => [])
+  Config.register Config::ArrayValue.new('url.ignore',
+    :desc => "Don't show link info for urls from users represented as hostmasks on this list. Useful for ignoring other bots, for example.",
+    :default => [])
 
   def initialize
     super
@@ -37,6 +42,8 @@ class UrlPlugin < Plugin
       @bot.config.items[:'url.display_link_info'].set_string(@bot.config['url.display_link_info'].to_s)
     end
     reset_no_info_hosts
+    self.filter_group = :htmlinfo
+    load_filters
   end
 
   def reset_no_info_hosts
@@ -69,7 +76,7 @@ class UrlPlugin < Plugin
     checks.flatten!
 
     unless checks.grep(@no_info_hosts).empty?
-      return "Sorry, info retrieval for #{url.host} (#{checks.first}) is disabled"
+      return ( opts[:always_reply] ? "Sorry, info retrieval for #{url.host} (#{checks.first}) is disabled" : false )
     end
 
     logopts = opts.dup
@@ -81,6 +88,7 @@ class UrlPlugin < Plugin
       debug "+ getting info for #{url.request_uri}"
       info = @bot.filter(:htmlinfo, url)
       debug info
+      logopts[:htmlinfo] = info
       resp = info[:headers]
 
       logopts[:title] = title = info[:title]
@@ -120,7 +128,23 @@ class UrlPlugin < Plugin
     return extra.join(", ") if title or not @bot.config['url.titles_only']
   end
 
-  def handle_urls(m, urls, display_info=@bot.config['url.display_link_info'])
+  def handle_urls(m, params={})
+    opts = {
+      :display_info => @bot.config['url.display_link_info'],
+      :channels => @bot.config['url.only_on_channels'],
+      :ignore => @bot.config['url.ignore']
+    }.merge params
+    urls = opts[:urls]
+    display_info= opts[:display_info]
+    channels = opts[:channels]
+    ignore = opts[:ignore]
+
+    unless channels.empty?
+      return unless channels.map { |c| c.downcase }.include?(m.channel.downcase)
+    end
+
+    ignore.each { |u| return if m.source.matches?(u) }
+
     return if urls.empty?
     debug "found urls #{urls.inspect}"
     list = m.public? ? @registry[m.target] : nil
@@ -128,12 +152,13 @@ class UrlPlugin < Plugin
     urls_displayed = 0
     urls.each do |urlstr|
       debug "working on #{urlstr}"
-      next unless urlstr =~ /^https?:/
+      next unless urlstr =~ /^https?:\/\/./
       title = nil
       debug "Getting title for #{urlstr}..."
       reply = nil
       begin
         title = get_title_for_url(urlstr,
+                                  :always_reply => m.address?,
                                   :nick => m.source.nick,
                                   :channel => m.channel,
                                   :ircline => m.message)
@@ -145,16 +170,25 @@ class UrlPlugin < Plugin
         # with the last character stripped. this might generate invalid URIs
         # (e.g. because "some.url" gets chopped to some.url%2, so catch that too
         if e.message =~ /\(404 - Not Found\)/i or e.kind_of?(URI::InvalidURIError)
-          # chop off last character, and retry if we still have enough string to
-          # look like a minimal URL
-          retry if urlstr.chop! and urlstr =~ /^https?:\/\/./
+          # chop off last non-word character from the unescaped version of
+          # the URL, and retry if we still have enough string to look like a
+          # minimal URL
+          unescaped = URI.unescape(urlstr)
+          debug "Unescaped: #{unescaped}"
+          if unescaped.sub!(/\W$/,'') and unescaped =~ /^https?:\/\/./
+            urlstr.replace URI.escape(unescaped, OUR_UNSAFE)
+            retry
+          else
+            debug "Not retrying #{unescaped}"
+          end
         end
         reply = "Error #{e.message}"
       end
 
       if display_info > urls_displayed
         if reply
-          m.plainreply(reply, :overlong => :truncate)
+          m.reply reply, :overlong => :truncate, :to => :public,
+            :nick => (m.address? ? :auto : false)
           urls_displayed += 1
         end
       end
@@ -177,7 +211,12 @@ class UrlPlugin < Plugin
   def info(m, params)
     escaped = URI.escape(params[:urls].to_s, OUR_UNSAFE)
     urls = URI.extract(escaped)
-    Thread.new { handle_urls(m, urls, params[:urls].length) }
+    Thread.new do
+      handle_urls(m,
+                  :urls => urls,
+                  :display_info => params[:urls].length,
+                  :channels => [])
+    end
   end
 
   def message(m)
@@ -186,7 +225,7 @@ class UrlPlugin < Plugin
     escaped = URI.escape(m.message, OUR_UNSAFE)
     urls = URI.extract(escaped, ['http', 'https'])
     return if urls.empty?
-    Thread.new { handle_urls(m, urls) }
+    Thread.new { handle_urls(m, :urls => urls) }
   end
 
   def reply_urls(opts={})

data/data/rbot/plugins/weather.rb

@@ -35,9 +35,9 @@ class CurrentConditions
             end
         rescue OpenURI::HTTPError => e
             case e
-            when /304/:
+            when /304/
                 @iscached = true
-            when /404/:
+            when /404/
                 raise "Data for #{@station} not found"
             else
                 raise "Error retrieving data: #{e}"
@@ -71,18 +71,18 @@ class WeatherPlugin < Plugin
   Config.register Config::BooleanValue.new('weather.advisory',
     :default => true,
     :desc => "Should the bot report special weather advisories when any is present?")
-  
+
   def help(plugin, topic="")
     case topic
     when "nws"
       "weather nws <station> => display the current conditions at the location specified by the NOAA National Weather Service station code <station> ( lookup your station code at http://www.nws.noaa.gov/data/current_obs/ )"
     when "station", "wu"
-      "weather [<units>] <location> => display the current conditions at the location specified, looking it up on the Weather Underground site; you can use 'station <code>' to look up data by station code ( lookup your station code at http://www.weatherunderground.com/ ); you can optionally set <units>  to 'metric' or 'english' if you only want data with the units; use 'both' for units to go back to having both." 
+      "weather [<units>] <location> => display the current conditions at the location specified, looking it up on the Weather Underground site; you can use 'station <code>' to look up data by station code ( lookup your station code at http://www.weatherunderground.com/ ); you can optionally set <units>  to 'metric' or 'english' if you only want data with the units; use 'both' for units to go back to having both."
     else
       "weather information lookup. Looks up weather information for the last location you specified. See topics 'nws' and 'wu' for more information"
     end
   end
-  
+
   def initialize
     super
 
@@ -91,7 +91,7 @@ class WeatherPlugin < Plugin
     @wu_url         = "http://mobile.wunderground.com/cgi-bin/findweather/getForecast?brand=mobile%s&query=%s"
     @wu_station_url = "http://mobile.wunderground.com/auto/mobile%s/global/stations/%s.html"
   end
-  
+
   def weather(m, params)
     if params[:where].empty?
       if @registry.has_key?(m.sourcenick)

data/data/rbot/plugins/wserver.rb

@@ -12,20 +12,20 @@ class WserverPlugin < Plugin
         m.reply "cowardly refusing to follow more than 3 redirects"
         return
       end
-      
+
       begin
         uri = URI.parse(hostname)
       rescue URI::InvalidURIError => err
         m.reply "#{hostname} is not a valid URI"
         return
       end
-      
+
       unless(uri)
         m.reply "incorrect usage: " + help(m.plugin)
         return
       end
-        
-      
+
+
       resp = @bot.httputil.head(uri)
       server = resp['Server']
       if(server && server.length > 0)
@@ -34,7 +34,7 @@ class WserverPlugin < Plugin
         m.reply "couldn't tell what #{uri.host} is running"
       end
 
-      if(resp.code == "302" || resp.code == "301") 
+      if(resp.code == "302" || resp.code == "301")
         newloc = resp['location']
         newuri = URI.parse(newloc)
         # detect and ignore incorrect redirects (to relative paths etc)

data/data/rbot/plugins/youtube.rb

@@ -27,7 +27,7 @@ class YouTubePlugin < Plugin
   def youtube_filter(s)
     loc = Utils.check_location(s, /youtube\.com/)
     return nil unless loc
-    if s[:text].include? '<div id="watch-vid-title">'
+    if s[:text].include? '<div id="watch-vid-title"'
       vid = @bot.filter(:"youtube.video", s)
       return nil unless vid
       content = _("Category: %{cat}. Rating: %{rating}. Author: %{author}. Duration: %{duration}. %{views} views, faved %{faves} times. %{desc}") % vid
@@ -62,11 +62,11 @@ class YouTubePlugin < Plugin
       :title =>  (e.elements["media:group/media:title"].text rescue nil),
       :desc =>   (e.elements["media:group/media:description"].text rescue nil),
       :cat => (e.elements["media:group/media:category"].text rescue nil),
-      :seconds => (e.elements["media:group/yt:duration/@seconds"].value.to_i rescue nil),
-      :url => (e.elements["media:group/media:player/@url"].value rescue nil),
-      :rating => (("%s/%s" % [e.elements["gd:rating/@average"].value, e.elements["gd:rating/@max"].value]) rescue nil),
-      :views => (e.elements["yt:statistics/@viewCount"].value rescue nil),
-      :faves => (e.elements["yt:statistics/@favoriteCount"].value rescue nil)
+      :seconds => (e.elements["media:group/yt:duration/"].attributes["seconds"].to_i rescue nil),
+      :url => (e.elements["media:group/media:player/"].attributes["url"] rescue nil),
+      :rating => (("%s/%s" % [e.elements["gd:rating"].attributes["average"], e.elements["gd:rating/@max"].value]) rescue nil),
+      :views => (e.elements["yt:statistics"].attributes["viewCount"] rescue nil),
+      :faves => (e.elements["yt:statistics"].attributes["favoriteCount"] rescue nil)
     }
     if vid[:desc]
       vid[:desc].gsub!(/\s+/m, " ")
@@ -77,12 +77,12 @@ class YouTubePlugin < Plugin
       vid[:duration] = _("unknown duration")
     end
     e.elements.each("media:group/media:content") { |c|
-      if url = (c.elements["@url"].value rescue nil)
-        type = c.elements["@type"].value rescue nil
-        medium = c.elements["@medium"].value rescue nil
-        expression = c.elements["@expression"].value rescue nil
-        seconds = c.elements["@duration"].value.to_i rescue nil
-        fmt = case num_fmt = (c.elements["@yt:format"].value rescue nil)
+      if url = (c.attributes["url"] rescue nil)
+        type = c.attributes["type"] rescue nil
+        medium = c.attributes["medium"] rescue nil
+        expression = c.attributes["expression"] rescue nil
+        seconds = c.attributes["duration"].to_i rescue nil
+        fmt = case num_fmt = (c.attributes["yt:format"] rescue nil)
               when "1"
                 "h263+amr"
               when "5"

data/data/rbot/templates/lart/larts-italian

@@ -4,7 +4,7 @@ costringe <who> a programmare in Perl per 3 settimane
 manda l'indirizzo email di <who> a 50 noti spammer
 restringe il terminale di <who> a 40x24
 ruba il the di <who>
-picchia <who> a sangue sulle gengive con una mazza ferrata arrugginata
+picchia <who> a sangue sulle gengive con una mazza ferrata arrugginita
 vende <who> su eBay
 ficca un peperoncino su per il culo di <who>
 fa <who> a fettine

data/launch_here.rb

@@ -0,0 +1,68 @@
+#!/usr/bin/ruby
+#
+# Load rbot from this directory. (No need to install it with setup.rb)
+#
+
+SCM_DIR = File.expand_path File.dirname(__FILE__)
+puts "Running from #{SCM_DIR}"
+
+$:.unshift File.join(SCM_DIR, 'lib')
+
+$version = '0.9.15'
+
+pwd = Dir.pwd
+begin
+  Dir.chdir SCM_DIR
+
+  if File.exists? '.git'
+    begin
+      git_out = `git log -1 --pretty=raw | git name-rev --stdin`.split("\n")
+      commit, branch_spec = git_out.first.scan(/^commit (\S+)(?: \((\S+)\))?$/).first
+      $version_timestamp = git_out[4].split[-2].to_i
+      subject = git_out[6].strip rescue ""
+      subject[77..-1] = "..." if subject.length > 80
+      rev = "revision #{commit[0,7]}"
+      rev << " [#{subject}]" unless subject.empty?
+      changes = `git diff-index --stat HEAD`.split("\n").last.split(", ").first rescue nil
+      rev << ", #{changes.strip}" if changes
+      if branch_spec
+        tag, branch, offset = branch_spec.scan(/^(?:(tag)s\/)?(\S+?)(?:^0)?(?:~(\d+))?$/).first
+        tag ||= "branch"
+        branch << " #{tag}"
+        branch << "-#{offset}" if offset
+      else
+        branch = "unknown branch"
+      end
+    rescue => e
+      puts e.inspect
+      branch = "unknown branch"
+      rev = "unknown revision"
+    end
+    $version << " (#{branch}, #{rev})"
+  elsif File.directory? File.join(SCM_DIR, '.svn')
+    rev = " (unknown revision)"
+    begin
+      svn_out = `svn info`
+      rev = " (revision #{$1}" if svn_out =~ /Last Changed Rev: (\d+)/
+      svn_st = `svn st #{SCM_DIR}`
+      rev << ", local changes" if svn_st =~ /^[MDA] /
+      rev << ")"
+    rescue => e
+      puts e.inspect
+    end
+    $version += rev
+  end
+ensure
+  Dir.chdir pwd
+end
+
+module Irc
+class Bot
+  module Config
+    @@datadir = File.join SCM_DIR, 'data/rbot'
+    @@coredir = File.join SCM_DIR, 'lib/rbot/core'
+  end
+end
+end
+
+load File.join(SCM_DIR, 'bin/rbot')

data/lib/rbot/botuser.rb

@@ -24,7 +24,7 @@ require 'rbot/maskdb'
 #     }
 #   }
 # end
-# 
+#
 
 module Irc
 class Bot

data/lib/rbot/compat19.rb

@@ -0,0 +1,70 @@
+#-- vim:sw=2:et
+#++
+#
+# :title: ruby 1.9 compatibility (monkey)patches
+
+require 'timeout'
+require "thread"
+
+class ConditionVariable
+
+  def wait(mutex, timeout=nil)
+    begin
+      # TODO: mutex should not be used
+      @waiters_mutex.synchronize do
+        @waiters.push(Thread.current)
+      end
+      if timeout
+        elapsed = mutex.sleep timeout if timeout > 0.0
+        unless timeout > 0.0 and elapsed < timeout
+          t = @waiters_mutex.synchronize { @waiters.delete Thread.current }
+          signal unless t # if we got notified, pass it along
+          raise TimeoutError, "wait timed out"
+        end
+      else
+        mutex.sleep
+      end
+    end
+    nil
+  end
+
+end
+
+require 'monitor'
+
+module MonitorMixin
+
+  class ConditionVariable
+
+    def wait(timeout = nil)
+      #if timeout
+      #  raise NotImplementedError, "timeout is not implemented yet"
+      #end
+      @monitor.__send__(:mon_check_owner)
+      count = @monitor.__send__(:mon_exit_for_cond)
+      begin
+        @cond.wait(@monitor.instance_variable_get("@mon_mutex"), timeout)
+        return true
+      ensure
+        @monitor.__send__(:mon_enter_for_cond, count)
+      end
+    end
+
+    def signal
+      @monitor.__send__(:mon_check_owner)
+      @cond.signal
+    end
+
+    def broadcast
+      @monitor.__send__(:mon_check_owner)
+      @cond.broadcast
+    end
+
+  end  # ConditionVariable
+
+  def self.extend_object(obj)
+    super(obj)
+    obj.__send__(:mon_initialize)
+  end
+
+end # MonitorMixin