rbot 0.9.10 → 0.9.12
Sign up to get free protection for your applications and to get access to all the features.
- data/AUTHORS +22 -4
- data/COPYING +5 -18
- data/ChangeLog +396 -0
- data/README +23 -25
- data/REQUIREMENTS +58 -12
- data/Rakefile +215 -0
- data/bin/rbot +47 -25
- data/bin/rbot-remote +76 -0
- data/data/rbot/languages/french.lang +5 -5
- data/data/rbot/languages/german.lang +4 -4
- data/data/rbot/languages/italian.lang +53 -0
- data/data/rbot/languages/japanese.lang +43 -0
- data/data/rbot/languages/russian.lang +60 -60
- data/data/rbot/languages/traditional_chinese.lang +75 -0
- data/data/rbot/plugins/alias.rb +192 -0
- data/data/rbot/plugins/autoop.rb +74 -37
- data/data/rbot/plugins/autorejoin.rb +15 -5
- data/data/rbot/plugins/bans.rb +454 -150
- data/data/rbot/plugins/bash.rb +173 -31
- data/data/rbot/plugins/botsnack.rb +37 -0
- data/data/rbot/plugins/cal.rb +11 -2
- data/data/rbot/plugins/chanserv.rb +132 -0
- data/data/rbot/plugins/chucknorris.rb +2 -2
- data/data/rbot/plugins/chucknorris.yml.gz +0 -0
- data/data/rbot/plugins/debugger.rb +136 -0
- data/data/rbot/plugins/deepthoughts.rb +89 -95
- data/data/rbot/plugins/delicious.rb +109 -0
- data/data/rbot/plugins/dice.rb +77 -25
- data/data/rbot/plugins/dict.rb +243 -0
- data/data/rbot/plugins/dictclient.rb +211 -0
- data/data/rbot/plugins/digg.rb +2 -2
- data/data/rbot/plugins/excuse.rb +4 -4
- data/data/rbot/plugins/factoids.rb +506 -0
- data/data/rbot/plugins/figlet.rb +127 -18
- data/data/rbot/plugins/fish.rb +93 -33
- data/data/rbot/plugins/forecast.rb +40 -27
- data/data/rbot/plugins/fortune.rb +86 -11
- data/data/rbot/plugins/freshmeat.rb +46 -12
- data/data/rbot/plugins/games/azgame.rb +565 -0
- data/data/rbot/plugins/games/quiz.rb +961 -0
- data/data/rbot/plugins/games/roshambo.rb +62 -0
- data/data/rbot/plugins/{roulette.rb → games/roulette.rb} +58 -8
- data/data/rbot/plugins/games/shiritori.rb +485 -0
- data/data/rbot/plugins/games/uno.rb +1205 -0
- data/data/rbot/plugins/games/wheelfortune.rb +615 -0
- data/data/rbot/plugins/grouphug.rb +76 -22
- data/data/rbot/plugins/hl2.rb +97 -0
- data/data/rbot/plugins/host.rb +10 -1
- data/data/rbot/plugins/httpd.rb.disabled +1 -0
- data/data/rbot/plugins/imdb.rb +511 -47
- data/data/rbot/plugins/insult.rb +32 -37
- data/data/rbot/plugins/iplookup.rb +224 -224
- data/data/rbot/plugins/karma.rb +45 -21
- data/data/rbot/plugins/keywords.rb +258 -160
- data/data/rbot/plugins/lart.rb +126 -95
- data/data/rbot/plugins/lastfm.rb +421 -12
- data/data/rbot/plugins/linkbot.rb +75 -0
- data/data/rbot/plugins/markov.rb +103 -46
- data/data/rbot/plugins/math.rb +6 -5
- data/data/rbot/plugins/modes.rb +114 -0
- data/data/rbot/plugins/nickrecover.rb +97 -0
- data/data/rbot/plugins/nickserv.rb +111 -48
- data/data/rbot/plugins/nslookup.rb +15 -19
- data/data/rbot/plugins/plugin.header +11 -0
- data/data/rbot/plugins/quakeauth.rb +74 -11
- data/data/rbot/plugins/quotes.rb +189 -233
- data/data/rbot/plugins/reaction.rb +415 -0
- data/data/rbot/plugins/remind.rb +11 -15
- data/data/rbot/plugins/remotectl.rb +29 -0
- data/data/rbot/plugins/ri.rb +74 -0
- data/data/rbot/plugins/rot13.rb +16 -1
- data/data/rbot/plugins/rss.rb +1219 -585
- data/data/rbot/plugins/salut.rb +226 -0
- data/data/rbot/plugins/script.rb +184 -0
- data/data/rbot/plugins/search.rb +233 -0
- data/data/rbot/plugins/seen.rb +44 -40
- data/data/rbot/plugins/shortenurls.rb +93 -0
- data/data/rbot/plugins/slashdot.rb +49 -11
- data/data/rbot/plugins/spell.rb +37 -27
- data/data/rbot/plugins/theyfightcrime.rb +36 -39
- data/data/rbot/plugins/threat.rb +25 -22
- data/data/rbot/plugins/time.rb +135 -0
- data/data/rbot/plugins/topic.rb +107 -50
- data/data/rbot/plugins/translator.rb +360 -0
- data/data/rbot/plugins/tube.rb +28 -40
- data/data/rbot/plugins/twitter.rb +187 -0
- data/data/rbot/plugins/urban.rb +62 -53
- data/data/rbot/plugins/url.rb +193 -409
- data/data/rbot/plugins/usermodes.rb +26 -0
- data/data/rbot/plugins/wall.rb +60 -0
- data/data/rbot/plugins/weather.rb +254 -598
- data/data/rbot/plugins/wow.rb +41 -37
- data/data/rbot/plugins/wserver.rb +17 -25
- data/data/rbot/plugins/youtube.rb +237 -0
- data/data/rbot/templates/lart/{larts → larts-english} +0 -0
- data/data/rbot/templates/lart/larts-italian +25 -0
- data/data/rbot/templates/lart/larts-japanese +10 -0
- data/data/rbot/templates/lart/{praises → praises-english} +0 -0
- data/data/rbot/templates/lart/praises-italian +4 -0
- data/data/rbot/templates/lart/praises-japanese +3 -0
- data/data/rbot/templates/quiz/win_messages +11 -0
- data/data/rbot/templates/salut/salut-english +40 -0
- data/data/rbot/templates/salut/salut-french +29 -0
- data/data/rbot/templates/salut/salut-italian +51 -0
- data/data/rbot/templates/salut/salut-japanese +31 -0
- data/lib/rbot/botuser.rb +940 -0
- data/lib/rbot/config-compat.rb +23 -0
- data/lib/rbot/config.rb +211 -276
- data/lib/rbot/core/auth.rb +1063 -0
- data/lib/rbot/core/basics.rb +214 -0
- data/lib/rbot/core/config.rb +330 -0
- data/lib/rbot/core/filters_ui.rb +64 -0
- data/lib/rbot/core/irclog.rb +292 -0
- data/lib/rbot/core/remote.rb +401 -0
- data/lib/rbot/core/unicode.rb +91 -0
- data/lib/rbot/core/userdata.rb +200 -0
- data/lib/rbot/core/utils/extends.rb +444 -0
- data/lib/rbot/core/utils/filters.rb +154 -0
- data/lib/rbot/core/utils/httputil.rb +689 -0
- data/lib/rbot/core/utils/utils.rb +717 -0
- data/lib/rbot/dbhash.rb +30 -9
- data/lib/rbot/irc.rb +1966 -0
- data/lib/rbot/ircbot.rb +816 -675
- data/lib/rbot/ircsocket.rb +246 -232
- data/lib/rbot/language.rb +86 -8
- data/lib/rbot/load-gettext.rb +154 -0
- data/lib/rbot/maskdb.rb +162 -0
- data/lib/rbot/message.rb +392 -65
- data/lib/rbot/messagemapper.rb +438 -94
- data/lib/rbot/pkgconfig.rb +6 -0
- data/lib/rbot/plugins.rb +713 -172
- data/lib/rbot/post-config.rb +1 -0
- data/lib/rbot/rbotconfig.rb +31 -12
- data/lib/rbot/registry.rb +79 -48
- data/lib/rbot/rfc2812.rb +927 -519
- data/lib/rbot/timer.rb +232 -167
- data/po/en_US/rbot-alias.po +82 -0
- data/po/en_US/rbot-autoop.po +0 -0
- data/po/en_US/rbot-autorejoin.po +0 -0
- data/po/en_US/rbot-azgame.po +200 -0
- data/po/en_US/rbot-bans.po +0 -0
- data/po/en_US/rbot-bash.po +0 -0
- data/po/en_US/rbot-botsnack.po +0 -0
- data/po/en_US/rbot-cal.po +3 -0
- data/po/en_US/rbot-chanserv.po +0 -0
- data/po/en_US/rbot-chucknorris.po +0 -0
- data/po/en_US/rbot-debugger.po +0 -0
- data/po/en_US/rbot-deepthoughts.po +0 -0
- data/po/en_US/rbot-delicious.po +0 -0
- data/po/en_US/rbot-dice.po +0 -0
- data/po/en_US/rbot-dict.po +0 -0
- data/po/en_US/rbot-dictclient.po +124 -0
- data/po/en_US/rbot-digg.po +0 -0
- data/po/en_US/rbot-eightball.po +0 -0
- data/po/en_US/rbot-excuse.po +0 -0
- data/po/en_US/rbot-factoids.po +107 -0
- data/po/en_US/rbot-figlet.po +36 -0
- data/po/en_US/rbot-fish.po +0 -0
- data/po/en_US/rbot-forecast.po +0 -0
- data/po/en_US/rbot-fortune.po +0 -0
- data/po/en_US/rbot-freshmeat.po +0 -0
- data/po/en_US/rbot-grouphug.po +18 -0
- data/po/en_US/rbot-hl2.po +0 -0
- data/po/en_US/rbot-host.po +3 -0
- data/po/en_US/rbot-imdb.po +0 -0
- data/po/en_US/rbot-insult.po +0 -0
- data/po/en_US/rbot-iplookup.po +0 -0
- data/po/en_US/rbot-karma.po +0 -0
- data/po/en_US/rbot-keywords.po +24 -0
- data/po/en_US/rbot-lart.po +0 -0
- data/po/en_US/rbot-lastfm.po +172 -0
- data/po/en_US/rbot-linkbot.po +0 -0
- data/po/en_US/rbot-markov.po +20 -0
- data/po/en_US/rbot-math.po +0 -0
- data/po/en_US/rbot-modes.po +0 -0
- data/po/en_US/rbot-nickrecover.po +40 -0
- data/po/en_US/rbot-nickserv.po +104 -0
- data/po/en_US/rbot-nslookup.po +0 -0
- data/po/en_US/rbot-quakeauth.po +0 -0
- data/po/en_US/rbot-quiz.po +0 -0
- data/po/en_US/rbot-quotes.po +108 -0
- data/po/en_US/rbot-reaction.po +0 -0
- data/po/en_US/rbot-remind.po +0 -0
- data/po/en_US/rbot-remotectl.po +0 -0
- data/po/en_US/rbot-ri.po +0 -0
- data/po/en_US/rbot-roshambo.po +0 -0
- data/po/en_US/rbot-rot13.po +0 -0
- data/po/en_US/rbot-roulette.po +0 -0
- data/po/en_US/rbot-rss.po +20 -0
- data/po/en_US/rbot-salut.po +0 -0
- data/po/en_US/rbot-script.po +0 -0
- data/po/en_US/rbot-search.po +0 -0
- data/po/en_US/rbot-seen.po +0 -0
- data/po/en_US/rbot-shiritori.po +113 -0
- data/po/en_US/rbot-shortenurls.po +0 -0
- data/po/en_US/rbot-slashdot.po +0 -0
- data/po/en_US/rbot-spell.po +54 -0
- data/po/en_US/rbot-theyfightcrime.po +0 -0
- data/po/en_US/rbot-threat.po +0 -0
- data/po/en_US/rbot-time.po +0 -0
- data/po/en_US/rbot-topic.po +0 -0
- data/po/en_US/rbot-translator.po +77 -0
- data/po/en_US/rbot-tube.po +0 -0
- data/po/en_US/rbot-twitter.po +24 -0
- data/po/en_US/rbot-uno.po +512 -0
- data/po/en_US/rbot-urban.po +0 -0
- data/po/en_US/rbot-url.po +0 -0
- data/po/en_US/rbot-usermodes.po +0 -0
- data/po/en_US/rbot-wall.po +33 -0
- data/po/en_US/rbot-weather.po +0 -0
- data/po/en_US/rbot-wheelfortune.po +205 -0
- data/po/en_US/rbot-wow.po +0 -0
- data/po/en_US/rbot-wserver.po +0 -0
- data/po/en_US/rbot-youtube.po +58 -0
- data/po/en_US/rbot.po +1097 -0
- data/po/fr/rbot-alias.po +97 -0
- data/po/fr/rbot-autoop.po +0 -0
- data/po/fr/rbot-autorejoin.po +0 -0
- data/po/fr/rbot-azgame.po +204 -0
- data/po/fr/rbot-bans.po +0 -0
- data/po/fr/rbot-bash.po +0 -0
- data/po/fr/rbot-botsnack.po +0 -0
- data/po/fr/rbot-cal.po +3 -0
- data/po/fr/rbot-chanserv.po +0 -0
- data/po/fr/rbot-chucknorris.po +0 -0
- data/po/fr/rbot-debugger.po +0 -0
- data/po/fr/rbot-deepthoughts.po +0 -0
- data/po/fr/rbot-delicious.po +0 -0
- data/po/fr/rbot-dice.po +0 -0
- data/po/fr/rbot-dict.po +0 -0
- data/po/fr/rbot-dictclient.po +134 -0
- data/po/fr/rbot-digg.po +0 -0
- data/po/fr/rbot-eightball.po +0 -0
- data/po/fr/rbot-excuse.po +0 -0
- data/po/fr/rbot-factoids.po +111 -0
- data/po/fr/rbot-figlet.po +37 -0
- data/po/fr/rbot-fish.po +0 -0
- data/po/fr/rbot-forecast.po +0 -0
- data/po/fr/rbot-fortune.po +0 -0
- data/po/fr/rbot-freshmeat.po +0 -0
- data/po/fr/rbot-grouphug.po +18 -0
- data/po/fr/rbot-hl2.po +0 -0
- data/po/fr/rbot-host.po +3 -0
- data/po/fr/rbot-imdb.po +0 -0
- data/po/fr/rbot-insult.po +0 -0
- data/po/fr/rbot-iplookup.po +0 -0
- data/po/fr/rbot-karma.po +0 -0
- data/po/fr/rbot-keywords.po +24 -0
- data/po/fr/rbot-lart.po +0 -0
- data/po/fr/rbot-lastfm.po +172 -0
- data/po/fr/rbot-linkbot.po +0 -0
- data/po/fr/rbot-markov.po +20 -0
- data/po/fr/rbot-math.po +0 -0
- data/po/fr/rbot-modes.po +0 -0
- data/po/fr/rbot-nickrecover.po +36 -0
- data/po/fr/rbot-nickserv.po +116 -0
- data/po/fr/rbot-nslookup.po +0 -0
- data/po/fr/rbot-quakeauth.po +0 -0
- data/po/fr/rbot-quiz.po +0 -0
- data/po/fr/rbot-quotes.po +138 -0
- data/po/fr/rbot-reaction.po +0 -0
- data/po/fr/rbot-remind.po +0 -0
- data/po/fr/rbot-remotectl.po +0 -0
- data/po/fr/rbot-ri.po +0 -0
- data/po/fr/rbot-roshambo.po +0 -0
- data/po/fr/rbot-rot13.po +0 -0
- data/po/fr/rbot-roulette.po +0 -0
- data/po/fr/rbot-rss.po +20 -0
- data/po/fr/rbot-salut.po +0 -0
- data/po/fr/rbot-script.po +0 -0
- data/po/fr/rbot-search.po +0 -0
- data/po/fr/rbot-seen.po +0 -0
- data/po/fr/rbot-shiritori.po +119 -0
- data/po/fr/rbot-shortenurls.po +0 -0
- data/po/fr/rbot-slashdot.po +0 -0
- data/po/fr/rbot-spell.po +56 -0
- data/po/fr/rbot-theyfightcrime.po +0 -0
- data/po/fr/rbot-threat.po +0 -0
- data/po/fr/rbot-time.po +0 -0
- data/po/fr/rbot-topic.po +0 -0
- data/po/fr/rbot-translator.po +90 -0
- data/po/fr/rbot-tube.po +0 -0
- data/po/fr/rbot-twitter.po +24 -0
- data/po/fr/rbot-uno.po +521 -0
- data/po/fr/rbot-urban.po +0 -0
- data/po/fr/rbot-url.po +0 -0
- data/po/fr/rbot-usermodes.po +0 -0
- data/po/fr/rbot-wall.po +33 -0
- data/po/fr/rbot-weather.po +0 -0
- data/po/fr/rbot-wheelfortune.po +255 -0
- data/po/fr/rbot-wow.po +0 -0
- data/po/fr/rbot-wserver.po +0 -0
- data/po/fr/rbot-youtube.po +64 -0
- data/po/fr/rbot.po +1133 -0
- data/po/it/rbot-alias.po +82 -0
- data/po/it/rbot-autoop.po +0 -0
- data/po/it/rbot-autorejoin.po +0 -0
- data/po/it/rbot-azgame.po +186 -0
- data/po/it/rbot-bans.po +0 -0
- data/po/it/rbot-bash.po +0 -0
- data/po/it/rbot-botsnack.po +0 -0
- data/po/it/rbot-cal.po +3 -0
- data/po/it/rbot-chanserv.po +0 -0
- data/po/it/rbot-chucknorris.po +0 -0
- data/po/it/rbot-debugger.po +0 -0
- data/po/it/rbot-deepthoughts.po +0 -0
- data/po/it/rbot-delicious.po +0 -0
- data/po/it/rbot-dice.po +0 -0
- data/po/it/rbot-dict.po +0 -0
- data/po/it/rbot-dictclient.po +111 -0
- data/po/it/rbot-digg.po +0 -0
- data/po/it/rbot-eightball.po +0 -0
- data/po/it/rbot-excuse.po +0 -0
- data/po/it/rbot-factoids.po +110 -0
- data/po/it/rbot-figlet.po +36 -0
- data/po/it/rbot-fish.po +0 -0
- data/po/it/rbot-forecast.po +0 -0
- data/po/it/rbot-fortune.po +0 -0
- data/po/it/rbot-freshmeat.po +0 -0
- data/po/it/rbot-grouphug.po +18 -0
- data/po/it/rbot-hl2.po +0 -0
- data/po/it/rbot-host.po +3 -0
- data/po/it/rbot-imdb.po +0 -0
- data/po/it/rbot-insult.po +0 -0
- data/po/it/rbot-iplookup.po +0 -0
- data/po/it/rbot-karma.po +0 -0
- data/po/it/rbot-keywords.po +24 -0
- data/po/it/rbot-lart.po +0 -0
- data/po/it/rbot-lastfm.po +172 -0
- data/po/it/rbot-linkbot.po +0 -0
- data/po/it/rbot-markov.po +20 -0
- data/po/it/rbot-math.po +0 -0
- data/po/it/rbot-modes.po +0 -0
- data/po/it/rbot-nickrecover.po +36 -0
- data/po/it/rbot-nickserv.po +104 -0
- data/po/it/rbot-nslookup.po +0 -0
- data/po/it/rbot-quakeauth.po +0 -0
- data/po/it/rbot-quiz.po +0 -0
- data/po/it/rbot-quotes.po +108 -0
- data/po/it/rbot-reaction.po +0 -0
- data/po/it/rbot-remind.po +0 -0
- data/po/it/rbot-remotectl.po +0 -0
- data/po/it/rbot-ri.po +0 -0
- data/po/it/rbot-roshambo.po +0 -0
- data/po/it/rbot-rot13.po +0 -0
- data/po/it/rbot-roulette.po +0 -0
- data/po/it/rbot-rss.po +20 -0
- data/po/it/rbot-salut.po +0 -0
- data/po/it/rbot-script.po +0 -0
- data/po/it/rbot-search.po +0 -0
- data/po/it/rbot-seen.po +0 -0
- data/po/it/rbot-shiritori.po +102 -0
- data/po/it/rbot-shortenurls.po +0 -0
- data/po/it/rbot-slashdot.po +0 -0
- data/po/it/rbot-spell.po +54 -0
- data/po/it/rbot-theyfightcrime.po +0 -0
- data/po/it/rbot-threat.po +0 -0
- data/po/it/rbot-time.po +0 -0
- data/po/it/rbot-topic.po +0 -0
- data/po/it/rbot-translator.po +77 -0
- data/po/it/rbot-tube.po +0 -0
- data/po/it/rbot-twitter.po +24 -0
- data/po/it/rbot-uno.po +564 -0
- data/po/it/rbot-urban.po +0 -0
- data/po/it/rbot-url.po +0 -0
- data/po/it/rbot-usermodes.po +0 -0
- data/po/it/rbot-wall.po +33 -0
- data/po/it/rbot-weather.po +0 -0
- data/po/it/rbot-wheelfortune.po +251 -0
- data/po/it/rbot-wow.po +0 -0
- data/po/it/rbot-wserver.po +0 -0
- data/po/it/rbot-youtube.po +64 -0
- data/po/it/rbot.po +1127 -0
- data/po/ja/rbot-alias.po +82 -0
- data/po/ja/rbot-autoop.po +0 -0
- data/po/ja/rbot-autorejoin.po +0 -0
- data/po/ja/rbot-azgame.po +194 -0
- data/po/ja/rbot-bans.po +0 -0
- data/po/ja/rbot-bash.po +0 -0
- data/po/ja/rbot-botsnack.po +0 -0
- data/po/ja/rbot-cal.po +3 -0
- data/po/ja/rbot-chanserv.po +0 -0
- data/po/ja/rbot-chucknorris.po +0 -0
- data/po/ja/rbot-debugger.po +0 -0
- data/po/ja/rbot-deepthoughts.po +0 -0
- data/po/ja/rbot-delicious.po +0 -0
- data/po/ja/rbot-dice.po +0 -0
- data/po/ja/rbot-dict.po +0 -0
- data/po/ja/rbot-dictclient.po +111 -0
- data/po/ja/rbot-digg.po +0 -0
- data/po/ja/rbot-eightball.po +0 -0
- data/po/ja/rbot-excuse.po +0 -0
- data/po/ja/rbot-factoids.po +107 -0
- data/po/ja/rbot-figlet.po +36 -0
- data/po/ja/rbot-fish.po +0 -0
- data/po/ja/rbot-forecast.po +0 -0
- data/po/ja/rbot-fortune.po +0 -0
- data/po/ja/rbot-freshmeat.po +0 -0
- data/po/ja/rbot-grouphug.po +18 -0
- data/po/ja/rbot-hl2.po +0 -0
- data/po/ja/rbot-host.po +3 -0
- data/po/ja/rbot-imdb.po +0 -0
- data/po/ja/rbot-insult.po +0 -0
- data/po/ja/rbot-iplookup.po +0 -0
- data/po/ja/rbot-karma.po +0 -0
- data/po/ja/rbot-keywords.po +24 -0
- data/po/ja/rbot-lart.po +0 -0
- data/po/ja/rbot-lastfm.po +172 -0
- data/po/ja/rbot-linkbot.po +0 -0
- data/po/ja/rbot-markov.po +20 -0
- data/po/ja/rbot-math.po +0 -0
- data/po/ja/rbot-modes.po +0 -0
- data/po/ja/rbot-nickrecover.po +36 -0
- data/po/ja/rbot-nickserv.po +104 -0
- data/po/ja/rbot-nslookup.po +0 -0
- data/po/ja/rbot-quakeauth.po +0 -0
- data/po/ja/rbot-quiz.po +0 -0
- data/po/ja/rbot-quotes.po +108 -0
- data/po/ja/rbot-reaction.po +0 -0
- data/po/ja/rbot-remind.po +0 -0
- data/po/ja/rbot-remotectl.po +0 -0
- data/po/ja/rbot-ri.po +0 -0
- data/po/ja/rbot-roshambo.po +0 -0
- data/po/ja/rbot-rot13.po +0 -0
- data/po/ja/rbot-roulette.po +0 -0
- data/po/ja/rbot-rss.po +20 -0
- data/po/ja/rbot-salut.po +0 -0
- data/po/ja/rbot-script.po +0 -0
- data/po/ja/rbot-search.po +0 -0
- data/po/ja/rbot-seen.po +0 -0
- data/po/ja/rbot-shiritori.po +115 -0
- data/po/ja/rbot-shortenurls.po +0 -0
- data/po/ja/rbot-slashdot.po +0 -0
- data/po/ja/rbot-spell.po +54 -0
- data/po/ja/rbot-theyfightcrime.po +0 -0
- data/po/ja/rbot-threat.po +0 -0
- data/po/ja/rbot-time.po +0 -0
- data/po/ja/rbot-topic.po +0 -0
- data/po/ja/rbot-translator.po +77 -0
- data/po/ja/rbot-tube.po +0 -0
- data/po/ja/rbot-twitter.po +24 -0
- data/po/ja/rbot-uno.po +512 -0
- data/po/ja/rbot-urban.po +0 -0
- data/po/ja/rbot-url.po +0 -0
- data/po/ja/rbot-usermodes.po +0 -0
- data/po/ja/rbot-wall.po +33 -0
- data/po/ja/rbot-weather.po +0 -0
- data/po/ja/rbot-wheelfortune.po +205 -0
- data/po/ja/rbot-wow.po +0 -0
- data/po/ja/rbot-wserver.po +0 -0
- data/po/ja/rbot-youtube.po +58 -0
- data/po/ja/rbot.po +999 -0
- data/po/rbot-alias.pot +83 -0
- data/po/rbot-autoop.pot +0 -0
- data/po/rbot-autorejoin.pot +0 -0
- data/po/rbot-azgame.pot +187 -0
- data/po/rbot-bans.pot +0 -0
- data/po/rbot-bash.pot +0 -0
- data/po/rbot-botsnack.pot +0 -0
- data/po/rbot-cal.pot +21 -0
- data/po/rbot-chanserv.pot +0 -0
- data/po/rbot-chucknorris.pot +0 -0
- data/po/rbot-debugger.pot +0 -0
- data/po/rbot-deepthoughts.pot +0 -0
- data/po/rbot-delicious.pot +0 -0
- data/po/rbot-dice.pot +0 -0
- data/po/rbot-dict.pot +0 -0
- data/po/rbot-dictclient.pot +112 -0
- data/po/rbot-digg.pot +0 -0
- data/po/rbot-eightball.pot +0 -0
- data/po/rbot-excuse.pot +0 -0
- data/po/rbot-factoids.pot +108 -0
- data/po/rbot-figlet.pot +37 -0
- data/po/rbot-fish.pot +0 -0
- data/po/rbot-forecast.pot +0 -0
- data/po/rbot-fortune.pot +0 -0
- data/po/rbot-freshmeat.pot +0 -0
- data/po/rbot-grouphug.pot +36 -0
- data/po/rbot-hl2.pot +0 -0
- data/po/rbot-host.pot +21 -0
- data/po/rbot-imdb.pot +0 -0
- data/po/rbot-insult.pot +0 -0
- data/po/rbot-iplookup.pot +0 -0
- data/po/rbot-karma.pot +0 -0
- data/po/rbot-keywords.pot +25 -0
- data/po/rbot-lart.pot +0 -0
- data/po/rbot-lastfm.pot +190 -0
- data/po/rbot-linkbot.pot +0 -0
- data/po/rbot-markov.pot +21 -0
- data/po/rbot-math.pot +0 -0
- data/po/rbot-modes.pot +0 -0
- data/po/rbot-nickrecover.pot +37 -0
- data/po/rbot-nickserv.pot +105 -0
- data/po/rbot-nslookup.pot +0 -0
- data/po/rbot-quakeauth.pot +0 -0
- data/po/rbot-quiz.pot +0 -0
- data/po/rbot-quotes.pot +109 -0
- data/po/rbot-reaction.pot +0 -0
- data/po/rbot-remind.pot +0 -0
- data/po/rbot-remotectl.pot +0 -0
- data/po/rbot-ri.pot +0 -0
- data/po/rbot-roshambo.pot +0 -0
- data/po/rbot-rot13.pot +0 -0
- data/po/rbot-roulette.pot +0 -0
- data/po/rbot-rss.pot +21 -0
- data/po/rbot-salut.pot +0 -0
- data/po/rbot-script.pot +0 -0
- data/po/rbot-search.pot +0 -0
- data/po/rbot-seen.pot +0 -0
- data/po/rbot-shiritori.pot +103 -0
- data/po/rbot-shortenurls.pot +0 -0
- data/po/rbot-slashdot.pot +0 -0
- data/po/rbot-spell.pot +55 -0
- data/po/rbot-theyfightcrime.pot +0 -0
- data/po/rbot-threat.pot +0 -0
- data/po/rbot-time.pot +0 -0
- data/po/rbot-topic.pot +0 -0
- data/po/rbot-translator.pot +78 -0
- data/po/rbot-tube.pot +0 -0
- data/po/rbot-twitter.pot +25 -0
- data/po/rbot-uno.pot +513 -0
- data/po/rbot-urban.pot +0 -0
- data/po/rbot-url.pot +0 -0
- data/po/rbot-usermodes.pot +0 -0
- data/po/rbot-wall.pot +33 -0
- data/po/rbot-weather.pot +0 -0
- data/po/rbot-wheelfortune.pot +206 -0
- data/po/rbot-wow.pot +0 -0
- data/po/rbot-wserver.pot +0 -0
- data/po/rbot-youtube.pot +59 -0
- data/po/rbot.pot +1004 -0
- data/po/zh_CN/rbot-alias.po +82 -0
- data/po/zh_CN/rbot-autoop.po +0 -0
- data/po/zh_CN/rbot-autorejoin.po +0 -0
- data/po/zh_CN/rbot-azgame.po +186 -0
- data/po/zh_CN/rbot-bans.po +0 -0
- data/po/zh_CN/rbot-bash.po +0 -0
- data/po/zh_CN/rbot-botsnack.po +0 -0
- data/po/zh_CN/rbot-cal.po +3 -0
- data/po/zh_CN/rbot-chanserv.po +0 -0
- data/po/zh_CN/rbot-chucknorris.po +0 -0
- data/po/zh_CN/rbot-debugger.po +0 -0
- data/po/zh_CN/rbot-deepthoughts.po +0 -0
- data/po/zh_CN/rbot-delicious.po +0 -0
- data/po/zh_CN/rbot-dice.po +0 -0
- data/po/zh_CN/rbot-dict.po +0 -0
- data/po/zh_CN/rbot-dictclient.po +111 -0
- data/po/zh_CN/rbot-digg.po +0 -0
- data/po/zh_CN/rbot-eightball.po +0 -0
- data/po/zh_CN/rbot-excuse.po +0 -0
- data/po/zh_CN/rbot-factoids.po +107 -0
- data/po/zh_CN/rbot-figlet.po +36 -0
- data/po/zh_CN/rbot-fish.po +0 -0
- data/po/zh_CN/rbot-forecast.po +0 -0
- data/po/zh_CN/rbot-fortune.po +0 -0
- data/po/zh_CN/rbot-freshmeat.po +0 -0
- data/po/zh_CN/rbot-grouphug.po +18 -0
- data/po/zh_CN/rbot-hl2.po +0 -0
- data/po/zh_CN/rbot-host.po +3 -0
- data/po/zh_CN/rbot-imdb.po +0 -0
- data/po/zh_CN/rbot-insult.po +0 -0
- data/po/zh_CN/rbot-iplookup.po +0 -0
- data/po/zh_CN/rbot-karma.po +0 -0
- data/po/zh_CN/rbot-keywords.po +24 -0
- data/po/zh_CN/rbot-lart.po +0 -0
- data/po/zh_CN/rbot-lastfm.po +172 -0
- data/po/zh_CN/rbot-linkbot.po +0 -0
- data/po/zh_CN/rbot-markov.po +20 -0
- data/po/zh_CN/rbot-math.po +0 -0
- data/po/zh_CN/rbot-modes.po +0 -0
- data/po/zh_CN/rbot-nickrecover.po +36 -0
- data/po/zh_CN/rbot-nickserv.po +104 -0
- data/po/zh_CN/rbot-nslookup.po +0 -0
- data/po/zh_CN/rbot-quakeauth.po +0 -0
- data/po/zh_CN/rbot-quiz.po +0 -0
- data/po/zh_CN/rbot-quotes.po +108 -0
- data/po/zh_CN/rbot-reaction.po +0 -0
- data/po/zh_CN/rbot-remind.po +0 -0
- data/po/zh_CN/rbot-remotectl.po +0 -0
- data/po/zh_CN/rbot-ri.po +0 -0
- data/po/zh_CN/rbot-roshambo.po +0 -0
- data/po/zh_CN/rbot-rot13.po +0 -0
- data/po/zh_CN/rbot-roulette.po +0 -0
- data/po/zh_CN/rbot-rss.po +20 -0
- data/po/zh_CN/rbot-salut.po +0 -0
- data/po/zh_CN/rbot-script.po +0 -0
- data/po/zh_CN/rbot-search.po +0 -0
- data/po/zh_CN/rbot-seen.po +0 -0
- data/po/zh_CN/rbot-shiritori.po +102 -0
- data/po/zh_CN/rbot-shortenurls.po +0 -0
- data/po/zh_CN/rbot-slashdot.po +0 -0
- data/po/zh_CN/rbot-spell.po +54 -0
- data/po/zh_CN/rbot-theyfightcrime.po +0 -0
- data/po/zh_CN/rbot-threat.po +0 -0
- data/po/zh_CN/rbot-time.po +0 -0
- data/po/zh_CN/rbot-topic.po +0 -0
- data/po/zh_CN/rbot-translator.po +77 -0
- data/po/zh_CN/rbot-tube.po +0 -0
- data/po/zh_CN/rbot-twitter.po +24 -0
- data/po/zh_CN/rbot-uno.po +512 -0
- data/po/zh_CN/rbot-urban.po +0 -0
- data/po/zh_CN/rbot-url.po +0 -0
- data/po/zh_CN/rbot-usermodes.po +0 -0
- data/po/zh_CN/rbot-wall.po +33 -0
- data/po/zh_CN/rbot-weather.po +0 -0
- data/po/zh_CN/rbot-wheelfortune.po +205 -0
- data/po/zh_CN/rbot-wow.po +0 -0
- data/po/zh_CN/rbot-wserver.po +0 -0
- data/po/zh_CN/rbot-youtube.po +58 -0
- data/po/zh_CN/rbot.po +1006 -0
- data/po/zh_TW/rbot-alias.po +82 -0
- data/po/zh_TW/rbot-autoop.po +0 -0
- data/po/zh_TW/rbot-autorejoin.po +0 -0
- data/po/zh_TW/rbot-azgame.po +186 -0
- data/po/zh_TW/rbot-bans.po +0 -0
- data/po/zh_TW/rbot-bash.po +0 -0
- data/po/zh_TW/rbot-botsnack.po +0 -0
- data/po/zh_TW/rbot-cal.po +3 -0
- data/po/zh_TW/rbot-chanserv.po +0 -0
- data/po/zh_TW/rbot-chucknorris.po +0 -0
- data/po/zh_TW/rbot-debugger.po +0 -0
- data/po/zh_TW/rbot-deepthoughts.po +0 -0
- data/po/zh_TW/rbot-delicious.po +0 -0
- data/po/zh_TW/rbot-dice.po +0 -0
- data/po/zh_TW/rbot-dict.po +0 -0
- data/po/zh_TW/rbot-dictclient.po +111 -0
- data/po/zh_TW/rbot-digg.po +0 -0
- data/po/zh_TW/rbot-eightball.po +0 -0
- data/po/zh_TW/rbot-excuse.po +0 -0
- data/po/zh_TW/rbot-factoids.po +107 -0
- data/po/zh_TW/rbot-figlet.po +36 -0
- data/po/zh_TW/rbot-fish.po +0 -0
- data/po/zh_TW/rbot-forecast.po +0 -0
- data/po/zh_TW/rbot-fortune.po +0 -0
- data/po/zh_TW/rbot-freshmeat.po +0 -0
- data/po/zh_TW/rbot-grouphug.po +18 -0
- data/po/zh_TW/rbot-hl2.po +0 -0
- data/po/zh_TW/rbot-host.po +3 -0
- data/po/zh_TW/rbot-imdb.po +0 -0
- data/po/zh_TW/rbot-insult.po +0 -0
- data/po/zh_TW/rbot-iplookup.po +0 -0
- data/po/zh_TW/rbot-karma.po +0 -0
- data/po/zh_TW/rbot-keywords.po +24 -0
- data/po/zh_TW/rbot-lart.po +0 -0
- data/po/zh_TW/rbot-lastfm.po +172 -0
- data/po/zh_TW/rbot-linkbot.po +0 -0
- data/po/zh_TW/rbot-markov.po +20 -0
- data/po/zh_TW/rbot-math.po +0 -0
- data/po/zh_TW/rbot-modes.po +0 -0
- data/po/zh_TW/rbot-nickrecover.po +36 -0
- data/po/zh_TW/rbot-nickserv.po +104 -0
- data/po/zh_TW/rbot-nslookup.po +0 -0
- data/po/zh_TW/rbot-quakeauth.po +0 -0
- data/po/zh_TW/rbot-quiz.po +0 -0
- data/po/zh_TW/rbot-quotes.po +108 -0
- data/po/zh_TW/rbot-reaction.po +0 -0
- data/po/zh_TW/rbot-remind.po +0 -0
- data/po/zh_TW/rbot-remotectl.po +0 -0
- data/po/zh_TW/rbot-ri.po +0 -0
- data/po/zh_TW/rbot-roshambo.po +0 -0
- data/po/zh_TW/rbot-rot13.po +0 -0
- data/po/zh_TW/rbot-roulette.po +0 -0
- data/po/zh_TW/rbot-rss.po +20 -0
- data/po/zh_TW/rbot-salut.po +0 -0
- data/po/zh_TW/rbot-script.po +0 -0
- data/po/zh_TW/rbot-search.po +0 -0
- data/po/zh_TW/rbot-seen.po +0 -0
- data/po/zh_TW/rbot-shiritori.po +102 -0
- data/po/zh_TW/rbot-shortenurls.po +0 -0
- data/po/zh_TW/rbot-slashdot.po +0 -0
- data/po/zh_TW/rbot-spell.po +54 -0
- data/po/zh_TW/rbot-theyfightcrime.po +0 -0
- data/po/zh_TW/rbot-threat.po +0 -0
- data/po/zh_TW/rbot-time.po +0 -0
- data/po/zh_TW/rbot-topic.po +0 -0
- data/po/zh_TW/rbot-translator.po +77 -0
- data/po/zh_TW/rbot-tube.po +0 -0
- data/po/zh_TW/rbot-twitter.po +24 -0
- data/po/zh_TW/rbot-uno.po +512 -0
- data/po/zh_TW/rbot-urban.po +0 -0
- data/po/zh_TW/rbot-url.po +0 -0
- data/po/zh_TW/rbot-usermodes.po +0 -0
- data/po/zh_TW/rbot-wall.po +33 -0
- data/po/zh_TW/rbot-weather.po +0 -0
- data/po/zh_TW/rbot-wheelfortune.po +205 -0
- data/po/zh_TW/rbot-wow.po +0 -0
- data/po/zh_TW/rbot-wserver.po +0 -0
- data/po/zh_TW/rbot-youtube.po +58 -0
- data/po/zh_TW/rbot.po +1034 -0
- data/setup.rb +800 -574
- metadata +723 -108
- data/data/rbot/contrib/plugins/figlet.rb +0 -20
- data/data/rbot/contrib/plugins/ri.rb +0 -83
- data/data/rbot/plugins/demauro.rb +0 -95
- data/data/rbot/plugins/google.rb +0 -53
- data/data/rbot/plugins/opme.rb +0 -19
- data/data/rbot/plugins/roshambo.rb +0 -54
- data/data/rbot/plugins/rubyurl.rb +0 -39
- data/data/rbot/plugins/tinyurl.rb +0 -39
- data/data/rbot/plugins/xmlrpc.rb.disabled +0 -52
- data/data/rbot/templates/levels.rbot +0 -32
- data/data/rbot/templates/users.rbot +0 -1
- data/lib/rbot/auth.rb +0 -314
- data/lib/rbot/channel.rb +0 -54
- data/lib/rbot/httputil.rb +0 -309
- data/lib/rbot/utils.rb +0 -83
data/lib/rbot/ircsocket.rb
CHANGED
@@ -1,8 +1,73 @@
|
|
1
|
+
require 'monitor'
|
2
|
+
|
3
|
+
class ::String
|
4
|
+
# Calculate the penalty which will be assigned to this message
|
5
|
+
# by the IRCd
|
6
|
+
def irc_send_penalty
|
7
|
+
# According to eggrdop, the initial penalty is
|
8
|
+
penalty = 1 + self.size/100
|
9
|
+
# on everything but UnderNET where it's
|
10
|
+
# penalty = 2 + self.size/120
|
11
|
+
|
12
|
+
cmd, pars = self.split($;,2)
|
13
|
+
debug "cmd: #{cmd}, pars: #{pars.inspect}"
|
14
|
+
case cmd.to_sym
|
15
|
+
when :KICK
|
16
|
+
chan, nick, msg = pars.split
|
17
|
+
chan = chan.split(',')
|
18
|
+
nick = nick.split(',')
|
19
|
+
penalty += nick.size
|
20
|
+
penalty *= chan.size
|
21
|
+
when :MODE
|
22
|
+
chan, modes, argument = pars.split
|
23
|
+
extra = 0
|
24
|
+
if modes
|
25
|
+
extra = 1
|
26
|
+
if argument
|
27
|
+
extra += modes.split(/\+|-/).size
|
28
|
+
else
|
29
|
+
extra += 3 * modes.split(/\+|-/).size
|
30
|
+
end
|
31
|
+
end
|
32
|
+
if argument
|
33
|
+
extra += 2 * argument.split.size
|
34
|
+
end
|
35
|
+
penalty += extra * chan.split.size
|
36
|
+
when :TOPIC
|
37
|
+
penalty += 1
|
38
|
+
penalty += 2 unless pars.split.size < 2
|
39
|
+
when :PRIVMSG, :NOTICE
|
40
|
+
dests = pars.split($;,2).first
|
41
|
+
penalty += dests.split(',').size
|
42
|
+
when :WHO
|
43
|
+
# I'm too lazy to implement this one correctly
|
44
|
+
penalty += 5
|
45
|
+
when :AWAY, :JOIN, :VERSION, :TIME, :TRACE, :WHOIS, :DNS
|
46
|
+
penalty += 2
|
47
|
+
when :INVITE, :NICK
|
48
|
+
penalty += 3
|
49
|
+
when :ISON
|
50
|
+
penalty += 1
|
51
|
+
else # Unknown messages
|
52
|
+
penalty += 1
|
53
|
+
end
|
54
|
+
if penalty > 99
|
55
|
+
debug "Wow, more than 99 secs of penalty!"
|
56
|
+
penalty = 99
|
57
|
+
end
|
58
|
+
if penalty < 2
|
59
|
+
debug "Wow, less than 2 secs of penalty!"
|
60
|
+
penalty = 2
|
61
|
+
end
|
62
|
+
debug "penalty: #{penalty}"
|
63
|
+
return penalty
|
64
|
+
end
|
65
|
+
end
|
66
|
+
|
1
67
|
module Irc
|
2
68
|
|
3
69
|
require 'socket'
|
4
70
|
require 'thread'
|
5
|
-
require 'rbot/timer'
|
6
71
|
|
7
72
|
class QueueRing
|
8
73
|
# A QueueRing is implemented as an array with elements in the form
|
@@ -21,12 +86,13 @@ module Irc
|
|
21
86
|
end
|
22
87
|
|
23
88
|
def length
|
24
|
-
|
89
|
+
len = 0
|
25
90
|
@storage.each {|c|
|
26
|
-
|
91
|
+
len += c[1].size
|
27
92
|
}
|
28
|
-
return
|
93
|
+
return len
|
29
94
|
end
|
95
|
+
alias :size :length
|
30
96
|
|
31
97
|
def empty?
|
32
98
|
@storage.empty?
|
@@ -49,7 +115,7 @@ module Irc
|
|
49
115
|
return nil
|
50
116
|
end
|
51
117
|
save_idx = @last_idx
|
52
|
-
@last_idx = (@last_idx + 1) % @storage.
|
118
|
+
@last_idx = (@last_idx + 1) % @storage.size
|
53
119
|
mess = @storage[@last_idx][1].first
|
54
120
|
@last_idx = save_idx
|
55
121
|
return mess
|
@@ -60,7 +126,7 @@ module Irc
|
|
60
126
|
warning "trying to access empty ring"
|
61
127
|
return nil
|
62
128
|
end
|
63
|
-
@last_idx = (@last_idx + 1) % @storage.
|
129
|
+
@last_idx = (@last_idx + 1) % @storage.size
|
64
130
|
mess = @storage[@last_idx][1].shift
|
65
131
|
@storage.delete(@storage[@last_idx]) if @storage[@last_idx][1] == []
|
66
132
|
return mess
|
@@ -69,6 +135,7 @@ module Irc
|
|
69
135
|
end
|
70
136
|
|
71
137
|
class MessageQueue
|
138
|
+
|
72
139
|
def initialize
|
73
140
|
# a MessageQueue is an array of QueueRings
|
74
141
|
# rings have decreasing priority, so messages in ring 0
|
@@ -86,88 +153,69 @@ module Irc
|
|
86
153
|
}
|
87
154
|
# the other rings are satisfied round-robin
|
88
155
|
@last_ring = 0
|
156
|
+
self.extend(MonitorMixin)
|
157
|
+
@non_empty = self.new_cond
|
89
158
|
end
|
90
159
|
|
91
160
|
def clear
|
92
|
-
|
93
|
-
r.clear
|
94
|
-
|
95
|
-
|
161
|
+
self.synchronize do
|
162
|
+
@rings.each { |r| r.clear }
|
163
|
+
@last_ring = 0
|
164
|
+
end
|
96
165
|
end
|
97
166
|
|
98
167
|
def push(mess, chan=nil, cring=0)
|
99
168
|
ring = cring
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
169
|
+
self.synchronize do
|
170
|
+
if ring == 0
|
171
|
+
warning "message #{mess} at ring 0 has channel #{chan}: channel will be ignored" if !chan.nil?
|
172
|
+
@rings[0] << mess
|
173
|
+
else
|
174
|
+
error "message #{mess} at ring #{ring} must have a channel" if chan.nil?
|
175
|
+
@rings[ring].push mess, chan
|
176
|
+
end
|
177
|
+
@non_empty.signal
|
106
178
|
end
|
107
179
|
end
|
108
180
|
|
109
|
-
def
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
181
|
+
def shift(tmout = nil)
|
182
|
+
self.synchronize do
|
183
|
+
@non_empty.wait(tmout) if self.empty?
|
184
|
+
return unsafe_shift
|
185
|
+
end
|
114
186
|
end
|
115
187
|
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
}
|
121
|
-
len
|
188
|
+
protected
|
189
|
+
|
190
|
+
def empty?
|
191
|
+
!@rings.find { |r| !r.empty? }
|
122
192
|
end
|
123
193
|
|
124
|
-
def
|
125
|
-
|
126
|
-
warning "trying to access empty ring"
|
127
|
-
return nil
|
128
|
-
end
|
129
|
-
mess = nil
|
130
|
-
if !@rings[0].empty?
|
131
|
-
mess = @rings[0].first
|
132
|
-
else
|
133
|
-
save_ring = @last_ring
|
134
|
-
(@rings.length - 1).times {
|
135
|
-
@last_ring = (@last_ring % (@rings.length - 1)) + 1
|
136
|
-
if !@rings[@last_ring].empty?
|
137
|
-
mess = @rings[@last_ring].next
|
138
|
-
break
|
139
|
-
end
|
140
|
-
}
|
141
|
-
@last_ring = save_ring
|
142
|
-
end
|
143
|
-
error "nil message" if mess.nil?
|
144
|
-
return mess
|
194
|
+
def length
|
195
|
+
@rings.inject(0) { |s, r| s + r.size }
|
145
196
|
end
|
197
|
+
alias :size :length
|
146
198
|
|
147
|
-
def
|
148
|
-
if empty?
|
149
|
-
warning "trying to access empty ring"
|
150
|
-
return nil
|
151
|
-
end
|
152
|
-
mess = nil
|
199
|
+
def unsafe_shift
|
153
200
|
if !@rings[0].empty?
|
154
201
|
return @rings[0].shift
|
155
202
|
end
|
156
|
-
(@rings.
|
157
|
-
@last_ring = (@last_ring % (@rings.
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
162
|
-
error "nil message" if mess.nil?
|
163
|
-
return mess
|
203
|
+
(@rings.size - 1).times do
|
204
|
+
@last_ring = (@last_ring % (@rings.size - 1)) + 1
|
205
|
+
return @rings[@last_ring].shift unless @rings[@last_ring].empty?
|
206
|
+
end
|
207
|
+
warning "trying to access an empty message queue"
|
208
|
+
return nil
|
164
209
|
end
|
165
210
|
|
166
211
|
end
|
167
212
|
|
168
213
|
# wrapped TCPSocket for communication with the server.
|
169
214
|
# emulates a subset of TCPSocket functionality
|
170
|
-
class
|
215
|
+
class Socket
|
216
|
+
|
217
|
+
MAX_IRC_SEND_PENALTY = 10
|
218
|
+
|
171
219
|
# total number of lines sent to the irc server
|
172
220
|
attr_reader :lines_sent
|
173
221
|
|
@@ -183,62 +231,64 @@ module Irc
|
|
183
231
|
# accumulator for the throttle
|
184
232
|
attr_reader :throttle_bytes
|
185
233
|
|
186
|
-
# byterate components
|
187
|
-
attr_reader :bytes_per
|
188
|
-
attr_reader :seconds_per
|
189
|
-
|
190
234
|
# delay between lines sent
|
191
|
-
|
235
|
+
attr_accessor :sendq_delay
|
192
236
|
|
193
237
|
# max lines to burst
|
194
|
-
|
238
|
+
attr_accessor :sendq_burst
|
239
|
+
|
240
|
+
# an optional filter object. we call @filter.in(data) for
|
241
|
+
# all incoming data and @filter.out(data) for all outgoing data
|
242
|
+
attr_reader :filter
|
195
243
|
|
196
|
-
#
|
197
|
-
|
244
|
+
# normalized uri of the current server
|
245
|
+
attr_reader :server_uri
|
246
|
+
|
247
|
+
# default trivial filter class
|
248
|
+
class IdentityFilter
|
249
|
+
def in(x)
|
250
|
+
x
|
251
|
+
end
|
252
|
+
|
253
|
+
def out(x)
|
254
|
+
x
|
255
|
+
end
|
256
|
+
end
|
257
|
+
|
258
|
+
# set filter to identity, not to nil
|
259
|
+
def filter=(f)
|
260
|
+
@filter = f || IdentityFilter.new
|
261
|
+
end
|
262
|
+
|
263
|
+
# server_list:: list of servers to connect to
|
198
264
|
# host:: optional local host to bind to (ruby 1.7+ required)
|
199
|
-
# create a new
|
200
|
-
def initialize(
|
201
|
-
@
|
202
|
-
@
|
203
|
-
|
204
|
-
end
|
205
|
-
@server = server.dup
|
206
|
-
@port = port.to_i
|
265
|
+
# create a new Irc::Socket
|
266
|
+
def initialize(server_list, host, sendq_delay=2, sendq_burst=4, opts={})
|
267
|
+
@server_list = server_list.dup
|
268
|
+
@server_uri = nil
|
269
|
+
@conn_count = 0
|
207
270
|
@host = host
|
208
271
|
@sock = nil
|
272
|
+
@filter = IdentityFilter.new
|
209
273
|
@spooler = false
|
210
274
|
@lines_sent = 0
|
211
275
|
@lines_received = 0
|
276
|
+
if opts.kind_of?(Hash) and opts.key?(:ssl)
|
277
|
+
@ssl = opts[:ssl]
|
278
|
+
else
|
279
|
+
@ssl = false
|
280
|
+
end
|
281
|
+
|
212
282
|
if sendq_delay
|
213
283
|
@sendq_delay = sendq_delay.to_f
|
214
284
|
else
|
215
285
|
@sendq_delay = 2
|
216
286
|
end
|
217
|
-
@last_send = Time.new - @sendq_delay
|
218
|
-
@last_throttle = Time.new
|
219
|
-
@burst = 0
|
220
287
|
if sendq_burst
|
221
288
|
@sendq_burst = sendq_burst.to_i
|
222
289
|
else
|
223
290
|
@sendq_burst = 4
|
224
291
|
end
|
225
|
-
@bytes_per = 400
|
226
|
-
@seconds_per = 2
|
227
|
-
@throttle_bytes = 0
|
228
|
-
@throttle_div = 1
|
229
|
-
setbyterate(brt)
|
230
|
-
end
|
231
|
-
|
232
|
-
def setbyterate(brt)
|
233
|
-
if brt.match(/(\d+)\/(\d)/)
|
234
|
-
@bytes_per = $1.to_i
|
235
|
-
@seconds_per = $2.to_i
|
236
|
-
debug "Byterate now #{byterate}"
|
237
|
-
return true
|
238
|
-
else
|
239
|
-
debug "Couldn't set byterate #{brt}"
|
240
|
-
return false
|
241
|
-
end
|
242
292
|
end
|
243
293
|
|
244
294
|
def connected?
|
@@ -251,71 +301,42 @@ module Irc
|
|
251
301
|
warning "reconnecting while connected"
|
252
302
|
return
|
253
303
|
end
|
304
|
+
srv_uri = @server_list[@conn_count % @server_list.size].dup
|
305
|
+
srv_uri = 'irc://' + srv_uri if !(srv_uri =~ /:\/\//)
|
306
|
+
@conn_count += 1
|
307
|
+
@server_uri = URI.parse(srv_uri)
|
308
|
+
@server_uri.port = 6667 if !@server_uri.port
|
309
|
+
debug "connection attempt \##{@conn_count} (#{@server_uri.host}:#{@server_uri.port})"
|
310
|
+
|
254
311
|
if(@host)
|
255
312
|
begin
|
256
|
-
|
313
|
+
sock=TCPSocket.new(@server_uri.host, @server_uri.port, @host)
|
257
314
|
rescue ArgumentError => e
|
258
315
|
error "Your version of ruby does not support binding to a "
|
259
316
|
error "specific local address, please upgrade if you wish "
|
260
317
|
error "to use HOST = foo"
|
261
318
|
error "(this option has been disabled in order to continue)"
|
262
|
-
|
319
|
+
sock=TCPSocket.new(@server_uri.host, @server_uri.port)
|
263
320
|
end
|
264
321
|
else
|
265
|
-
|
266
|
-
end
|
267
|
-
@qthread = false
|
268
|
-
@qmutex = Mutex.new
|
269
|
-
@sendq = MessageQueue.new
|
270
|
-
end
|
271
|
-
|
272
|
-
def sendq_delay=(newfreq)
|
273
|
-
debug "changing sendq frequency to #{newfreq}"
|
274
|
-
@qmutex.synchronize do
|
275
|
-
@sendq_delay = newfreq
|
276
|
-
if newfreq == 0
|
277
|
-
clearq
|
278
|
-
@timer.stop
|
279
|
-
else
|
280
|
-
@timer.start
|
281
|
-
end
|
322
|
+
sock=TCPSocket.new(@server_uri.host, @server_uri.port)
|
282
323
|
end
|
283
|
-
|
284
|
-
|
285
|
-
|
286
|
-
|
287
|
-
|
324
|
+
if(@ssl)
|
325
|
+
require 'openssl'
|
326
|
+
ssl_context = OpenSSL::SSL::SSLContext.new()
|
327
|
+
ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
|
328
|
+
sock = OpenSSL::SSL::SSLSocket.new(sock, ssl_context)
|
329
|
+
sock.sync_close = true
|
330
|
+
sock.connect
|
288
331
|
end
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
294
|
-
|
295
|
-
|
296
|
-
@
|
297
|
-
setbyterate(newrate)
|
298
|
-
end
|
299
|
-
end
|
300
|
-
|
301
|
-
def run_throttle(more=0)
|
302
|
-
now = Time.new
|
303
|
-
if @throttle_bytes > 0
|
304
|
-
# If we ever reach the limit, we halve the actual allowed byterate
|
305
|
-
# until we manage to reset the throttle.
|
306
|
-
if @throttle_bytes >= @bytes_per
|
307
|
-
@throttle_div = 0.5
|
308
|
-
end
|
309
|
-
delta = ((now - @last_throttle)*@throttle_div*@bytes_per/@seconds_per).floor
|
310
|
-
if delta > 0
|
311
|
-
@throttle_bytes -= delta
|
312
|
-
@throttle_bytes = 0 if @throttle_bytes < 0
|
313
|
-
@last_throttle = now
|
314
|
-
end
|
315
|
-
else
|
316
|
-
@throttle_div = 1
|
317
|
-
end
|
318
|
-
@throttle_bytes += more
|
332
|
+
@sock = sock
|
333
|
+
@last_send = Time.new - @sendq_delay
|
334
|
+
@flood_send = Time.new
|
335
|
+
@last_throttle = Time.new
|
336
|
+
@burst = 0
|
337
|
+
@sock.extend(MonitorMixin)
|
338
|
+
@sendq = MessageQueue.new
|
339
|
+
@qthread = Thread.new { writer_loop }
|
319
340
|
end
|
320
341
|
|
321
342
|
# used to send lines to the remote IRCd by skipping the queue
|
@@ -323,13 +344,21 @@ module Irc
|
|
323
344
|
# it should only be used for stuff that *must not* be queued,
|
324
345
|
# i.e. the initial PASS, NICK and USER command
|
325
346
|
# or the final QUIT message
|
326
|
-
def emergency_puts(message)
|
327
|
-
@
|
328
|
-
# debug "In puts - got
|
329
|
-
puts_critical(message)
|
347
|
+
def emergency_puts(message, penalty = false)
|
348
|
+
@sock.synchronize do
|
349
|
+
# debug "In puts - got @sock"
|
350
|
+
puts_critical(message, penalty)
|
330
351
|
end
|
331
352
|
end
|
332
353
|
|
354
|
+
def handle_socket_error(string, e)
|
355
|
+
error "#{string} failed: #{e.pretty_inspect}"
|
356
|
+
# We assume that an error means that there are connection
|
357
|
+
# problems and that we should reconnect, so we
|
358
|
+
shutdown
|
359
|
+
raise SocketError.new(e.inspect)
|
360
|
+
end
|
361
|
+
|
333
362
|
# get the next line from the server (blocks)
|
334
363
|
def gets
|
335
364
|
if @sock.nil?
|
@@ -337,85 +366,22 @@ module Irc
|
|
337
366
|
return nil
|
338
367
|
end
|
339
368
|
begin
|
340
|
-
reply = @sock.gets
|
369
|
+
reply = @filter.in(@sock.gets)
|
341
370
|
@lines_received += 1
|
342
371
|
reply.strip! if reply
|
343
372
|
debug "RECV: #{reply.inspect}"
|
344
373
|
return reply
|
345
|
-
rescue => e
|
346
|
-
|
347
|
-
debug e.backtrace.join("\n")
|
348
|
-
return nil
|
374
|
+
rescue Exception => e
|
375
|
+
handle_socket_error(:RECV, e)
|
349
376
|
end
|
350
377
|
end
|
351
378
|
|
352
379
|
def queue(msg, chan=nil, ring=0)
|
353
|
-
|
354
|
-
@qmutex.synchronize do
|
355
|
-
@sendq.push msg, chan, ring
|
356
|
-
@timer.start
|
357
|
-
end
|
358
|
-
else
|
359
|
-
# just send it if queueing is disabled
|
360
|
-
self.emergency_puts(msg)
|
361
|
-
end
|
380
|
+
@sendq.push msg, chan, ring
|
362
381
|
end
|
363
382
|
|
364
|
-
# pop a message off the queue, send it
|
365
|
-
def spool
|
366
|
-
@qmutex.synchronize do
|
367
|
-
begin
|
368
|
-
debug "in spooler"
|
369
|
-
if @sendq.empty?
|
370
|
-
@timer.stop
|
371
|
-
return
|
372
|
-
end
|
373
|
-
now = Time.new
|
374
|
-
if (now >= (@last_send + @sendq_delay))
|
375
|
-
# reset burst counter after @sendq_delay has passed
|
376
|
-
debug "resetting @burst"
|
377
|
-
@burst = 0
|
378
|
-
elsif (@burst >= @sendq_burst)
|
379
|
-
# nope. can't send anything, come back to us next tick...
|
380
|
-
debug "can't send yet"
|
381
|
-
@timer.start
|
382
|
-
return
|
383
|
-
end
|
384
|
-
debug "can send #{@sendq_burst - @burst} lines, there are #{@sendq.length} to send"
|
385
|
-
(@sendq_burst - @burst).times do
|
386
|
-
break if @sendq.empty?
|
387
|
-
mess = @sendq.next
|
388
|
-
if @throttle_bytes == 0 or mess.length+@throttle_bytes < @bytes_per
|
389
|
-
debug "flood protection: sending message of length #{mess.length}"
|
390
|
-
debug "(byterate: #{byterate}, throttle bytes: #{@throttle_bytes})"
|
391
|
-
puts_critical(@sendq.shift)
|
392
|
-
else
|
393
|
-
debug "flood protection: throttling message of length #{mess.length}"
|
394
|
-
debug "(byterate: #{byterate}, throttle bytes: #{@throttle_bytes})"
|
395
|
-
run_throttle
|
396
|
-
break
|
397
|
-
end
|
398
|
-
end
|
399
|
-
if @sendq.empty?
|
400
|
-
@timer.stop
|
401
|
-
end
|
402
|
-
rescue => e
|
403
|
-
error "Spooling failed: #{e.inspect}"
|
404
|
-
error e.backtrace.join("\n")
|
405
|
-
end
|
406
|
-
end
|
407
|
-
end
|
408
|
-
|
409
383
|
def clearq
|
410
|
-
|
411
|
-
@qmutex.synchronize do
|
412
|
-
unless @sendq.empty?
|
413
|
-
@sendq.clear
|
414
|
-
end
|
415
|
-
end
|
416
|
-
else
|
417
|
-
warning "Clearing socket while disconnected"
|
418
|
-
end
|
384
|
+
@sendq.clear
|
419
385
|
end
|
420
386
|
|
421
387
|
# flush the TCPSocket
|
@@ -430,29 +396,77 @@ module Irc
|
|
430
396
|
|
431
397
|
# shutdown the connection to the server
|
432
398
|
def shutdown(how=2)
|
433
|
-
|
399
|
+
return unless connected?
|
400
|
+
@qthread.kill
|
401
|
+
@qthread = nil
|
402
|
+
begin
|
403
|
+
@sock.close
|
404
|
+
rescue Exception => e
|
405
|
+
error "error while shutting down: #{e.pretty_inspect}"
|
406
|
+
end
|
434
407
|
@sock = nil
|
435
408
|
@burst = 0
|
409
|
+
@sendq.clear
|
436
410
|
end
|
437
411
|
|
438
412
|
private
|
439
413
|
|
440
|
-
|
441
|
-
|
414
|
+
def writer_loop
|
415
|
+
loop do
|
416
|
+
# we could wait for the message, then calculate the delay and sleep
|
417
|
+
# if necessary. however, if high-priority message is enqueued while
|
418
|
+
# we sleep, it won't be the first to go out when the sleep is over.
|
419
|
+
# thus, we have to call Time.now() twice, once to calculate the delay
|
420
|
+
# and once to adjust @burst / @flood_send.
|
421
|
+
begin
|
422
|
+
now = Time.now
|
423
|
+
if @sendq_delay > 0
|
424
|
+
burst_delay = 0
|
425
|
+
if @burst > @sendq_burst
|
426
|
+
burst_delay = @last_send + @sendq_delay - now
|
427
|
+
end
|
428
|
+
|
429
|
+
flood_delay = @flood_send - MAX_IRC_SEND_PENALTY - now
|
430
|
+
delay = [burst_delay, flood_delay, 0].max
|
431
|
+
if delay > 0
|
432
|
+
debug "sleep(#{delay}) # (f: #{flood_delay}, b: #{burst_delay})"
|
433
|
+
sleep(delay)
|
434
|
+
end
|
435
|
+
end
|
436
|
+
msg = @sendq.shift
|
437
|
+
now = Time.now
|
438
|
+
@flood_send = now if @flood_send < now
|
439
|
+
@burst = 0 if @last_send + @sendq_delay < now
|
440
|
+
debug "got #{msg.inspect} from queue, sending"
|
441
|
+
emergency_puts(msg, true)
|
442
|
+
rescue Exception => e
|
443
|
+
error "Spooling failed: #{e.pretty_inspect}"
|
444
|
+
debug e.backtrace.join("\n")
|
445
|
+
raise e
|
446
|
+
end
|
447
|
+
end
|
448
|
+
end
|
449
|
+
|
450
|
+
# same as puts, but expects to be called with a lock held on @sock
|
451
|
+
def puts_critical(message, penalty=false)
|
442
452
|
# debug "in puts_critical"
|
443
453
|
begin
|
444
454
|
debug "SEND: #{message.inspect}"
|
445
455
|
if @sock.nil?
|
446
456
|
error "SEND attempted on closed socket"
|
447
457
|
else
|
448
|
-
|
458
|
+
# we use Socket#syswrite() instead of Socket#puts() because
|
459
|
+
# the latter is racy and can cause double message output in
|
460
|
+
# some circumstances
|
461
|
+
actual = @filter.out(message) + "\n"
|
462
|
+
@sock.syswrite actual
|
449
463
|
@last_send = Time.new
|
464
|
+
@flood_send += message.irc_send_penalty if penalty
|
450
465
|
@lines_sent += 1
|
451
466
|
@burst += 1
|
452
|
-
run_throttle(message.length + 1)
|
453
467
|
end
|
454
|
-
rescue => e
|
455
|
-
|
468
|
+
rescue Exception => e
|
469
|
+
handle_socket_error(:SEND, e)
|
456
470
|
end
|
457
471
|
end
|
458
472
|
|