From a506cf2a1a5e18d81dc4f3eea93c5adb41722757 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Mon, 9 Oct 2017 14:56:11 -0700
Subject: [PATCH] potential fix for #3321

---
 app/logical/pixiv_api_client.rb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/logical/pixiv_api_client.rb b/app/logical/pixiv_api_client.rb
index a000192ab..b23962820 100644
--- a/app/logical/pixiv_api_client.rb
+++ b/app/logical/pixiv_api_client.rb
@@ -114,11 +114,15 @@ class PixivApiClient
       @tags = json["tags"].reject {|x| x =~ /^http:/}
       @tags += json["tools"] - TOOLS_BLACKLIST
 
-      if json["metadata"]["zip_urls"]
-        @pages = json["metadata"]["zip_urls"]
-      elsif page_count > 1
-        @pages = json["metadata"]["pages"].map {|x| x["image_urls"]["large"]}
-      else
+      if json["metadata"]
+        if json["metadata"]["zip_urls"]
+          @pages = json["metadata"]["zip_urls"]
+        elsif page_count > 1
+          @pages = json["metadata"]["pages"].map {|x| x["image_urls"]["large"]}
+        end
+      end
+
+      if @pages.nil? && json["image_urls"]
         @pages = [json["image_urls"]["large"]]
       end
     end