From 5fb2c23afa06451356a411ac17ed4dd63d5d5e11 Mon Sep 17 00:00:00 2001
From: Samarium <28302241+Samarium150@users.noreply.github.com>
Date: Sun, 12 Dec 2021 20:00:16 +0800
Subject: [PATCH] fix: add https to default proxy
Closes #62
---
build.gradle.kts | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
src/main/kotlin/Main.kt | 2 +-
src/main/kotlin/PluginConfig.kt | 2 +-
src/main/kotlin/ReplyConfig.kt | 1 +
src/main/kotlin/RequestBody.kt | 2 +-
6 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/build.gradle.kts b/build.gradle.kts
index 834e671..156a627 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -11,7 +11,7 @@ plugins {
}
group = "com.github.samarium150"
-version = "4.2.0"
+version = "4.2.1"
repositories {
mavenLocal()
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1acc777..05679dc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
index bd48898..e211e8a 100644
--- a/src/main/kotlin/Main.kt
+++ b/src/main/kotlin/Main.kt
@@ -41,7 +41,7 @@ import java.net.Proxy
object Main : KotlinPlugin(
JvmPluginDescription(
id = "com.github.samarium150.mirai-console-lolicon",
- version = "4.2.0",
+ version = "4.2.1",
name = "mirai-console-lolicon"
)
) {
diff --git a/src/main/kotlin/PluginConfig.kt b/src/main/kotlin/PluginConfig.kt
index 9270751..27bde7d 100644
--- a/src/main/kotlin/PluginConfig.kt
+++ b/src/main/kotlin/PluginConfig.kt
@@ -92,7 +92,7 @@ object PluginConfig : AutoSavePluginConfig("Config") {
* 自定义代理
*/
@ValueDescription("获取Pixiv图片的代理")
- val proxy: String by value("i.pixiv.re")
+ val proxy: String by value("https://i.pixiv.re")
/**
* Default recall time
diff --git a/src/main/kotlin/ReplyConfig.kt b/src/main/kotlin/ReplyConfig.kt
index 2dff6fd..7f1ad0e 100644
--- a/src/main/kotlin/ReplyConfig.kt
+++ b/src/main/kotlin/ReplyConfig.kt
@@ -44,6 +44,7 @@ object ReplyConfig : AutoSavePluginConfig("ReplyConfig") {
*
* 标签被过滤
*/
+ @ValueDescription("标签被过滤")
val filteredTag: String by value("该图片标签已被过滤,请换个标签再试")
/**
diff --git a/src/main/kotlin/RequestBody.kt b/src/main/kotlin/RequestBody.kt
index e579ab9..16bcfb5 100644
--- a/src/main/kotlin/RequestBody.kt
+++ b/src/main/kotlin/RequestBody.kt
@@ -46,7 +46,7 @@ data class RequestBody(
val keyword: String? = "",
val tag: List>? = null,
val size: List? = null,
- val proxy: String = "i.pixiv.re",
+ val proxy: String = "https://i.pixiv.re",
val dataAfter: Long? = null,
val dataBefore: Long? = null,
val dsc: Boolean? = null