From e060236fb79d04a760fa7b30373d9d1c6942c012 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Sat, 20 Oct 2018 23:58:19 -0700 Subject: [PATCH] add exception for direct links to pixiv fanbox images --- app/logical/pixiv_api_client.rb | 6 +++++- app/logical/sources/strategies/pixiv.rb | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/logical/pixiv_api_client.rb b/app/logical/pixiv_api_client.rb index 45d846c6d..7b1ff4fda 100644 --- a/app/logical/pixiv_api_client.rb +++ b/app/logical/pixiv_api_client.rb @@ -148,7 +148,11 @@ class PixivApiClient end def pages - json["body"]["body"]["images"].map {|x| x["originalUrl"]} + if json["body"]["body"] + json["body"]["body"]["images"].map {|x| x["originalUrl"]} + else + [] + end end end diff --git a/app/logical/sources/strategies/pixiv.rb b/app/logical/sources/strategies/pixiv.rb index ed433541e..52e1bc61a 100644 --- a/app/logical/sources/strategies/pixiv.rb +++ b/app/logical/sources/strategies/pixiv.rb @@ -180,10 +180,13 @@ module Sources public def image_urls_sub + if url =~ FANBOX_IMAGE + return [url] + end + # there's too much normalization bullshit we have to deal with # raw urls, so just fetch the canonical url from the api every # time. - if manga_page.present? return [metadata.pages[manga_page]] end