ruboty-monday_is_coming 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aae4404a4145a4544690f72f938dc77176d1824b
-  data.tar.gz: 12e55a05f8fbd9225dc638ecdc0173b1bb1e6d49
+  metadata.gz: 4d6b4bd2b6213d0c009261d5a7e124b66b61711b
+  data.tar.gz: e6b3812a63d2aed96bfaf3c6ad640c2d33943eb8
 SHA512:
-  metadata.gz: a3eb5b6ce6084fd6bc68e1bb758d826fea59f2a1edb42ad33d433114aa83b22d9dd7d1c31f44de671e47f0cf0b28d3c121ec3099a3dfd2ae2c5947f208d6d902
-  data.tar.gz: fbb73d44f3dd9579b0b64589b311c992df387610e4aa1766b0fa71faf2f102ae5e878d73813569b68cd697a4fca89e96d7b5a4f710633010261be1c6bce970c3
+  metadata.gz: f316f15c4258432c7b481dffc394c28e7c2339b36a40f5408ef555f175266aa0d3df810afc57ab69056c404c18a31e693e9057d5483343cc164f56ad5b2c8cae
+  data.tar.gz: 89098270a20d488e6a66e2ba1ab5753ea7cc37c1b24d779abec59014e30c8ec360d768944b26661214ac1f689f30f5d12ef8be663f9f944e75341d7bcdeff50f

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2015 Shota Fukumori (sora_h)
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/ruboty-monday_is_coming/pixiv_client.rb

@@ -0,0 +1,115 @@
+require 'json'
+require 'net/http'
+require 'net/https'
+require 'open-uri'
+
+module Ruboty
+  module MondayIsComing
+    class PixivClient
+      USER_AGENT = "ruboty-monday_is_coming"
+      ACCESS_TOKEN_RETRIEVE_INTERVAL = 3000
+
+      CLIENT_ID = "bYGKuGVw91e0NMfPGp44euvGt59s"
+      CLIENT_SECRET = "HP3RmkgAmEGro0gn1x9ioawQE8WMfvLXDz3ZqxpK"
+
+      OAUTH_TOKEN_URL = URI.parse("https://oauth.secure.pixiv.net/auth/token").freeze
+
+      def initialize(login, password)
+        @login, @password = login, password
+        @access_token = nil
+        @access_token_issued_at = nil
+
+        @lock = Mutex.new
+      end
+
+      def work(id, image_sizes: %w(large), include_stats: true)
+        params = {
+          "image_sizes" => image_sizes.join(?,),
+          "include_stats" => (!!include_stats).inspect,
+        }
+
+        url = URI.parse("https://public-api.secure.pixiv.net/v1/works/#{id.to_i}.json")
+        url.query = URI.encode_www_form(params)
+
+        request_get(url)
+      end
+
+      def tag(tag, **kwargs)
+        works q: tag, mode: :exact_tag, **kwargs
+      end
+
+      def works(q:, mode: , per_page: 30, page: 1, order: :desc, sort: :date, period: :all, include_sanity_level: true, include_stats: true, image_sizes: %w(px_480mw large), profile_image_sizes: %w(px_170x170))
+        params = {
+          q: q.to_s,
+          mode: mode.to_s,
+          per_page: per_page.to_s,
+          page: page.to_s,
+          order: order.to_s,
+          sort: sort.to_s,
+          period: period.to_s,
+          include_sanity_level: (!!include_sanity_level).inspect,
+          include_stats: (!!include_stats).inspect,
+          image_sizes: image_sizes.join(?,),
+          profile_image_sizes: profile_image_sizes.join(?,),
+        }
+
+        url = URI.parse("https://public-api.secure.pixiv.net/v1/search/works.json")
+        url.query = URI.encode_www_form(params)
+
+        request_get(url)
+      end
+
+      def access_token
+        if !@access_token || (Time.now - @access_token_issued_at) > ACCESS_TOKEN_RETRIEVE_INTERVAL
+          issued_at = @access_token_issued_at
+          @lock.synchronize do
+            if !@access_token || issued_at < @access_token_issued_at
+              @access_token = get_access_token
+              @access_token_issued_at = Time.now
+            end
+          end
+        end
+
+        @access_token
+      end
+
+      private
+
+      def request_get(url, headers = headers())
+        Net::HTTP.start(url.host, url.port, :use_ssl => true) do |http|
+          resp = http.request_get(url.request_uri, headers).tap(&:value)
+          JSON.parse(resp.body)
+        end
+      end
+
+      def headers
+        {
+          "Referer" => "http://spapi.pixiv-app.net",
+          "User-Agent" => USER_AGENT,
+          "Content-Type" => "application/x-www-form-urlencoded",
+          "Authorization" => "Bearer #{access_token}"
+        }
+      end
+
+      def get_access_token
+        headers = {
+          "Referer" => "http://www.pixiv.net",
+        }
+        params = {
+          "username" => @login,
+          "password" => @password,
+          "grant_type" => "password",
+          "client_id" => CLIENT_ID,
+          "client_secret" => CLIENT_SECRET,
+        }
+
+        Net::HTTP.start(OAUTH_TOKEN_URL.host, OAUTH_TOKEN_URL.port, use_ssl: true) do |http|
+          resp = http.request_post(OAUTH_TOKEN_URL.request_uri, URI.encode_www_form(params), headers).tap(&:value)
+          json = JSON.parse(resp.body)
+          json["response"]["access_token"]
+        end
+      end
+    end 
+  end
+end
+

data/lib/ruboty-monday_is_coming/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module MondayIsComing
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/ruboty/handlers/monday_is_coming.rb

@@ -1,13 +1,14 @@
 # coding: utf-8
 require 'ruboty/handlers/base'
-require 'open-uri'
-require 'uri'
-require 'csv'
+require 'ruboty-monday_is_coming/pixiv_client'
 require 'time'
 
 module Ruboty
   module Handlers
     class MondayIsComing < Base
+      env 'PIXIV_LOGIN', 'pixiv user id, or email', optional: false
+      env 'PIXIV_PASSWORD', 'pixiv password', optional: false
+
       on(/月曜日?(?:よりの使者)?/, name: 'show', description: '日高愛ちゃん')
       on(/monday(?:\s+is\s+coming)?/, name: 'show', description: '日高愛ちゃん')
 
@@ -16,6 +17,7 @@ module Ruboty
         super
         @illusts_cache = nil
         @illusts_cached_at = 0
+        @pixiv = Ruboty::MondayIsComing::PixivClient.new(ENV['PIXIV_LOGIN'], ENV['PIXIV_PASSWORD'])
       end
 
       def show(message)
@@ -30,11 +32,11 @@ module Ruboty
         time = Time.now
         illust = if time.monday?
           beg = Time.local(time.year, time.month, time.day, 0, 0, 0, '+09:00')
-          illusts.select { |_| _[:uploaded_at] >= beg }.min || illusts.sample
+          illusts.select { |_| t = Time.parse("#{_['created_time']} +09:00") rescue nil; next unless t; t >= beg }.min || illusts.sample
         else
           illusts.sample
         end
-        illust[:mobile_thumbnail_max_width_480]
+        illust['image_urls']['px_480mw']
       end
 
       def illusts
@@ -46,41 +48,9 @@ module Ruboty
       end
 
       PIXIV_TARGET_TAG = "月曜日よりの使者"
-      PIXIV_TARGET_AUTHOR_ID = "2493100"
+      PIXIV_TARGET_AUTHOR_ID = 2493100
       def illusts_without_cache
-        pixiv_search_tag(PIXIV_TARGET_TAG).select { |_| _[:user_id] == PIXIV_TARGET_AUTHOR_ID }
-      end
-
-      PIXIV_SPAPI_SEARCH_TAG_URL = 'http://spapi.pixiv.net/iphone/search.php?s_mode=s_tag&word=%s'
-      def pixiv_search_tag(tag)
-        result = open(PIXIV_SPAPI_SEARCH_TAG_URL % [URI.encode_www_form_component(tag)], 'r', &:read)
-        lines = CSV.parse(result)
-        lines.map do |line|
-          {
-            id: line[0],
-            user_id: line[1],
-            extension: line[2],
-            image_title: line[3],
-            image_directory: line[4],
-            artist_nickname: line[5],
-            mobile_thumbnail_128_url: line[6],
-            mobile_thumbnail_max_width_480: line[9],
-            uploaded_at: Time.parse(line[12] + ' +09:00'),
-            tags: line[13],
-            software: line[14],
-            ratings_count: line[15],
-            score: line[16],
-            views: line[17],
-            image_description: line[18],
-            pages_count: line[19],
-            favorites_count: line[22],
-            comments_count: line[23],
-            artist_username: line[24],
-            r18: line[26],
-            series_id: line[27],
-            mobile_profile_image: line[29],
-          }
-        end
+        @pixiv.tag(PIXIV_TARGET_TAG, image_sizes: %w(px_480mw))['response'].select { |_| _['user']['id'] == PIXIV_TARGET_AUTHOR_ID }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-monday_is_coming
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Shota Fukumori (sora_h)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-26 00:00:00.000000000 Z
+date: 2015-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,8 +61,10 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
+- lib/ruboty-monday_is_coming/pixiv_client.rb
 - lib/ruboty-monday_is_coming/version.rb
 - lib/ruboty/handlers/monday_is_coming.rb
 - lib/ruboty/monday_is_coming.rb
@@ -88,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ruboty monday is coming