From 5525bbe1cac37932713921116f14095d0c9c2d7b Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Sun, 23 Sep 2018 18:45:08 -0500
Subject: [PATCH] nijie: normalize all thumbnail urls (#3919).

---
 app/logical/sources/strategies/nijie.rb |  2 +-
 test/unit/downloads/nijie_test.rb       | 22 ------------------
 test/unit/sources/nijie_test.rb         | 31 +++++++++++++++++++++++++
 3 files changed, 32 insertions(+), 23 deletions(-)
 delete mode 100644 test/unit/downloads/nijie_test.rb

diff --git a/app/logical/sources/strategies/nijie.rb b/app/logical/sources/strategies/nijie.rb
index e2edbebe4..5ef61874b 100644
--- a/app/logical/sources/strategies/nijie.rb
+++ b/app/logical/sources/strategies/nijie.rb
@@ -125,7 +125,7 @@ module Sources
       end
 
       def normalize_thumbnails(x)
-        x.gsub(%r!__rs_l120x120/!i, "")
+        x.gsub(%r!__rs_\w+/!i, "")
       end
 
       def illust_id
diff --git a/test/unit/downloads/nijie_test.rb b/test/unit/downloads/nijie_test.rb
deleted file mode 100644
index 7c7b13c98..000000000
--- a/test/unit/downloads/nijie_test.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-require "test_helper"
-
-module Downloads
-  class NijieTest < ActiveSupport::TestCase
-    context "downloading a 'http://nijie.info/view.php?id=:id' url" do
-      should "download the original file" do
-        @source = "http://nijie.info/view.php?id=213043"
-        @rewrite = "https://pic03.nijie.info/nijie_picture/728995_20170505014820_0.jpg"
-        assert_rewritten(@rewrite, @source)
-        assert_downloaded(132_555, @source)
-      end
-    end
-
-    context "downloading a 'https://pic*.nijie.info/nijie_picture/:id.jpg' url" do
-      should "download the original file" do
-        @source = "https://pic03.nijie.info/nijie_picture/728995_20170505014820_0.jpg"
-        assert_not_rewritten(@source)
-        assert_downloaded(132_555, @source)
-      end
-    end
-  end
-end
diff --git a/test/unit/sources/nijie_test.rb b/test/unit/sources/nijie_test.rb
index df135a2b9..be8bef47e 100644
--- a/test/unit/sources/nijie_test.rb
+++ b/test/unit/sources/nijie_test.rb
@@ -2,6 +2,37 @@ require 'test_helper'
 
 module Sources
   class NijieTest < ActiveSupport::TestCase
+    context "downloading a 'http://nijie.info/view.php?id=:id' url" do
+      should "download the original file" do
+        @source = "http://nijie.info/view.php?id=213043"
+        @rewrite = "https://pic03.nijie.info/nijie_picture/728995_20170505014820_0.jpg"
+        assert_rewritten(@rewrite, @source)
+        assert_downloaded(132_555, @source)
+      end
+    end
+
+    context "downloading a 'https://pic*.nijie.info/nijie_picture/:id.jpg' url" do
+      should "download the original file" do
+        @source = "https://pic03.nijie.info/nijie_picture/728995_20170505014820_0.jpg"
+        assert_not_rewritten(@source)
+        assert_downloaded(132_555, @source)
+      end
+    end
+
+    context "downloading a 'https://pic*.nijie.info/__rs_*/nijie_picture/:id.jpg' preview url" do
+      should "download the original file" do
+        assert_rewritten(
+          "https://pic01.nijie.info/nijie_picture/diff/main/218856_0_236014_20170620101329.png",
+          "https://pic01.nijie.info/__rs_l120x120/nijie_picture/diff/main/218856_0_236014_20170620101329.png"
+        )
+
+        assert_rewritten(
+          "https://pic03.nijie.info/nijie_picture/236014_20170620101426_0.png",
+          "https://pic03.nijie.info/__rs_cns350x350/nijie_picture/236014_20170620101426_0.png"
+        )
+      end
+    end
+
     context "The source site for a nijie page" do
       setup do
         CurrentUser.user = FactoryBot.create(:user)