From 1902e922a3725eac44301b018681ee862aaedcfa Mon Sep 17 00:00:00 2001
From: jie65535 <jie65535@qq.com>
Date: Sat, 12 Feb 2022 20:10:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B0v0.1.1=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20=E6=9C=AA=E6=9F=A5=E8=AF=A2=E5=88=B0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=E6=8F=90=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E5=A4=8D=20=E8=8E=B7=E5=8F=96=E7=8E=A9?=
 =?UTF-8?q?=E5=AE=B6=E5=A4=B4=E5=83=8F=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=8F=8C?=
 =?UTF-8?q?=E5=B1=82=E7=9A=AE=E8=82=A4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle.kts                        |  4 ++--
 src/main/kotlin/JMSCommand.kt           | 13 +++++++++++--
 src/main/kotlin/JMinecraftSkin.kt       |  2 +-
 src/main/kotlin/MinecraftSkinService.kt |  2 +-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index dd4e8de..a8ff529 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -3,11 +3,11 @@ plugins {
     kotlin("jvm") version kotlinVersion
     kotlin("plugin.serialization") version kotlinVersion
 
-    id("net.mamoe.mirai-console") version "2.9.2"
+    id("net.mamoe.mirai-console") version "2.10.0"
 }
 
 group = "top.jie65535"
-version = "0.1.0"
+version = "0.1.1"
 
 repositories {
     maven("https://maven.aliyun.com/repository/public")
diff --git a/src/main/kotlin/JMSCommand.kt b/src/main/kotlin/JMSCommand.kt
index b178f9e..55b14df 100644
--- a/src/main/kotlin/JMSCommand.kt
+++ b/src/main/kotlin/JMSCommand.kt
@@ -76,8 +76,17 @@ object JMSCommand : CompositeCommand(
     }
 
     private suspend fun CommandSender.sendImage(data: ByteArray) {
-        data.toExternalResource().use {
-            subject?.sendImage(it)
+        try {
+            if (data.isEmpty()) {
+                subject?.sendMessage("未查询到数据")
+                return
+            }
+
+            data.toExternalResource().use {
+                subject?.sendImage(it)
+            }
+        } catch (e: Throwable) {
+            subject?.sendMessage(String(data))
         }
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/JMinecraftSkin.kt b/src/main/kotlin/JMinecraftSkin.kt
index cf82a5a..5be7246 100644
--- a/src/main/kotlin/JMinecraftSkin.kt
+++ b/src/main/kotlin/JMinecraftSkin.kt
@@ -9,7 +9,7 @@ object JMinecraftSkin : KotlinPlugin(
     JvmPluginDescription(
         id = "top.jie65535.mirai-console-jms-plugin",
         name = "J Minecraft Skin",
-        version = "0.1.0",
+        version = "0.1.1",
     ) {
         author("jie65535")
         info("MC皮肤查询插件")
diff --git a/src/main/kotlin/MinecraftSkinService.kt b/src/main/kotlin/MinecraftSkinService.kt
index bc4b0c6..cc808d9 100644
--- a/src/main/kotlin/MinecraftSkinService.kt
+++ b/src/main/kotlin/MinecraftSkinService.kt
@@ -11,7 +11,7 @@ object MinecraftSkinService {
      * 获取头像
      */
     fun getAvatars(uuid: String)
-        = HttpUtil.get("https://crafatar.com/avatars/$uuid")
+        = HttpUtil.get("https://crafatar.com/avatars/$uuid?overlay")
 
     /**
      * 获取玩家头模型渲染图