Support using url to upload image and voice file, #613

Author: ryoii

docs/adapter/HttpAdapter.md

@@ -615,11 +615,12 @@ adapterSettings:
 
 #### 请求:
 
-| 名字         | 类型   | 可选  | 举例        | 说明                               |
-| ------------ | ------ | ----- | ----------- | ---------------------------------- |
-| sessionKey   | String | true | YourSession | 已经激活的Session                  |
-| type         | String | false | "friend"    | "friend" 或 "group" 或 "temp"        |
-| img          | File   | false | -           | 图片文件                           |
+| 名字         | 类型     | 可选    | 举例        | 说明                          |
+|------------|--------|-------| ----------- |-----------------------------|
+| sessionKey | String | true  | YourSession | 已经激活的Session                |
+| type       | String | false | "friend"    | "friend" 或 "group" 或 "temp" |
+| img        | File   | true  | -           | 图片文件                        |
+| url        | String | true  | -           | 图片URL                       |
 
 #### 响应: 
 
@@ -642,11 +643,12 @@ adapterSettings:
 
 #### 请求:
 
-| 名字         | 类型   | 可选  | 举例        | 说明                               |
-| ------------ | ------ | ----- | ----------- | ---------------------------------- |
-| sessionKey   | String | true  | YourSession | 已经激活的Session                  |
-| type         | String | false | "group"     | 当前仅支持 "group"                   |
-| voice        | File   | false | -           | 语音文件                           |
+| 名字         | 类型     | 可选    | 举例        | 说明            |
+|------------|--------|-------| ----------- |---------------|
+| sessionKey | String | true  | YourSession | 已经激活的Session  |
+| type       | String | false | "group"     | 当前仅支持 "group" |
+| voice      | File   | true  | -           | 语音文件          |
+| url        | String | true  | -           | 语音文件 URL      |
 
 #### 响应: 
 

mirai-api-http/src/main/kotlin/net/mamoe/mirai/api/http/adapter/http/router/message.kt

@@ -9,15 +9,16 @@
 
 package net.mamoe.mirai.api.http.adapter.http.router
 
-import io.ktor.server.application.*
 import io.ktor.http.content.*
+import io.ktor.server.application.*
 import io.ktor.server.routing.*
 import net.mamoe.mirai.api.http.adapter.common.IllegalParamException
 import net.mamoe.mirai.api.http.adapter.http.dto.CountDTO
 import net.mamoe.mirai.api.http.adapter.internal.action.*
 import net.mamoe.mirai.api.http.adapter.internal.consts.Paths
 import net.mamoe.mirai.api.http.adapter.internal.dto.EventListRestfulResult
 import net.mamoe.mirai.api.http.adapter.internal.dto.IntRestfulResult
+import java.net.URL
 
 /**
  * 消息路由
@@ -104,8 +105,15 @@ internal fun Application.messageRouter() = routing {
      */
     httpAuthedMultiPart(Paths.uploadImage) { session, parts ->
         val type = parts.value("type")
-        val ret = parts.file("img")?.run { onUploadImage(session, streamProvider(), type) }
-            ?: throw IllegalParamException("缺少参数 img")
+        val url = parts.valueOrNull("url")
+        val stream = if (url != null) {
+            URL(url).openStream()
+        } else {
+            val f = parts.file("img") ?: throw IllegalParamException("缺少参数 img")
+            f.streamProvider()
+        }
+
+        val ret = onUploadImage(session, stream, type)
         call.respondDTO(ret)
     }
 
@@ -114,8 +122,14 @@ internal fun Application.messageRouter() = routing {
      */
     httpAuthedMultiPart(Paths.uploadVoice) { session, parts ->
         val type = parts.value("type")
-        val ret = parts.file("voice")?.run { onUploadVoice(session, streamProvider(), type) }
-            ?: throw IllegalParamException("缺少参数 voice")
+        val url = parts.valueOrNull("url")
+        val stream = if (url != null) {
+            URL(url).openStream()
+        } else {
+            val f = parts.file("voice") ?: throw IllegalParamException("缺少参数 voice")
+            f.streamProvider()
+        }
+        val ret = onUploadVoice(session, stream, type)
         call.respondDTO(ret)
     }