rbot 0.9.14 → 0.9.15

data/lib/rbot/rfc2812.rb

@@ -967,6 +967,9 @@ module Irc
       # This is used by some messages to build lists of users that
       # will be delegated when the ENDOF... message is received
       @tmpusers = []
+
+      # Same as above, just for bans
+      @tmpbans = []
     end
 
     # Clear the server and reset the user
@@ -1180,6 +1183,17 @@ module Irc
           data[:users] = @tmpusers
           handle(:names, data)
           @tmpusers = Array.new
+        when RPL_BANLIST
+          data[:channel] = @server.channel(argv[1])
+          data[:mask] = argv[2]
+          data[:by] = argv[3]
+          data[:at] = argv[4]
+          @tmpbans << data
+        when RPL_ENDOFBANLIST
+          data[:channel] = @server.channel(argv[1])
+          data[:bans] = @tmpbans
+          handle(:banlist, data)
+          @tmpbans = Array.new
         when RPL_LUSERCLIENT
           # ":There are <integer> users and <integer>
           # services on <integer> servers"
@@ -1317,7 +1331,7 @@ module Irc
         when RPL_WHOISCHANNELS
           @whois ||= Hash.new
           @whois[:nick] = argv[1]
-          @whois[:channels] = []
+          @whois[:channels] ||= []
           user = @server.user(@whois[:nick])
           argv[-1].split.each do |prechan|
             pfx = prechan.scan(/[#{@server.supports[:prefix][:prefixes].join}]/)
@@ -1344,17 +1358,19 @@ module Irc
           data[:channel].url=data[:url].dup
           handle(:channel_url, data)
         when ERR_NOSUCHNICK
-          data[:nick] = argv[1]
-          if user = @server.get_user(data[:nick])
+          data[:target] = argv[1]
+          data[:message] = argv[2]
+          handle(:nosuchtarget, data)
+          if user = @server.get_user(data[:target])
             @server.delete_user(user)
           end
-          handle(:nosuchnick, data)
         when ERR_NOSUCHCHANNEL
-          data[:channel] = argv[1]
-          if channel = @server.get_channel(data[:channel])
+          data[:target] = argv[1]
+          data[:message] = argv[2]
+          handle(:nosuchtarget, data)
+          if channel = @server.get_channel(data[:target])
             @server.delete_channel(channel)
           end
-          handle(:nosuchchannel, data)
         else
           warning "Unknown message #{serverstring.inspect}"
           handle(:unknown, data)
@@ -1474,6 +1490,9 @@ module Irc
       when :MODE
         parse_mode(serverstring, argv, data)
         handle(:mode, data)
+      when :ERROR
+        data[:message] = argv[1]
+        handle(:error, data)
       else
         warning "Unknown message #{serverstring.inspect}"
         handle(:unknown, data)
@@ -1531,7 +1550,7 @@ module Irc
             data[:modes].last << arg
           end
         }
-      else
+      when Channel
         # array of indices in data[:modes] where parameters
         # are needed
         who_wants_params = []
@@ -1584,6 +1603,10 @@ module Irc
             getting_args = true unless who_wants_params.empty?
           end
         end
+        unless who_wants_params.empty?
+          warning "Unhandled malformed modeline #{data[:modestring]} (unexpected empty arguments)"
+          return
+        end
 
         data[:modes].each { |mode|
           set, key, val = mode
@@ -1593,6 +1616,8 @@ module Irc
             data[:target].mode[key].send(set)
           end
         }
+      else
+        warning "Ignoring #{data[:modestring]} for unrecognized target #{argv[0]} (#{data[:target].inspect})"
       end
     end
   end

data/lib/rbot/timer.rb

@@ -62,7 +62,7 @@ class Timer
       @repeat = opts[:repeat] if opts.include? :repeat
 
       if block_given?
-        @block = block 
+        @block = block
       elsif opts[:code]
         @block = opts[:code]
       end
@@ -233,31 +233,23 @@ class Timer
   end
 
   def run_actions(now = Time.now)
-    nxt = nil
     @actions.keys.each do |k|
       return -1 if @stopping
-      a = @actions[k]
-      next if (!a) or a.blocked?
-
-      if a.next <= now
-        begin
-          @current = k
-          v = a.run(now)
-        ensure
-          @current = nil
-        end
-
-        unless v
-          @actions.delete k
-          next
-        end
-      else
-        v = a.next
+      a = @actions[k] or next
+      next if a.blocked? || a.next > now
+
+      begin
+        @current = k
+        a.run(now)
+      ensure
+        @current = nil
       end
 
-      nxt = v if v and ((!nxt) or (v < nxt))
+      @actions.delete k unless a.next
     end
 
+    nxt = @actions.values.find_all { |v| !v.blocked? }.map{ |v| v.next }.min
+
     if nxt
       delta = nxt - now
       delta = 0 if delta < 0

data/po/en_US/rbot-autorejoin.po

@@ -0,0 +1,3 @@
+#: data/rbot/plugins/autorejoin.rb:60
+msgid "for kicking me out earlier"
+msgstr ""

data/po/en_US/rbot-azgame.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2008-06-20 01:49+0200\n"
+"POT-Creation-Date: 2009-03-20 15:57+0100\n"
 "PO-Revision-Date: 2007-07-14 00:06-0400\n"
 "Last-Translator: Yaohan Chen <yaohan.chen@gmail.com>\n"
 "Language-Team: English\n"
@@ -15,18 +15,18 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/rbot/plugins/games/azgame.rb:78 data/rbot/plugins/games/azgame.rb:251
-#: data/rbot/plugins/games/azgame.rb:257
+#: data/rbot/plugins/games/azgame.rb:106 data/rbot/plugins/games/azgame.rb:302
+#: data/rbot/plugins/games/azgame.rb:308
 msgid "%{count} try"
 msgid_plural "%{count} tries"
 msgstr[0] "%{count} try"
 msgstr[1] "%{count} tries"
 
-#: data/rbot/plugins/games/azgame.rb:83
+#: data/rbot/plugins/games/azgame.rb:111
 msgid "winner, %{tries}"
 msgstr ""
 
-#: data/rbot/plugins/games/azgame.rb:163
+#: data/rbot/plugins/games/azgame.rb:206
 msgid ""
 "%{bold}BINGO!%{bold} the word was %{underline}%{word}%{underline}. Congrats, "
 "%{bold}%{player}%{bold}!"
@@ -34,45 +34,45 @@ msgstr ""
 "%{bold}BINGO!%{bold} the word was %{underline}%{word}%{underline}. Congrats, "
 "%{bold}%{player}%{bold}!"
 
-#: data/rbot/plugins/games/azgame.rb:170
+#: data/rbot/plugins/games/azgame.rb:213
 msgid ""
 "The game was won after %{tries} tries. Scores for this game:    %{scores}"
 msgstr ""
 "The game was won after %{tries} tries. Scores for this game:    %{scores}"
 
-#: data/rbot/plugins/games/azgame.rb:173
+#: data/rbot/plugins/games/azgame.rb:216
 msgid "%{word} is not in the range %{bold}%{range}%{bold}"
 msgstr "%{word} is not in the range %{bold}%{range}%{bold}"
 
-#: data/rbot/plugins/games/azgame.rb:177
+#: data/rbot/plugins/games/azgame.rb:220
 msgid "%{word} doesn't exist or is not acceptable for the game"
 msgstr "%{word} doesn't exist or is not acceptable for the game"
 
-#: data/rbot/plugins/games/azgame.rb:183
+#: data/rbot/plugins/games/azgame.rb:226
 msgid "close, but no cigar. New range: %{bold}%{range}%{bold}"
 msgstr "close, but no cigar. New range: %{bold}%{range}%{bold}"
 
-#: data/rbot/plugins/games/azgame.rb:187
+#: data/rbot/plugins/games/azgame.rb:230
 msgid "%{word} is already one of the range extrema: %{range}"
 msgstr "%{word} is already one of the range extrema: %{range}"
 
-#: data/rbot/plugins/games/azgame.rb:189
+#: data/rbot/plugins/games/azgame.rb:232
 msgid "hm, something went wrong while verifying %{word}"
 msgstr "hm, something went wrong while verifying %{word}"
 
-#: data/rbot/plugins/games/azgame.rb:198
+#: data/rbot/plugins/games/azgame.rb:241
 msgid "no A-Z game running here, can't check if %{word} is valid, can I?"
 msgstr "no A-Z game running here, can't check if %{word} is valid, can I?"
 
-#: data/rbot/plugins/games/azgame.rb:202
+#: data/rbot/plugins/games/azgame.rb:245
 msgid "I only accept single words composed by letters only, sorry"
 msgstr "I only accept single words composed by letters only, sorry"
 
-#: data/rbot/plugins/games/azgame.rb:212
+#: data/rbot/plugins/games/azgame.rb:255
 msgid "the word in %{bold}%{range}%{bold} was:   %{bold}%{word}%{bold}"
 msgstr "the word in %{bold}%{range}%{bold} was:   %{bold}%{word}%{bold}"
 
-#: data/rbot/plugins/games/azgame.rb:216
+#: data/rbot/plugins/games/azgame.rb:259
 msgid ""
 "The game was cancelled after %{tries} tries. Scores for this game would have "
 "been:    %{scores}"
@@ -80,86 +80,86 @@ msgstr ""
 "The game was cancelled after %{tries} tries. Scores for this game would have "
 "been:    %{scores}"
 
-#: data/rbot/plugins/games/azgame.rb:219
+#: data/rbot/plugins/games/azgame.rb:262
 msgid "no A-Z game running in this channel ..."
 msgstr "no A-Z game running in this channel ..."
 
-#: data/rbot/plugins/games/azgame.rb:229
+#: data/rbot/plugins/games/azgame.rb:272
 msgid "let me think ..."
 msgstr "let me think ..."
 
-#: data/rbot/plugins/games/azgame.rb:233
+#: data/rbot/plugins/games/azgame.rb:276 data/rbot/plugins/games/azgame.rb:284
 msgid "couldn't think of anything ..."
 msgstr "couldn't think of anything ..."
 
-#: data/rbot/plugins/games/azgame.rb:237
-msgid "I can't play A-Z in %{lang}, sorry"
-msgstr "I can't play A-Z in %{lang}, sorry"
-
-#: data/rbot/plugins/games/azgame.rb:240
+#: data/rbot/plugins/games/azgame.rb:279 data/rbot/plugins/games/azgame.rb:287
 msgid "got it!"
 msgstr "got it!"
 
-#: data/rbot/plugins/games/azgame.rb:250
+#: data/rbot/plugins/games/azgame.rb:290
+msgid "I can't play A-Z in %{lang}, sorry"
+msgstr "I can't play A-Z in %{lang}, sorry"
+
+#: data/rbot/plugins/games/azgame.rb:301
 msgid " (after %{total_tries} and %{invalid_tries})"
 msgstr " (after %{total_tries} and %{invalid_tries}"
 
-#: data/rbot/plugins/games/azgame.rb:253
+#: data/rbot/plugins/games/azgame.rb:304
 msgid "%{count} invalid try"
 msgid_plural "%{count} invalid tries"
 msgstr[0] "%{count} invalid try"
 msgstr[1] "%{count} invalid tries"
 
-#: data/rbot/plugins/games/azgame.rb:256
+#: data/rbot/plugins/games/azgame.rb:307
 msgid " (after %{total_tries})"
 msgstr " (after %{total_tries}"
 
-#: data/rbot/plugins/games/azgame.rb:262
+#: data/rbot/plugins/games/azgame.rb:313
 msgid "A-Z: %{bold}%{range}%{bold}"
 msgstr "A-Z: %{bold}%{range}%{bold}"
 
-#: data/rbot/plugins/games/azgame.rb:273
+#: data/rbot/plugins/games/azgame.rb:324
 msgid "I have %{count} %{lang} word in my cache"
 msgid_plural "I have %{count} %{lang} words in my cache"
 msgstr[0] "I have %{count} %{lang} word in my cache"
 msgstr[1] "I have %{count} %{lang} words in my cache"
 
-#: data/rbot/plugins/games/azgame.rb:276
+#: data/rbot/plugins/games/azgame.rb:327
 msgid "provide a regexp to match"
 msgstr "provide a regexp to match"
 
-#: data/rbot/plugins/games/azgame.rb:288
+#: data/rbot/plugins/games/azgame.rb:339
 msgid "no %{lang} word I know match %{pattern}"
 msgstr "no %{lang} word I know match %{pattern}"
 
-#: data/rbot/plugins/games/azgame.rb:290
+#: data/rbot/plugins/games/azgame.rb:341
 msgid ""
 "more than 25 %{lang} words I know match %{pattern}, try a stricter matching"
 msgstr ""
 "more than 25 %{lang} words I know match %{pattern}, try a stricter matching"
 
-#: data/rbot/plugins/games/azgame.rb:296 data/rbot/plugins/games/azgame.rb:312
-#: data/rbot/plugins/games/azgame.rb:324
+#: data/rbot/plugins/games/azgame.rb:347 data/rbot/plugins/games/azgame.rb:363
+#: data/rbot/plugins/games/azgame.rb:375
 msgid "provide a word"
 msgstr "provide a word"
 
-#: data/rbot/plugins/games/azgame.rb:301 data/rbot/plugins/games/azgame.rb:317
+#: data/rbot/plugins/games/azgame.rb:352 data/rbot/plugins/games/azgame.rb:368
 msgid "I don't know any %{lang} word %{word}"
 msgstr "I don't know any %{lang} word %{word}"
 
-#: data/rbot/plugins/games/azgame.rb:305
+#: data/rbot/plugins/games/azgame.rb:356
 msgid "%{word} learned from %{user} on %{date}"
 msgstr "%{word} learned from %{user} on %{date}"
 
-#: data/rbot/plugins/games/azgame.rb:307
+#: data/rbot/plugins/games/azgame.rb:358
 msgid "%{word} learned from %{user}"
 msgstr "%{word} learned from %{user}"
 
-#: data/rbot/plugins/games/azgame.rb:329
+#: data/rbot/plugins/games/azgame.rb:380
 msgid "I already know the %{lang} word %{word}"
 msgstr "I already know the %{lang} word %{word}"
 
-#: data/rbot/plugins/games/azgame.rb:545
+#: data/rbot/plugins/games/azgame.rb:591
 msgid ""
 "az [lang] word [count|list|add|delete] => manage the az wordlist for "
 "language lang (defaults to current bot language)"
@@ -167,15 +167,15 @@ msgstr ""
 "az [lang] word [count|list|add|delete] => manage the az wordlist for "
 "language lang (defaults to current bot language)"
 
-#: data/rbot/plugins/games/azgame.rb:547
+#: data/rbot/plugins/games/azgame.rb:593
 msgid "az cancel => abort current game"
 msgstr "az cancel => abort current game"
 
-#: data/rbot/plugins/games/azgame.rb:549
+#: data/rbot/plugins/games/azgame.rb:595
 msgid "az check <word> => checks <word> against current game"
 msgstr "az check <word> => checks <word> against current game"
 
-#: data/rbot/plugins/games/azgame.rb:551
+#: data/rbot/plugins/games/azgame.rb:597
 msgid ""
 "try to guess the word the bot is thinking of; if you guess wrong, the bot "
 "will use the new word to restrict the range of allowed words: eventually, "
@@ -185,7 +185,7 @@ msgstr ""
 "will use the new word to restrict the range of allowed words: eventually, "
 "the range will be so small around the correct word that you can't miss it"
 
-#: data/rbot/plugins/games/azgame.rb:553
+#: data/rbot/plugins/games/azgame.rb:599
 msgid ""
 "az => start a game if none is running, show the current word range "
 "otherwise; you can say 'az <language>' if you want to play in a language "
@@ -195,6 +195,14 @@ msgstr ""
 "otherwise; you can say 'az <language>' if you want to play in a language "
 "different from the current bot default"
 
-#: data/rbot/plugins/games/azgame.rb:555
+#: data/rbot/plugins/games/azgame.rb:604
 msgid "az topics: play, rules, cancel, manage, check"
 msgstr "az topics: play, rules, cancel, manage, check"
+
+#: data/rbot/plugins/games/azgame.rb:605
+msgid "available languages: %{langs}"
+msgstr ""
+
+#: data/rbot/plugins/games/azgame.rb:606
+msgid "available wordlists: %{wls}"
+msgstr ""

data/po/en_US/rbot-bash.po

@@ -0,0 +1,15 @@
+#: data/rbot/plugins/bash.rb:71
+msgid "bash => print a random quote from bash.org"
+msgstr ""
+
+#: data/rbot/plugins/bash.rb:72
+msgid "bash quote_id => print that quote id from bash.org"
+msgstr ""
+
+#: data/rbot/plugins/bash.rb:73
+msgid "bash search <terms> => print the first bash.org quote matching <terms>"
+msgstr ""
+
+#: data/rbot/plugins/bash.rb:74
+msgid "bash latest => print the latest quote from bash.org"
+msgstr ""

data/po/en_US/rbot-dictclient.po

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rbot\n"
-"POT-Creation-Date: 2008-06-20 01:49+0200\n"
+"POT-Creation-Date: 2009-03-20 15:57+0100\n"
 "PO-Revision-Date: 2007-07-14 00:06-0400\n"
 "Last-Translator: Yaohan Chen <yaohan.chen@gmail.com>\n"
 "Language-Team: English\n"
@@ -15,11 +15,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: data/rbot/plugins/dictclient.rb:57
+#: data/rbot/plugins/dictclient.rb:61
 msgid "Hostname or hostname:port of the DICT server used to lookup words"
 msgstr "Hostname or hostname:port of the DICT server used to lookup words"
 
-#: data/rbot/plugins/dictclient.rb:60
+#: data/rbot/plugins/dictclient.rb:64
 msgid ""
 "When multiple databases reply a number of definitions that above this limit, "
 "only the database names will be listed. Otherwise, the full definitions from "
@@ -29,21 +29,21 @@ msgstr ""
 "only the database names will be listed. Otherwise, the full definitions from "
 "each database are replied"
 
-#: data/rbot/plugins/dictclient.rb:63
+#: data/rbot/plugins/dictclient.rb:67
 msgid "Each definition is truncated to this length"
 msgstr "Each definition is truncated to this length"
 
-#: data/rbot/plugins/dictclient.rb:66
+#: data/rbot/plugins/dictclient.rb:70
 msgid "Format of headwords; <word> will be replaced with the actual word"
 msgstr "Format of headwords; <word> will be replaced with the actual word"
 
-#: data/rbot/plugins/dictclient.rb:69
+#: data/rbot/plugins/dictclient.rb:73
 msgid ""
 "Format of database names; <database> will be replaced with the database name"
 msgstr ""
 "Format of database names; <database> will be replaced with the database name"
 
-#: data/rbot/plugins/dictclient.rb:72
+#: data/rbot/plugins/dictclient.rb:76
 msgid ""
 "Format of definitions. <word> will be replaced with the formatted headword, "
 "<def> will be replaced with the truncated definition, and <database> with "
@@ -53,7 +53,7 @@ msgstr ""
 "<def> will be replaced with the truncated definition, and <database> with "
 "the formatted database name"
 
-#: data/rbot/plugins/dictclient.rb:75
+#: data/rbot/plugins/dictclient.rb:79
 msgid ""
 "Format of match results. <matches> will be replaced with the formatted "
 "headwords, <database> with the formatted database name"
@@ -61,7 +61,7 @@ msgstr ""
 "Format of match results. <matches> will be replaced with the formatted "
 "headwords, <database> with the formatted database name"
 
-#: data/rbot/plugins/dictclient.rb:95
+#: data/rbot/plugins/dictclient.rb:99
 msgid ""
 "An error occured connecting to the DICT server. Check the dictclient.server "
 "configuration or retry later"
@@ -69,15 +69,15 @@ msgstr ""
 "An error occured connecting to the DICT server. Check the dictclient.server "
 "configuration or retry later"
 
-#: data/rbot/plugins/dictclient.rb:97
+#: data/rbot/plugins/dictclient.rb:101
 msgid "A protocol error occured"
 msgstr "A protocol error occured"
 
-#: data/rbot/plugins/dictclient.rb:99
+#: data/rbot/plugins/dictclient.rb:103
 msgid "An error occured"
 msgstr "An error occured"
 
-#: data/rbot/plugins/dictclient.rb:121
+#: data/rbot/plugins/dictclient.rb:125
 msgid ""
 "Many definitions for %{phrase} were found in %{databases}. Use 'define "
 "<phrase> from <database> to view a definition."
@@ -85,39 +85,39 @@ msgstr ""
 "Many definitions for %{phrase} were found in %{databases}. Use 'define "
 "<phrase> from <database> to view a definition."
 
-#: data/rbot/plugins/dictclient.rb:138
+#: data/rbot/plugins/dictclient.rb:142
 msgid "No definition for %{phrase} found from %{database}."
 msgstr "No definition for %{phrase} found from %{database}."
 
-#: data/rbot/plugins/dictclient.rb:159
+#: data/rbot/plugins/dictclient.rb:163
 msgid "Nothing matched %{query} from %{database} using %{strategy}"
 msgstr "Nothing matched %{query} from %{database} using %{strategy}"
 
-#: data/rbot/plugins/dictclient.rb:169
+#: data/rbot/plugins/dictclient.rb:173
 msgid "Databases: %{list}"
 msgstr "Databases: %{list}"
 
-#: data/rbot/plugins/dictclient.rb:177
+#: data/rbot/plugins/dictclient.rb:181
 msgid "Strategies: %{list}"
 msgstr "Strategies: %{list}"
 
-#: data/rbot/plugins/dictclient.rb:186
+#: data/rbot/plugins/dictclient.rb:190
 msgid "define <phrase> [from <database>] => Show definition of a phrase"
 msgstr ""
 
-#: data/rbot/plugins/dictclient.rb:188
+#: data/rbot/plugins/dictclient.rb:192
 msgid ""
 "match <phrase> [using <strategy>] [from <database>] => Show phrases matching "
 "the given pattern"
 msgstr ""
 
-#: data/rbot/plugins/dictclient.rb:190
+#: data/rbot/plugins/dictclient.rb:194
 msgid ""
 "dictclient databases => List databases; dictclient strategies => List "
 "strategies"
 msgstr ""
 
-#: data/rbot/plugins/dictclient.rb:192
+#: data/rbot/plugins/dictclient.rb:196
 msgid ""
 "look up phrases on the configured DICT server. topics: define, match, server "
 "information"