From 581eeba20b0aedf714713b83487fad21cb1c7a84 Mon Sep 17 00:00:00 2001
From: LamGC <lam827@lamgc.net>
Date: Sat, 25 Jun 2022 23:00:51 +0800
Subject: [PATCH] =?UTF-8?q?feat(config):=20=E6=96=B0=E5=A2=9E=20HTTPS=20?=
 =?UTF-8?q?=E4=BB=A3=E7=90=86=E7=B1=BB=E5=9E=8B,=20=E5=A2=9E=E5=8A=A0=20Ma?=
 =?UTF-8?q?ven=20=E5=AF=B9=20HTTPS=20=E4=BB=A3=E7=90=86=E7=9A=84=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为 ProxyType 增加 HTTPS 类型, 同时为 Aether 增加 Https 代理支持, 方便用户使用现有的公开代理下载依赖包.
---
 scalabot-app/src/main/kotlin/AppConfigs.kt | 10 ++++++----
 scalabot-meta/src/main/kotlin/Configs.kt   |  1 +
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/scalabot-app/src/main/kotlin/AppConfigs.kt b/scalabot-app/src/main/kotlin/AppConfigs.kt
index 293136e..af2ef67 100644
--- a/scalabot-app/src/main/kotlin/AppConfigs.kt
+++ b/scalabot-app/src/main/kotlin/AppConfigs.kt
@@ -26,17 +26,19 @@ internal fun ProxyType.toTelegramBotsType(): DefaultBotOptions.ProxyType {
     return when (this) {
         ProxyType.NO_PROXY -> DefaultBotOptions.ProxyType.NO_PROXY
         ProxyType.HTTP -> DefaultBotOptions.ProxyType.HTTP
+        ProxyType.HTTPS -> DefaultBotOptions.ProxyType.HTTP
         ProxyType.SOCKS4 -> DefaultBotOptions.ProxyType.SOCKS4
         ProxyType.SOCKS5 -> DefaultBotOptions.ProxyType.SOCKS5
     }
 }
 
 internal fun ProxyConfig.toAetherProxy(): Proxy? {
-    return if (type == ProxyType.HTTP) {
-        Proxy(Proxy.TYPE_HTTP, host, port)
-    } else {
-        null
+    val typeStr = when (type) {
+        ProxyType.HTTP -> Proxy.TYPE_HTTP
+        ProxyType.HTTPS -> Proxy.TYPE_HTTPS
+        else -> return null
     }
+    return Proxy(typeStr, host, port)
 }
 
 internal fun MavenRepositoryConfig.toRemoteRepository(proxyConfig: ProxyConfig): RemoteRepository {
diff --git a/scalabot-meta/src/main/kotlin/Configs.kt b/scalabot-meta/src/main/kotlin/Configs.kt
index c1039d9..0b46dd2 100644
--- a/scalabot-meta/src/main/kotlin/Configs.kt
+++ b/scalabot-meta/src/main/kotlin/Configs.kt
@@ -51,6 +51,7 @@ data class BotConfig(
 enum class ProxyType {
     NO_PROXY,
     HTTP,
+    HTTPS,
     SOCKS4,
     SOCKS5
 }