nadoka 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fb5d2901149e7c9b3ceb6e96b8b3aa4f4a1c4b68
-  data.tar.gz: 42ad6c145f67aadd8b4369187a0d9df83dc87c26
+SHA256:
+  metadata.gz: 499bbabcf8dd4f2b5c8850550daee031996821c3106f63795972f843b22fc45b
+  data.tar.gz: 1b151a20ec41485b4a0e368d62746591be4710c82b089e82314b9a969f499d3a
 SHA512:
-  metadata.gz: 550f7ed0ab720cb1778a05bf15b18f6046ae1a099e5b6c0aa22edb3356e9d121635e57d8bb908112a57c10282fa5fb62c4ac9fece4ee75c61afb41bb6d18f607
-  data.tar.gz: b298ae869b4d92cf748efb16774a7bc08d506d1f2650ff08a033a39bb7f000bd0ee90edb2c3d692ffa9168ec034e458f43fba15fe5b0aec20f9542df47698d94
+  metadata.gz: 2cc2ed86d0496fdc7bbad02524df8c50efb784e559d15b3590c3dbdb8f1125f74738a5ccb574e682efd211e47b979a111e1dea3b7a341b58e8bef6715de99ed5
+  data.tar.gz: 71b721ff820b48fbdc39601e578cdbc795088fa6df223027a4c6e801d1eb8089de6dbb3024d3c6c2f467c5922afe0d796485b8fb50b1eb3eba58cf75ddd1763b

data/.travis.yml

@@ -21,6 +21,8 @@ matrix:
     - rvm: ruby-head
     - rvm: jruby-head
     - rvm: ree
+before_install:
+  - gem update bundler
 script: ruby check-syntax.rb
 notifications:
   irc: "irc.freenode.org#nadoka_jp"

data/lib/rss_check.rb

@@ -79,7 +79,7 @@ class RSS_Check
 
     def read_content
       case @uri.scheme
-      when 'http'
+      when 'http', 'https'
         open(@uri){|f|
           if f.content_encoding.any?{|e| /gzip/ =~ e}
             Zlib::GzipReader.new(StringIO.new(f.read)).read || ''
@@ -96,7 +96,7 @@ class RSS_Check
 
     def mtime
       case @uri.scheme
-      when 'http'
+      when 'http', 'https'
         open(@uri){|f|
           f.last_modified || Time.now
         }
@@ -204,13 +204,11 @@ if $0 == __FILE__
     ARGV.shift || './rss_cache',
     false # false
   )
-  require 'iconv'
   require 'kconv'
-  ic = Iconv.open("EUC-JP", "UTF-8")
   
   rssc.check.each{|e|
     puts e[:about]
-    title = (e[:ccode] == 'UTF-8') ? ic.iconv(e[:title]) : e[:title]
+    title = (e[:ccode] == 'UTF-8') ? e[:title].toeuc : e[:title]
     puts title
   }
   rssc.dump

data/nadokarc

@@ -7,7 +7,7 @@
 #
 # This program is free software with ABSOLUTELY NO WARRANTY.
 # You can re-distribute and/or modify this program under
-# the same terms of the Ruby's lisence.
+# the same terms of the Ruby's license.
 #
 #
 
@@ -80,7 +80,7 @@ class NADOKA_Config < Nadoka::NDK_ConfigBase
     #   :port => 6667,
     # },
     # {
-    #   :host => 'irc6.livedoor.ne.jp',
+    #   :host => 'dh6.ircnet.ne.jp',
     #   :port => (6660 .. 6669),
     # },
   ]

data/ndk/config.rb

@@ -387,7 +387,7 @@ module Nadoka
       @config = {}
       klass = ConfigClass.last
 
-      klass.ancestors[0..-3].reverse_each{|kl|
+      klass.ancestors[0..klass.ancestors.index(NDK_ConfigBase)].reverse_each{|kl|
         kl.constants.each{|e|
           @config[e.downcase.intern] = klass.const_get(e)
         }

data/ndk/server.rb

@@ -180,6 +180,10 @@ module Nadoka
           @server_thread.raise NDK_ReconnectToServer
         when '020'
           # ignore
+        when 'PRIVMSG'
+          # ignore
+        when '004'
+          # ignore
         else
           msg = "Server login fail!(#{q})"
           @logger.slog msg

data/ndk/version.rb

@@ -11,7 +11,7 @@
 #
 
 module Nadoka
-  VERSION  = '0.9.1'
+  VERSION  = '0.9.2'
   NDK_Version  = VERSION.dup
   NDK_Created  = Time.now
 

data/plugins/autoop.nb

@@ -29,7 +29,7 @@ BotConfig = [
 
 This program is free software with ABSOLUTELY NO WARRANTY.
 You can re-distribute and/or modify this program under
-the same terms of the Ruby's lisence.
+the same terms of the Ruby's license.
 
 == Author
 

data/plugins/googlebot.nb

@@ -41,9 +41,10 @@ BotConfig = [
     #"User-Agent" => "Ruby/#{RUBY_VERSION}",
     'Referer' => 'https://github.com/nadoka/nadoka',
   },
-  # Register URL at http://code.google.com/intl/ja/apis/ajaxsearch/signup.html
-  # and set your URL to :referer and your API key to :api_key if you want.
-  :api_key             => nil,
+  # API key
+  :api_key             => 'INSERT_YOUR_API_KEY',
+  # Custom search engine ID
+  :cx                  => '017576662512468239146:omuauf_lfve',
   :googlec_maxwords    => 5,
   :search_default_lang => 'ja',
   :count_default_lang  => '',
@@ -94,6 +95,7 @@ class GoogleBot < Nadoka::NDK_Bot
     @count_default_lang  = (@bot_config[:count_default_lang] || '').sub(/^lang_/, '')
     @headers = @bot_config.fetch(:headers, {})
     @api_key = @bot_config[:api_key]
+    @cx = @bot_config[:cx]
     @uri_slog = @bot_config.fetch(:uri_slog, false)
     @ch_kcode = @bot_config.fetch(:ch_kcode, :tojis)
   end
@@ -121,6 +123,8 @@ class GoogleBot < Nadoka::NDK_Bot
   def dispatch_command msg
     begin
       case msg
+      when /^g>\s*(.+)/
+        custom_search $1
       when /^goo(o*)gle( #{SEARCHER_RE})?(:.*?)?>\s*(.+)/o, /^gu(u*)guru(#{SEARCHER_RE})?(:.+)?>\s*(.+)/o
         "goo#{$1}gle#{$2} bot#{$3}: #{search($1.length, $3, $4, $2)}"
       when /^googlec( #{SEARCHER_RE})?(:.*?)?>\s*(.+)/o
@@ -135,6 +139,33 @@ class GoogleBot < Nadoka::NDK_Bot
     end
   end
 
+  def custom_search word
+    uri = "https://www.googleapis.com/customsearch/v1"
+    uri << "?key=#{@api_key}&cx=#{@cx}&q="
+    uri << CGI.escape(word)
+    @logger.slog "GoogleBot: #{uri}" if @uri_slog
+    result = open(uri, @headers) do |f|
+      JSON.parse(f.read)
+    end
+    @logger.slog "GoogleBot: #{result}" if @uri_slog
+    count = result["searchInformation"]["totalResults"].to_i
+    if count == 0
+      return "no match"
+    end
+    count = count.to_s.gsub(/(\d)(?=\d{3}+$)/, '\\1,')
+    item, = result["items"]
+    title = item["title"]
+    url = item["link"]
+    "#{title} - #{url} (and #{count} hit#{(count.to_i > 1) ? 's' : ''})".delete("\r\n")
+  rescue OpenURI::HTTPError => e
+    @logger.slog "GoogleBot: #{e.inspect}" if @uri_slog
+    result = JSON.parse(e.io.read)
+    if @uri_slog
+      @logger.slog "GoogleBot: #{result.inspect}"
+    end
+    result["error"]["errors"][0]["reason"].delete("\r\n")
+  end
+
   def do_search word, cnt, lang, searcher='web'
     i = 0
     begin
@@ -173,6 +204,11 @@ class GoogleBot < Nadoka::NDK_Bot
   def api_search word, cnt, lang, searcher
     result = do_search word, cnt, lang, searcher
 
+    if result["responseData"].nil?
+      # {"responseData": null, "responseDetails": "qps rate exceeded", "responseStatus": 503}
+      return "error #{result['responseStatus']}: #{result['responseDetails']}"
+    end
+
     count = result.estimatedTotalResultsCount.to_i
 
     if count > 0
@@ -300,7 +336,7 @@ class GoogleBot < Nadoka::NDK_Bot
     else
       api_search word, cnt, lang, searcher
     end
- end
+  end
 
   def googlec lang, word, searcher=nil
     lang = lang_check(lang, @count_default_lang)

data/plugins/rss_checkbot.nb

@@ -29,7 +29,6 @@ BotConfig = [
 =end
 
 require 'lib/rss_check'
-require 'iconv'
 require 'kconv'
 
 class RSS_CheckBot < Nadoka::NDK_Bot
@@ -40,7 +39,6 @@ class RSS_CheckBot < Nadoka::NDK_Bot
     @tm    = @bot_config.fetch(:tm,30)              # min
     @over  = @bot_config.fetch(:over_message, nil)
     @rssc  = RSS_Check.new(@paths, @cache, true)
-    @ic    = Iconv.open("EUC-JP", "UTF-8")
     @prevtm= Time.now
   end
 
@@ -99,7 +97,7 @@ class RSS_CheckBot < Nadoka::NDK_Bot
             begin
               # convert from U+FF5E FULLWIDTH TILDE to U+301C WAVE DASH
               title = e[:title].gsub(/\357\275\236/u, "\343\200\234")
-              title = @ic.iconv(title)
+              title = title.toeuc
             rescue Exception
               # maybe, char code translation error
               next

data/plugins/titlebot.nb

@@ -59,14 +59,28 @@ end
 module URL2Title
   module_function
 
+  BLACKLIST_HOST = [
+    /\blocalhost\b/,
+    /\A127\./,
+    /\A192\.168\./,
+    /\A10\./,
+    /\A169\.254\./,
+  ]
+
   def get_title(url, headers)
     uri = URI(url)
     info = { :uri => uri }
     info[:errors] = []
     case uri.host
-    when /localhost/, /\A127\./, /\A192\.168\./, /\A10\./
+    when *BLACKLIST_HOST
       info[:title] = "(ignored)"
       return info
+    when /\A(?:www\.nicovideo\.jp)\z/
+      if /\A\/watch\/(sm\d+)\z/ =~ uri.path
+        uri = URI("http://d.hatena.ne.jp/video/niconico/#{$1}")
+      end
+    when /\A(?:mobile\.twitter\.com)\z/
+      uri = URI(url.sub(/mobile\.twitter\.com/, 'twitter.com'))
     end
     headers = {
       :content_length_proc => proc{|x| raise Errno::EFBIG if x && x > 1048576},
@@ -104,7 +118,7 @@ module URL2Title
           charset = $1
         end
         case charset
-        when /shift_jis/i
+        when /shift[_-]jis/i
           charset = "cp932"
         when /euc-jp/i # euc-jp, x-euc-jp
           charset = "eucjp-ms"
@@ -151,6 +165,10 @@ module URL2Title
           end
         when /\A(?:github\.com)\z/
           # ignore og:title
+        when /\A(?:www\.youtube\.com)\z/
+          if %r'"title":"(.+?)"' =~ body
+            title = $1
+          end
         else
           if defined?(::Nokogiri)
             doc ||= Nokogiri::HTML(body, uri.to_s, 'utf-8')
@@ -255,7 +273,7 @@ end
 if __FILE__ == $0
   require File.expand_path('../../ndk/version', __FILE__)
   def u2t(url)
-    firefox = "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:25.0) Gecko/20100101 Firefox/25.0"
+    firefox = "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0"
     ua = "NadokaTitleBot/#{Nadoka::VERSION}"
     headers = {
       "User-Agent" => "#{firefox} Ruby/#{RUBY_VERSION} #{ua}",
@@ -264,6 +282,7 @@ if __FILE__ == $0
   rescue
     $!.inspect
   end
+  URL2Title::BLACKLIST_HOST << /\.test\z/
   if ARGV.empty?
     # TODO: test
   else

data/rice/irc.rb

@@ -58,8 +58,8 @@ module RICE
 
       @read_q  = Queue.new
 
-      @read_th  = Thread.new(@read_q, @eol) do |read_q, eol|
-        read_thread(read_q, eol)
+      @read_th  = Thread.new(@read_q, @eol) do |read_q, eol_|
+        read_thread(read_q, eol_)
       end
 
       @threads = {}
@@ -86,7 +86,7 @@ module RICE
       @delay = 0.3
       @prev_send_time = Time.now
     end
-    attr :delay, true
+    attr_accessor :delay
     attr_reader :server, :port, :ssl_params
     
 =begin
@@ -217,6 +217,7 @@ module RICE
           context.set_params(ssl_params)
           conn = OpenSSL::SSL::SSLSocket.new(conn, context)
           conn.sync_close = true
+          conn.hostname = @server if conn.respond_to? :hostname=
           conn.connect
           if context.verify_mode != OpenSSL::SSL::VERIFY_NONE
             conn.post_connection_check(@server)
@@ -246,8 +247,8 @@ module RICE
     USER_THREAD = Struct.new('User_Thread', :q, :raise_on_close)
     def regist(raise_on_close = false, *args)
       read_q = Queue.new
-      th = Thread.new(read_q, self, *args) do |read_q, conn, *args|
-        yield(read_q, conn, *args)
+      th = Thread.new(read_q, self, *args) do |read_q_, conn, *args_|
+        yield(read_q_, conn, *args_)
       end
       @threads.synchronize do
         @threads[th] = USER_THREAD.new(read_q, raise_on_close)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nadoka
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Kazuhiro NISHIYAMA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-29 00:00:00.000000000 Z
+date: 2018-09-29 00:00:00.000000000 Z
 dependencies: []
 description: Nadoka is a tool for monitoring and logging IRC conversations and responding
   to specially formatted requests. You define and customize these responses in Ruby.
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: IRC logger, monitor and proxy program ("bot")