rbot 0.9.9 → 0.9.10

data/data/rbot/plugins/math.rb

@@ -22,6 +22,9 @@ class MathPlugin < Plugin
      "ten" => "10"
   };
 
+  def name
+    "math"
+  end
   def help(plugin, topic="")
     "math <expression>, evaluate mathematical expression"
   end
@@ -108,7 +111,7 @@ class MathPlugin < Plugin
          end
          m.reply answer
        rescue Exception => e
-         puts "couldn't evaluate expression \"#{m.params}\": #{e}"
+         error "couldn't evaluate expression \"#{m.params}\": #{e.inspect}"
          m.reply "illegal expression \"#{m.params}\""
          return
        end
@@ -120,3 +123,4 @@ class MathPlugin < Plugin
 end
 plugin = MathPlugin.new
 plugin.register("math")
+plugin.register("maths")

data/data/rbot/plugins/nickserv.rb

@@ -1,7 +1,25 @@
-# automatically lookup nicks in @registry and identify when asked
+# Automatically lookup nicks in @registry and identify when asked
+# Takes over proper nick if required and nick is registered
+# TODO allow custom IDENTIFY and GHOST names
+# TODO instead of nickserv.wait it would be ideal if we could just
+# set up "don't send further commands until you receive this particular message"
 
 class NickServPlugin < Plugin
   
+  BotConfig.register BotConfigStringValue.new('nickserv.name',
+    :default => "NickServ", :requires_restart => false,
+    :desc => "Name of the nick server")
+  BotConfig.register BotConfigStringValue.new('nickserv.ident_request',
+    :default => "IDENTIFY", :requires_restart => false,
+    :on_change => Proc.new { |bot, v| bot.plugins.delegate "set_ident_request", v },
+    :desc => "String to look for to see if the nick server is asking us to identify")
+  BotConfig.register BotConfigBooleanValue.new('nickserv.wants_nick',
+    :default => true, :requires_restart => false,
+    :desc => "Set to false if the nick server doesn't expect the nick as a parameter in the identify command")
+  BotConfig.register BotConfigIntegerValue.new('nickserv.wait',
+    :default => 30, :validate => Proc.new { |v| v > 0 }, :requires_restart => false,
+    :desc => "Seconds to wait after sending a message to nickserv, e.g. after ghosting")
+
   def help(plugin, topic="")
     case topic
     when ""
@@ -26,6 +44,10 @@ class NickServPlugin < Plugin
     return passwd
   end
 
+  def set_ident_request(val)
+    @ident_request = Regexp.new(val)
+  end
+
   def initialize
     super
     # this plugin only wants to store strings!
@@ -37,20 +59,23 @@ class NickServPlugin < Plugin
         val
       end
     end
+    set_ident_request(@bot.config['nickserv.ident_request'])
   end
 
   def password(m, params)
     @registry[params[:nick]] = params[:passwd]
     m.okay
   end
+
   def nick_register(m, params)
     passwd = params[:passwd] ? params[:passwd] : genpasswd
     message = "REGISTER #{passwd}"
     message += " #{params[:email]}" if params[:email]
-    @bot.sendmsg "PRIVMSG", "NickServ", message
+    @bot.sendmsg "PRIVMSG", @bot.config['nickserv.name'], message
     @registry[@bot.nick] = passwd
     m.okay
   end
+
   def listnicks(m, params)
     if @registry.length > 0
       @registry.each {|k,v|
@@ -60,30 +85,65 @@ class NickServPlugin < Plugin
       m.reply "none known"
     end
   end
+
+  def do_identify(nick=@bot.nick)
+    if @registry.has_key?(nick)
+      if @bot.config['nickserv.wants_nick']
+        @bot.sendmsg "PRIVMSG", @bot.config['nickserv.name'], "IDENTIFY #{nick} #{@registry[nick]}"
+      else
+        if nick == @bot.nick
+          @bot.sendmsg "PRIVMSG", @bot.config['nickserv.name'], "IDENTIFY #{@registry[nick]}"
+        else
+          # We cannot identify for different nicks if we can't use the nickname ...
+          return false
+        end
+      end
+      return true
+    end
+    return false
+  end
+
   def identify(m, params)
-    if @registry.has_key?(@bot.nick)
-      @bot.sendmsg "PRIVMSG", "NickServ", "IDENTIFY #{@registry[@bot.nick]}"
+    if do_identify
       m.okay
     else
       m.reply "I dunno the nickserv password for the nickname #{@bot.nick} :("
     end
   end
   
+  def connect
+    do_identify
+  end
+  
+  def nicktaken(nick)
+    if @registry.has_key?(nick)
+      @bot.sendmsg "PRIVMSG", @bot.config['nickserv.name'], "GHOST #{nick} #{@registry[nick]}"
+      if do_identify nick
+        sleep @bot.config['nickserv.wait']
+        @bot.nickchg nick
+        # We need to wait after changing nick, otherwise the server
+        # might refuse to execute further commangs, e.g. subsequent JOIN
+        # commands until the nick has changed.
+        sleep @bot.config['nickserv.wait']
+      else
+        debug "Failed to identify for nick #{nick}, cannot take over"
+      end
+    end
+  end
+
   def listen(m)
     return unless(m.kind_of? NoticeMessage)
 
-    if (m.sourcenick == "NickServ" && m.message =~ /This nickname is owned by someone else/)
+    if (m.sourcenick == @bot.config['nickserv.name'] && m.message =~ @ident_request)
       debug "nickserv asked us to identify for nick #{@bot.nick}"
-      if @registry.has_key?(@bot.nick)
-        @bot.sendmsg "PRIVMSG", "NickServ", "IDENTIFY " + @registry[@bot.nick]
-      end
+      do_identify
     end
   end
 
 end
 plugin = NickServPlugin.new
-plugin.map 'nickserv password :nick :passwd'
+plugin.map 'nickserv password :nick :passwd', :action => "password"
 plugin.map 'nickserv register :passwd :email', :action => 'nick_register',
            :defaults => {:passwd => false, :email => false}
-plugin.map 'nickserv listnicks'
-plugin.map 'nickserv identify'
+plugin.map 'nickserv listnicks', :action => "listnicks"
+plugin.map 'nickserv identify', :action => "identify"

data/data/rbot/plugins/opme.rb

@@ -1,19 +1,19 @@
-class OpMePlugin < Plugin
-
-  def help(plugin, topic="")
-    return "opme <channel> => grant user ops in <channel>"
-  end
-
-  def privmsg(m)
-    if(m.params)
-      channel = m.params
-    else
-      channel = m.channel
-    end
-    target = m.sourcenick
-    @bot.sendq("MODE #{channel} +o #{target}")
-    m.okay
-  end
-end
-plugin = OpMePlugin.new
-plugin.register("opme")
+class OpMePlugin < Plugin
+
+  def help(plugin, topic="")
+    return "opme <channel> => grant user ops in <channel>"
+  end
+
+  def privmsg(m)
+    if(m.params)
+      channel = m.params
+    else
+      channel = m.channel
+    end
+    target = m.sourcenick
+    m.okay
+    @bot.sendq("MODE #{channel} +o #{target}")
+  end
+end
+plugin = OpMePlugin.new
+plugin.register("opme")

data/data/rbot/plugins/quakeauth.rb

@@ -27,7 +27,7 @@ class QPlugin < Plugin
   end
 
   def set(m, params)
-    @registry['quakenet.user'] = params[:user]
+    @registry['quakenet.user'] = params[:nick]
     @registry['quakenet.auth'] = params[:passwd]
     m.okay
   end
@@ -48,4 +48,4 @@ class QPlugin < Plugin
 end
 plugin = QPlugin.new
 plugin.map 'qauth set :nick :passwd', :action => "set"
-plugin.map 'quath identify', :action => "identify"
+plugin.map 'qauth identify', :action => "identify"

data/data/rbot/plugins/quotes.rb

@@ -1,10 +1,13 @@
-Quote = Struct.new("Quote", "num", "date", "source", "quote")
+# GB: Ok, we *really* need to switch to db for this plugin too
+
+Quote = Struct.new("Quote", :num, :date, :source, :quote)
 
 class QuotePlugin < Plugin
   def initialize
     super
     @lists = Hash.new
     Dir["#{@bot.botclass}/quotes/*"].each {|f|
+      next if File.directory?(f)
       channel = File.basename(f)
       @lists[channel] = Array.new if(!@lists.has_key?(channel))
       IO.foreach(f) {|line|
@@ -17,12 +20,23 @@ class QuotePlugin < Plugin
   end
   def save
     Dir.mkdir("#{@bot.botclass}/quotes") if(!FileTest.directory?("#{@bot.botclass}/quotes"))
+    Dir.mkdir("#{@bot.botclass}/quotes/new") if(!FileTest.directory?("#{@bot.botclass}/quotes/new"))
     @lists.each {|channel, quotes|
-      File.open("#{@bot.botclass}/quotes/#{channel}", "w") {|file|
-        quotes.compact.each {|q| 
-          file.puts "#{q.num} | #{q.date} | #{q.source} | #{q.quote}"
+      begin
+        debug "Writing new quotefile for channel #{channel} ..."
+        File.open("#{@bot.botclass}/quotes/new/#{channel}", "w") {|file|
+          quotes.compact.each {|q| 
+            file.puts "#{q.num} | #{q.date} | #{q.source} | #{q.quote}"
+          }
         }
-      }
+        debug "Officializing quotefile for channel #{channel} ..."
+        File.rename("#{@bot.botclass}/quotes/new/#{channel}",
+                    "#{@bot.botclass}/quotes/#{channel}")
+      rescue => e
+        error "failed to write quotefile for channel #{channel}!\n#{$!}"
+        error "#{e.class}: #{e}"
+        error e.backtrace.join("\n")
+      end
     }
   end
   def addquote(source, channel, quote)
@@ -41,7 +55,7 @@ class QuotePlugin < Plugin
     else
       # random quote
       return @lists[channel].compact[rand(@lists[channel].nitems)],
-                                       @lists[channel].length - 1
+      @lists[channel].length - 1
     end
   end
   def delquote(channel, num)
@@ -49,6 +63,7 @@ class QuotePlugin < Plugin
     return false unless(@lists[channel].length > 0)
     if(@lists[channel][num])
       @lists[channel][num] = nil
+      @lists[channel].pop if num == @lists[channel].length - 1
       return true
     end
     return false
@@ -75,31 +90,31 @@ class QuotePlugin < Plugin
     return nil unless(@lists[channel].length > 0)
     matches = @lists[channel].compact.find_all {|a| a.quote =~ /#{regexp}/i }
     if(matches.length > 0)
-       return matches[rand(matches.length)], @lists[channel].length - 1
+      return matches[rand(matches.length)], @lists[channel].length - 1
     else
       return nil
     end
   end
   def help(plugin, topic="")
     case topic
-      when "addquote"
-        return "addquote [<channel>] <quote> => Add quote <quote> for channel <channel>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Responds to !addquote without addressing if so configured"
-      when "delquote"
-        return "delquote [<channel>] <num> => delete quote from <channel> with number <num>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Responds to !delquote without addressing if so configured"
-      when "getquote"
-        return "getquote [<channel>] [<num>] => get quote from <channel> with number <num>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Without <num>, a random quote will be returned. Responds to !getquote without addressing if so configured"
-      when "searchquote"
-        return "searchquote [<channel>] <regexp> => search for quote from <channel> that matches <regexp>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Responds to !searchquote without addressing if so configured"
-      when "topicquote"
-        return "topicquote [<channel>] [<num>] => set topic to quote from <channel> with number <num>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Without <num>, a random quote will be set. Responds to !topicquote without addressing if so configured"
-      when "countquote"
-        return "countquote [<channel>] <regexp> => count quotes from <channel> that match <regexp>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Responds to !countquote without addressing if so configured"
-      when "whoquote"
-        return "whoquote [<channel>] <num> => show who added quote <num>. You only need to supply <channel> if you are addressing #{@bot.nick} privately"
-      when "whenquote"
-        return "whenquote [<channel>] <num> => show when quote <num> was added. You only need to supply <channel> if you are addressing #{@bot.nick} privately"
-      else
-        return "Quote module (Quote storage and retrieval) topics: addquote, getquote, searchquote, topicquote, countquote, whoquote, whenquote"
+    when "addquote"
+      return "addquote [<channel>] <quote> => Add quote <quote> for channel <channel>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Responds to !addquote without addressing if so configured"
+    when "delquote"
+      return "delquote [<channel>] <num> => delete quote from <channel> with number <num>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Responds to !delquote without addressing if so configured"
+    when "getquote"
+      return "getquote [<channel>] [<num>] => get quote from <channel> with number <num>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Without <num>, a random quote will be returned. Responds to !getquote without addressing if so configured"
+    when "searchquote"
+      return "searchquote [<channel>] <regexp> => search for quote from <channel> that matches <regexp>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Responds to !searchquote without addressing if so configured"
+    when "topicquote"
+      return "topicquote [<channel>] [<num>] => set topic to quote from <channel> with number <num>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Without <num>, a random quote will be set. Responds to !topicquote without addressing if so configured"
+    when "countquote"
+      return "countquote [<channel>] <regexp> => count quotes from <channel> that match <regexp>. You only need to supply <channel> if you are addressing #{@bot.nick} privately. Responds to !countquote without addressing if so configured"
+    when "whoquote"
+      return "whoquote [<channel>] <num> => show who added quote <num>. You only need to supply <channel> if you are addressing #{@bot.nick} privately"
+    when "whenquote"
+      return "whenquote [<channel>] <num> => show when quote <num> was added. You only need to supply <channel> if you are addressing #{@bot.nick} privately"
+    else
+      return "Quote module (Quote storage and retrieval) topics: addquote, delquote, getquote, searchquote, topicquote, countquote, whoquote, whenquote"
     end
   end
   def listen(m)

data/data/rbot/plugins/remind.rb

@@ -175,7 +175,7 @@ class RemindPlugin < Plugin
   def remind(m, params)
     who = params.has_key?(:who) ? params[:who] : m.sourcenick
     string = params[:string].to_s
-    puts "in remind, string is: #{string}"
+    debug "in remind, string is: #{string}"
     if(string =~ /^(.*)\s+in\s+(.*)$/)
       subject = $1
       period = $2

data/data/rbot/plugins/rot13.rb

@@ -3,8 +3,8 @@ class RotPlugin < Plugin
     "rot13 <string> => encode <string> to rot13 or back"
   end
   def rot13(m, params)
-    m.reply params[:string].tr("A-Za-z", "N-ZA-Mn-za-m");
+    m.reply params[:string].join(" ").tr("A-Za-z", "N-ZA-Mn-za-m");
   end
 end
 plugin = RotPlugin.new
-plugin.map 'rot13 :string'
+plugin.map 'rot13 *string'

data/data/rbot/plugins/roulette.rb

@@ -21,35 +21,48 @@ class RoulettePlugin < Plugin
     end
 
     playerdata = nil
-    if @registry.has_key?(m.sourcenick)
-      playerdata = @registry[m.sourcenick]
+    if @registry.has_key?("player " + m.sourcenick)
+      playerdata = @registry["player " + m.sourcenick]
     else
       playerdata = RouletteHistory.new(0,0,0,0,0)
     end
-    
+
+    totals = nil
+    if @registry.has_key?("totals")
+      totals = @registry["totals"]
+    else
+      totals = RouletteHistory.new(0,0,0,0,0)
+    end
+
     unless @players.include?(m.sourcenick)
       @players << m.sourcenick
       playerdata.games += 1
     end
     playerdata.shots += 1
+    totals.shots += 1
     
     shot = @chambers.pop
     if shot
       m.reply "#{m.sourcenick}: chamber #{6 - @chambers.length} of 6 => *BANG*"
       playerdata.deaths += 1
+      totals.deaths += 1
       @players.each {|plyr|
         next if plyr == m.sourcenick
-        pdata = @registry[plyr]
+        pdata = @registry["player " + plyr]
         next if pdata == nil
         pdata.wins += 1
-        @registry[plyr] = pdata
+        totals.wins += 1
+        @registry["player " + plyr] = pdata
       }
+      @players = Array.new
     else
       m.reply "#{m.sourcenick}: chamber #{6 - @chambers.length} of 6 => +click+"
       playerdata.misses += 1
+      totals.misses += 1
     end
 
-    @registry[m.sourcenick] = playerdata
+    @registry["player " + m.sourcenick] = playerdata
+    @registry["totals"] = totals
     
     if shot || @chambers.empty?
       reload(m)
@@ -60,12 +73,24 @@ class RoulettePlugin < Plugin
     reset_chambers
     # all players win on a reload
     # (allows you to play 3-shot matches etc)
+    totals = nil
+    if @registry.has_key?("totals")
+      totals = @registry["totals"]
+    else
+      totals = RouletteHistory.new(0,0,0,0,0)
+    end
+
     @players.each {|plyr|
-      pdata = @registry[plyr]
+      pdata = @registry["player " + plyr]
       next if pdata == nil
       pdata.wins += 1
-      @registry[plyr] = pdata
+      totals.wins += 1
+      @registry["player " + plyr] = pdata
     }
+
+    totals.games += 1
+    @registry["totals"] = totals
+
     @players = Array.new
   end
   def reset_chambers
@@ -74,7 +99,7 @@ class RoulettePlugin < Plugin
   end
   def playerstats(m, params)
     player = params[:player]
-    pstats = @registry[player]
+    pstats = @registry["player " + player]
     if pstats.nil?
       m.reply "#{player} hasn't played enough games yet"
     else
@@ -82,10 +107,17 @@ class RoulettePlugin < Plugin
     end
   end
   def stats(m, params)
+    if @registry.has_key?("totals")
+      totals = @registry["totals"]
+      total_games = totals.games
+      total_shots = totals.shots
+    else
+      total_games = 0
+      total_shots = 0
+    end
+
     total_players = 0
-    total_games = 0
-    total_shots = 0
-    
+
     died_most = [nil,0]
     won_most = [nil,0]
     h_win_percent = [nil,0]
@@ -93,9 +125,11 @@ class RoulettePlugin < Plugin
     h_luck_percent = [nil,0]
     l_luck_percent = [nil,0]
     @registry.each {|k,v|
+      match = /player (.+)/.match(k)
+      next unless match
+      k = match[1]
+
       total_players += 1
-      total_games += v.deaths
-      total_shots += v.shots
       
       win_rate = v.wins.to_f / v.games * 100
       if h_win_percent[0].nil? || win_rate > h_win_percent[1] && v.games > 2
@@ -133,7 +167,7 @@ class RoulettePlugin < Plugin
       end
     }
     if total_games < 1
-      m.reply "roulette stats: no games played yet"
+      m.reply "roulette stats: no games completed yet"
     else
       m.reply "roulette stats: #{total_games} games completed, #{total_shots} shots fired at #{total_players} players. Luckiest: #{h_luck_percent[0].join(',')} (#{sprintf '%.1f', h_luck_percent[1]}% clicks). Unluckiest: #{l_luck_percent[0].join(',')} (#{sprintf '%.1f', l_luck_percent[1]}% clicks). Highest survival rate: #{h_win_percent[0].join(',')} (#{sprintf '%.1f', h_win_percent[1]}%). Lowest survival rate: #{l_win_percent[0].join(',')} (#{sprintf '%.1f', l_win_percent[1]}%). Most wins: #{won_most[0].join(',')} (#{won_most[1]}). Most deaths: #{died_most[0].join(',')} (#{died_most[1]})."
     end