rbot 0.9.13 → 0.9.14

data/Rakefile

@@ -6,7 +6,7 @@ task :default => [:buildext]
 
 spec = Gem::Specification.new do |s|
   s.name = 'rbot'
-  s.version = '0.9.13'
+  s.version = '0.9.14'
   s.summary = <<-EOF
     A modular ruby IRC bot.
   EOF

data/bin/rbot

@@ -47,7 +47,7 @@ require 'etc'
 require 'getoptlong'
 require 'fileutils'
 
-$version ||= '0.9.13'
+$version ||= '0.9.14'
 $version_timestamp ||= 0
 $opts = Hash.new
 

data/data/rbot/plugins/figlet.rb

@@ -122,10 +122,16 @@ class FigletPlugin < Plugin
     exec_params = [send(:"#{key}_path")] + @params[key] + [message]
 
     # run the program
-    m.reply Utils.safe_exec(*exec_params), :max_lines => 0
+    m.reply strip_first_last_empty_line(Utils.safe_exec(*exec_params)), :max_lines => 0
   end
   alias :toilet :figlet
 
+  private
+
+  def strip_first_last_empty_line(txt)
+    txt.gsub(/\A(?:^\s*\r?\n)+/m,'').rstrip
+  end
+
 end
 
 plugin = FigletPlugin.new

data/data/rbot/plugins/games/quiz.rb

@@ -930,9 +930,23 @@ class QuizPlugin < Plugin
 
   end
 
-end
-
+  def stop(m, params)
+    unless m.public?
+      m.reply 'you must be on some channel to use this command'
+      return
+    end
+    if @quizzes.delete m.channel
+      @ask_mutex.synchronize do
+        t = @waiting.delete(m.channel)
+        @bot.timer.remove t if t
+      end
+      m.okay
+    else
+      m.reply(_("there is no active quiz on #{m.channel}"))
+    end
+  end
 
+end
 
 plugin = QuizPlugin.new
 plugin.default_auth( 'edit', false )
@@ -950,6 +964,7 @@ plugin.map 'quiz refresh',          :action => 'cmd_refresh'
 plugin.map 'quiz top5',             :action => 'cmd_top5'
 plugin.map 'quiz top :number',      :action => 'cmd_top_number'
 plugin.map 'quiz stats',            :action => 'cmd_stats'
+plugin.map 'quiz stop', :action => :stop
 
 # Admin commands
 plugin.map 'quiz autoask :enable',  :action => 'cmd_autoask', :auth_path => 'edit'

data/data/rbot/plugins/games/uno.rb

@@ -336,14 +336,28 @@ class UnoGame
     # if play is forced, check against the only allowed cards
     return false if @must_play and not @must_play.include?(card)
 
-    # When a +something is online, you can only play a +something of same or
-    # higher something, or a Reverse of the correct color, or a Reverse on
-    # a Reverse
-    # TODO make optional
     if @picker > 0
-      return true if card.picker >= @last_picker
-      return true if card.value == 'Reverse' and (card.color == @color or @discard.value == card.value)
-      return false
+      # During a picker run (i.e. after a +something was played and before a
+      # player is forced to pick) you can only play pickers (+2, +4) and
+      # Reverse. Reverse can be played if the previous card matches by color or
+      # value (as usual), a +4 can always be played, a +2 can be played on a +2
+      # of any color or on a Reverse of the correct color unless a +4 was
+      # played on it
+      # TODO make optional
+      case card.value
+      when 'Reverse'
+        # Reverse can be played if it matches color or value
+        return (card.color == @color) || (@discard.value == card.value)
+      when '+2'
+        return false if @last_picker > 2
+        return true if @discard.value == card.value
+        return true if @discard.value == 'Reverse' and @color == card.color
+        return false
+      when '+4'
+        return true
+      else
+        return false
+      end
     else
       # You can always play a Wild
       return true if Wild === card

data/data/rbot/plugins/rss.rb

@@ -314,6 +314,10 @@ class RSSFeedsPlugin < Plugin
   # TODO: load personal ones
   def define_filters
     @outkey = :"rss.out"
+    @bot.register_filter(:headlines, @outkey) { |s|
+      line1 = (s[:handle].empty? ? "%{date}" : "%{handle}") << "%{title}"
+      make_stream(line1, nil, s)
+    }
     @bot.register_filter(:blog, @outkey) { |s|
       author = s[:author] ? (s[:author] + " ") : ""
       abt = s[:category] ? "about #{s[:category]} " : ""
@@ -329,13 +333,13 @@ class RSSFeedsPlugin < Plugin
       make_stream(line1, line2, s, :author => author, :abt => abt)
     }
     @bot.register_filter(:news, @outkey) { |s|
-      line1 = "%{handle}%{date}%{title} @ %{link}" % s
+      line1 = "%{handle}%{date}%{title}%{at}%{link}" % s
       line2 = "%{handle}%{date}%{desc}" % s
       make_stream(line1, line2, s)
     }
     @bot.register_filter(:git, @outkey) { |s|
       author = s[:author] ? (s[:author] + " ") : ""
-      line1 = "%{handle}%{date}%{author}committed %{title} @ %{link}"
+      line1 = "%{handle}%{date}%{author}committed %{title}%{at}%{link}"
       make_stream(line1, nil, s, :author => author)
     }
     @bot.register_filter(:forum, @outkey) { |s|
@@ -353,7 +357,7 @@ class RSSFeedsPlugin < Plugin
     }
     @bot.register_filter(:trac, @outkey) { |s|
       author = s[:author].sub(/@\S+?\s*>/, "@...>") + ": " if s[:author]
-      line1 = "%{handle}%{date}%{author}%{title} @ %{link}"
+      line1 = "%{handle}%{date}%{author}%{title}%{at}%{link}"
       line2 = nil
       unless s[:item].title =~ /^(?:Changeset \[(?:[\da-f]+)\]|\(git commit\))/
         line2 = "%{handle}%{date}%{desc}"
@@ -1149,7 +1153,7 @@ class RSSFeedsPlugin < Plugin
         report_problem("no items found in the feed, maybe try weed?", e, m)
         return nil
       end
-      feed.title = title
+      feed.title = title.strip
       feed.items = items
       return true
     end

data/data/rbot/plugins/seen.rb

@@ -55,7 +55,7 @@ class SeenPlugin < Plugin
       @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "JOIN", 
                                         m.target.to_s, m.message.dup)
     when TopicMessage
-      return if m.address?
+      return if m.address? or m.info_or_set == :info
       @registry[m.sourcenick] = Saw.new(m.sourcenick.dup, Time.new, "TOPIC", 
                                         m.target.to_s, m.message.dup)
     end

data/lib/rbot/core/irclog.rb

@@ -167,13 +167,13 @@ class IrcLogModule < CoreBotModule
   end
 
   def log_nick(m)
-    m.is_on.each { |ch|
+    (m.is_on & @bot.myself.channels).each { |ch|
       irclog "@ #{m.oldnick} is now known as #{m.newnick}", ch
     }
   end
 
   def log_quit(m)
-    m.was_on.each { |ch|
+    (m.was_on & @bot.myself.channels).each { |ch|
       irclog "@ Quit: #{m.source}: #{m.logmessage}", ch
     }
   end

data/lib/rbot/core/utils/httputil.rb

@@ -610,8 +610,8 @@ class HttpUtil
     opts = {:method => :head}.merge(options)
     begin
       resp = get_response(uri, opts, &block)
-      raise "http error #{resp}" if Net::HTTPClientError === resp ||
-        Net::HTTPServerError == resp
+      # raise "http error #{resp}" if Net::HTTPClientError === resp ||
+      #   Net::HTTPServerError == resp
       return resp
     rescue Exception => e
       error e

data/lib/rbot/irc.rb

@@ -4,6 +4,8 @@
 #   Channels is the User on (of those the client is on too)?
 #   We may want this so that when a User leaves all Channels and he hasn't
 #   sent us privmsgs, we know we can remove him from the Server @users list
+#   FIXME for the time being, we do it with a method that scans the server
+#   (if defined), so the method is slow and should not be used frequently.
 # * Maybe ChannelList and UserList should be HashesOf instead of ArrayOf?
 #   See items marked as TODO Ho.
 #   The framework to do this is now in place, thanks to the new [] method
@@ -1041,6 +1043,14 @@ module Irc
         raise "Can't resolve channel #{channel}"
       end
     end
+
+    def channels
+      if @server
+        @server.channels.select { |ch| ch.has_user?(self) }
+      else
+        Array.new
+      end
+    end
   end
 
 

data/lib/rbot/ircbot.rb

@@ -591,6 +591,8 @@ class Bot
     # '*' means all channels
     #
     @quiet = Set.new
+    # but we always speak here
+    @not_quiet = Set.new
 
     # the nick we want, if it's different from the irc.nick config value
     # (e.g. as set by a !nick command)
@@ -784,24 +786,30 @@ class Bot
 
   # checks if we should be quiet on a channel
   def quiet_on?(channel)
-    return @quiet.include?('*') || @quiet.include?(channel.downcase)
+    ch = channel.downcase
+    return (@quiet.include?('*') && !@not_quiet.include?(ch)) || @quiet.include?(ch)
   end
 
   def set_quiet(channel = nil)
     if channel
       ch = channel.downcase.dup
+      @not_quiet.delete(ch)
       @quiet << ch
     else
       @quiet.clear
+      @not_quiet.clear
       @quiet << '*'
     end
   end
 
   def reset_quiet(channel = nil)
     if channel
-      @quiet.delete channel.downcase
+      ch = channel.downcase.dup
+      @quiet.delete(ch)
+      @not_quiet << ch
     else
       @quiet.clear
+      @not_quiet.clear
     end
   end
 
@@ -1289,6 +1297,7 @@ class Bot
         m = PrivMessage.new(*args)
       when "QUIT"
         m = QuitMessage.new(*args)
+        m.was_on = myself.channels
     end
     @plugins.delegate('sent', m)
   end

data/lib/rbot/message.rb

@@ -195,7 +195,9 @@ module Irc
       @plainmessage = BasicUserMessage.strip_formatting(@message)
       @message = BasicUserMessage.strip_initial_formatting(@message)
 
-      @address = true if source == @bot.myself
+      if target && target == @bot.myself
+        @address = true
+      end
 
     end
 
@@ -321,8 +323,9 @@ module Irc
       @ctcp = false
       @action = false
 
-      if @address = (target == @bot.myself)
+      if target == @bot.myself
         @private = true
+        @address = true
         @channel = nil
         @replyto = source
       else
@@ -517,6 +520,7 @@ module Irc
     attr_accessor :is_on
     def initialize(bot, server, source, oldnick, newnick)
       super(bot, server, source, oldnick, newnick)
+      @address = (source == @bot.myself)
       @is_on = []
     end
 
@@ -540,6 +544,7 @@ module Irc
     attr_accessor :modes
     def initialize(bot, server, source, target, message="")
       super(bot, server, source, target, message)
+      @address = (source == @bot.myself)
       @modes = []
     end
 
@@ -554,6 +559,7 @@ module Irc
     attr_reader :whois
     def initialize(bot, server, source, target, whois)
       super(bot, server, source, target, "")
+      @address = (target == @bot.myself)
       @whois = whois
     end
 
@@ -624,6 +630,7 @@ module Irc
       super(bot, server, source, channel, message)
       @channel = channel
       # in this case sourcenick is the nick that could be the bot
+      @address = (source == @bot.myself)
     end
   end
 

data/po/it/rbot-quotes.po

@@ -93,7 +93,7 @@ msgstr "[%{num}] %{quote}"
 
 #: data/rbot/plugins/quotes.rb:187
 msgid "quote %{num} added by %{source}"
-msgstr "citazione %{num} aggiunto da %{source}"
+msgstr "citazione %{num} aggiunta da %{source}"
 
 #: data/rbot/plugins/quotes.rb:201
 msgid "quote %{num} added on %{date}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbot
 version: !ruby/object:Gem::Version 
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors: 
 - Tom Gilbert
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-02 00:00:00 +02:00
+date: 2008-10-16 00:00:00 +02:00
 default_executable: rbot
 dependencies: []