From b92e421ba57ad34bbbd50a1237cdf3f5b9c4744e Mon Sep 17 00:00:00 2001
From: Kosugi_kun <33971692+kosugikun@users.noreply.github.com>
Date: Wed, 3 Aug 2022 20:43:26 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=BB=E3=83=8B=E3=82=B3=E3=83=8B=E3=82=B3?=
 =?UTF-8?q?=E5=8B=95=E7=94=BB=E3=81=AE=E3=83=97=E3=83=AC=E3=83=9F=E3=82=A2?=
 =?UTF-8?q?=E3=83=A0=E3=82=A2=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88=E3=81=A7?=
 =?UTF-8?q?=E5=8B=95=E7=94=BB=E3=82=92=E5=86=8D=E7=94=9F=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=81=AA=E3=81=84=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=20=E3=83=BB=E5=86=8D=E7=94=9F=E3=81=8C=E7=B5=82?=
 =?UTF-8?q?=E4=BA=86=E3=81=97=E3=81=9F=E3=83=8B=E3=82=B3=E3=83=8B=E3=82=B3?=
 =?UTF-8?q?=E5=8B=95=E7=94=BB=E3=81=AE=E3=82=BB=E3=83=83=E3=82=B7=E3=83=A7?=
 =?UTF-8?q?=E3=83=B3=E3=81=8C=E6=AE=8B=E3=82=8A=E7=B6=9A=E3=81=91=E3=82=8B?=
 =?UTF-8?q?=E4=B8=8D=E5=85=B7=E5=90=88=E3=82=92=E4=BF=AE=E6=AD=A3=20?=
 =?UTF-8?q?=E3=83=BB=E3=83=8B=E3=82=B3=E3=83=8B=E3=82=B3=E5=8B=95=E7=94=BB?=
 =?UTF-8?q?=E3=82=92=E3=83=97=E3=83=AC=E3=83=9F=E3=82=A2=E3=83=A0=E3=82=A2?=
 =?UTF-8?q?=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88=E3=81=A7=E3=83=AA=E3=82=AF?=
 =?UTF-8?q?=E3=82=A8=E3=82=B9=E3=83=88=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AF?=
 =?UTF-8?q?=E9=AB=98=E9=9F=B3=E8=B3=AA=E9=9F=B3=E5=A3=B0=E3=82=92=E3=83=AA?=
 =?UTF-8?q?=E3=82=AF=E3=82=A8=E3=82=B9=E3=83=88=E3=81=99=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                       |  4 +--
 .../jagrosh/jmusicbot/audio/AudioHandler.java | 13 +++++----
 .../dev/cosgy/agent/GensokyoInfoAgent.java    | 29 +++++++++++--------
 src/main/resources/logback.xml                |  4 +--
 4 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/pom.xml b/pom.xml
index feeb3bd8e..abf937ae6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <groupId>com.jagrosh</groupId>
     <artifactId>JMusicBot</artifactId>
     <!-- バージョン装飾子参考の参考に: https://kengotoda.gitbooks.io/what-is-maven/deploy/snapshot-and-stable.html -->
-    <version>0.7.1</version>
+    <version>0.7.2</version>
     <packaging>jar</packaging>
 
     <repositories>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>com.github.Cosgy-Dev</groupId>
             <artifactId>lavaplayer-fork</artifactId>
-            <version>original-3a8f565d48-1</version>
+            <version>original-4feb559de4-1</version>
         </dependency>
         <!--
         <dependency>
diff --git a/src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java b/src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java
index 654da845e..a6afd14c5 100644
--- a/src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java
+++ b/src/main/java/com/jagrosh/jmusicbot/audio/AudioHandler.java
@@ -37,11 +37,8 @@
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.User;
-import org.json.JSONObject;
-import org.json.XML;
 
 import java.awt.*;
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -239,10 +236,12 @@ public Message getNowPlaying(JDA jda) throws Exception {
                         "https://gensokyoradio.net/" :
                         GensokyoInfoAgent.getInfo().getMisc().getCirclelink();
 
-                String albumArt = GensokyoInfoAgent.getInfo().getMisc().getAlbumart().equals("") ?
+                String albumArt = "";
+                if(manager.getBot().getConfig().useNPImages()){
+                    albumArt = GensokyoInfoAgent.getInfo().getMisc().getAlbumart().equals("") ?
                         "https://cdn.discordapp.com/attachments/240116420946427905/373019550725177344/gr-logo-placeholder.png" :
                         "https://gensokyoradio.net/images/albums/original/" + GensokyoInfoAgent.getInfo().getMisc().getAlbumart();
-
+                }
                 eb.setTitle(GensokyoInfoAgent.getInfo().getSonginfo().getTitle(), titleUrl)
                         .addField("アルバム", GensokyoInfoAgent.getInfo().getSonginfo().getAlbum(), true)
                         .addField("アーティスト", GensokyoInfoAgent.getInfo().getSonginfo().getArtist(), true)
@@ -259,11 +258,13 @@ public Message getNowPlaying(JDA jda) throws Exception {
                         + FormatUtil.volumeIcon(audioPlayer.getVolume()));
 
                 eb.addField("リスナー", Integer.toString(GensokyoInfoAgent.getInfo().getServerinfo().getListeners()), true)
-                        .setImage(albumArt)
                         .setColor(new Color(66, 16, 80))
                         .setFooter("コンテンツはgensokyoradio.netによって提供されています。\n" +
                                 "GRロゴはGensokyo Radioの商標です。" +
                                 "\nGensokyo Radio is © LunarSpotlight.", null);
+                if(manager.getBot().getConfig().useNPImages()){
+                    eb.setImage(albumArt);
+                }
             }
 
             return mb.setEmbeds(eb.build()).build();
diff --git a/src/main/java/dev/cosgy/agent/GensokyoInfoAgent.java b/src/main/java/dev/cosgy/agent/GensokyoInfoAgent.java
index f9fef107f..77b9b9627 100644
--- a/src/main/java/dev/cosgy/agent/GensokyoInfoAgent.java
+++ b/src/main/java/dev/cosgy/agent/GensokyoInfoAgent.java
@@ -23,7 +23,6 @@
 
 import java.net.HttpURLConnection;
 import java.net.URI;
-import java.net.URL;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
@@ -31,7 +30,7 @@
 
 public class GensokyoInfoAgent extends Thread {
     private static final Logger log = LoggerFactory.getLogger(GensokyoInfoAgent.class);
-    private static final int INTERVAL_MILLIS = 60000; // 5 secs
+    private static long INTERVAL_MILLIS = 1000; // 5 secs
     private static ResultSet info = null;
     private static String lastSong = "";
 
@@ -44,12 +43,19 @@ public GensokyoInfoAgent() {
     private static ResultSet fetch() throws Exception {
         HttpURLConnection connection = null;
         try{
+
+            if(info.getSongtimes().getPlayed() < info.getSongtimes().getDuration()){
+                return info;
+            }
+
             // XMLの取得元URL設定
             //URL url = new URL("https://gensokyoradio.net/xml");
 
             HttpRequest req = HttpRequest.newBuilder(new URI("https://gensokyoradio.net/json"))
                     .GET()
                     .timeout(Duration.ofSeconds(10))
+                    .setHeader("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Safari/537.36")
+                    .setHeader("accept-language", "ja,en-US;q=0.9,en;q=0.8")
                     .build();
 
             HttpClient client = HttpClient.newBuilder()
@@ -82,7 +88,7 @@ private static ResultSet fetch() throws Exception {
     }
 
     public static ResultSet getInfo() throws Exception {
-        return info == null ? fetch() : info;
+        return fetch();
     }
 
     @Override
@@ -91,17 +97,16 @@ public void run() {
 
         //noinspection InfiniteLoopStatement
         while (true) {
+
             try {
-                fetch();
-                sleep(INTERVAL_MILLIS);
-            } catch (Exception e) {
-                log.error("情報を取得中に例外が発生しました！", e);
-                try {
-                    sleep(1000);
-                } catch (InterruptedException e1) {
-                    log.error("エージェントの例外後にスリープ中に中断されました", e);
-                    break;
+                sleep(1000);
+                // 現在再生中の曲が終わるまで幻想郷ラジオに曲の情報をリクエストしない。
+                // DDos攻撃になってしまうので...
+                if (info != null) {
+                    info.getSongtimes().setPlayed(info.getSongtimes().getPlayed() + 1);
                 }
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
             }
         }
     }
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index fcdf35195..10fad6152 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -47,9 +47,9 @@
     <!--<root level="DEBUG">
         <appender-ref ref="Simple"/>
         <appender-ref ref="File"/>
-    </root>-->
+    </root>
 
-    <!--<root level="TRACE">
+    <root level="TRACE">
         <appender-ref ref="Simple"/>
         <appender-ref ref="File"/>
     </root>-->