jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pixiv: possible fix for #4152.

Browse Source
This commit is contained in:
evazion
2019-09-02 13:11:21 -05:00
parent f040233a50
commit 64eb6dbb2a
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/logical/pixiv_api_client.rb
View File

@@ -29,11 +29,7 @@ class PixivApiClient
attr_reader :json, :pages, :name, :moniker, :user_id, :page_count, :tags attr_reader :json, :pages, :name, :moniker, :user_id, :page_count, :tags
attr_reader :artist_commentary_title, :artist_commentary_desc attr_reader :artist_commentary_title, :artist_commentary_desc
def initialize(url) def initialize(json)
@tags = []
@pages = [url]
return
@json = json @json = json
@name = json["user"]["name"] @name = json["user"]["name"]
@user_id = json["user"]["id"] @user_id = json["user"]["id"]
@@ -224,15 +220,22 @@ class PixivApiClient
def access_token def access_token
Cache.get("pixiv-papi-access-token", 3000) do Cache.get("pixiv-papi-access-token", 3000) do
access_token = nil access_token = nil
# Client time and hash are sniffed from the Pixiv Android app. They must
# be correct or the request will fail with code=1508.
headers = { headers = {
"Referer" => "http://www.pixiv.net" "Referer" => "http://www.pixiv.net",
"X-Client-Time": "2019-07-15T12:10:34+08:00",
"X-Client-Hash": "124be817ab64a2505833b190a9319d81",
#"X-Client-Time": "2019-09-03T00:35:23+08:00",
#"X-Client-Hash": "00a470c1b9064e623fa7e955e278c47c",
} }
params = { params = {
"username" => Danbooru.config.pixiv_login, username: Danbooru.config.pixiv_login,
"password" => Danbooru.config.pixiv_password, password: Danbooru.config.pixiv_password,
"grant_type" => "password", grant_type: "password",
"client_id" => CLIENT_ID, client_id: CLIENT_ID,
"client_secret" => CLIENT_SECRET client_secret: CLIENT_SECRET,
} }
url = "https://oauth.secure.pixiv.net/auth/token" url = "https://oauth.secure.pixiv.net/auth/token"

2
app/logical/sources/strategies/pixiv.rb
View File

@@ -350,8 +350,6 @@ module Sources
memoize :agent memoize :agent
def metadata def metadata
return PixivApiClient::WorkResponse.new(url)
if novel_id.present? if novel_id.present?
return PixivApiClient.new.novel(novel_id) return PixivApiClient.new.novel(novel_id)
end end