From a1e54e70d9a827cb351cb9a378a4076406609442 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Fri, 24 Apr 2020 23:54:26 +0800
Subject: [PATCH] =?UTF-8?q?[Change]=20PixivURL=20=E8=B0=83=E6=95=B4Ranking?=
 =?UTF-8?q?ContentType.ALL=E5=90=8D=E7=A7=B0(ALL=20->=20TYPE=5FALL);=20[Ad?=
 =?UTF-8?q?d]=20PixivDownload=20=E5=A2=9E=E5=8A=A0=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=A1=E6=81=AF;=20[Fix]=20RandomIntervalS?=
 =?UTF-8?q?endTimer=20=E4=BF=AE=E5=A4=8Dcancel=E6=96=B9=E6=B3=95=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E5=81=9C=E6=AD=A2=E5=AE=9A=E6=97=B6=E5=99=A8=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java | 1 +
 src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java         | 1 +
 src/main/java/net/lamgc/cgj/pixiv/PixivURL.java              | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java b/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java
index 337e2b6..1e91ed5 100644
--- a/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java
+++ b/src/main/java/net/lamgc/cgj/bot/RandomIntervalSendTimer.java
@@ -133,6 +133,7 @@ public class RandomIntervalSendTimer extends TimerTask {
     @Override
     public boolean cancel() {
         start.set(false);
+        loop.set(false);
         return super.cancel();
     }
 
diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java
index 5f158d0..4ee9a19 100644
--- a/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java
+++ b/src/main/java/net/lamgc/cgj/pixiv/PixivDownload.java
@@ -317,6 +317,7 @@ public class PixivDownload {
         ArrayList<JsonObject> results = new ArrayList<>(range);
         for (int pageIndex = startPages; pageIndex <= endPages && count < range; pageIndex++) {
             HttpGet request = createHttpGetRequest(PixivURL.getRankingLink(contentType, mode, time, pageIndex, true));
+            log.debug("RequestUri: {}", request.getURI());
             HttpResponse response = httpClient.execute(request);
 
             if(response.getStatusLine().getStatusCode() != 200) {
diff --git a/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java b/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java
index c61be83..43ed259 100644
--- a/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java
+++ b/src/main/java/net/lamgc/cgj/pixiv/PixivURL.java
@@ -186,7 +186,7 @@ public class PixivURL {
     public static String getRankingLink(RankingContentType contentType, RankingMode mode, Date time, int pageIndex, boolean json){
         StringBuilder linkBuilder = new StringBuilder(PIXIV_RANKING_LINK);
         linkBuilder.append("mode=").append(mode == null ? RankingMode.MODE_DAILY.modeParam : mode.modeParam);
-        if(contentType != null && !contentType.equals(RankingContentType.ALL)){
+        if(contentType != null && !contentType.equals(RankingContentType.TYPE_ALL)){
             linkBuilder.append("&content=").append(contentType.typeName);
         }
         SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
@@ -278,7 +278,7 @@ public class PixivURL {
      * 排名榜类型
      */
     public enum RankingContentType{
-        ALL("", RankingMode.values()),
+        TYPE_ALL("", RankingMode.values()),
         /**
          * 插画
          * 支持的时间类型: 每天, 每周, 每月, 新人