build: 1.2.9

Author: cssxsh

build.gradle.kts

@@ -1,13 +1,13 @@
 plugins {
-    kotlin("jvm") version "1.7.20"
-    kotlin("plugin.serialization") version "1.7.20"
+    kotlin("jvm") version "1.7.21"
+    kotlin("plugin.serialization") version "1.7.21"
 
-    id("net.mamoe.mirai-console") version "2.13.0-RC"
+    id("net.mamoe.mirai-console") version "2.13.2"
     id("me.him188.maven-central-publish") version "1.0.0-dev-3"
 }
 
 group = "io.github.gnuf0rce"
-version = "1.2.8"
+version = "1.2.9"
 
 mavenCentralPublish {
     useCentralS01()
@@ -26,38 +26,24 @@ repositories {
 }
 
 dependencies {
-    implementation("io.ktor:ktor-client-okhttp:2.1.2") {
-        exclude(group = "org.jetbrains.kotlin")
-        exclude(group = "org.jetbrains.kotlinx")
-        exclude(group = "org.slf4j")
-    }
-    implementation("io.ktor:ktor-client-encoding:2.1.2") {
-        exclude(group = "org.jetbrains.kotlin")
-        exclude(group = "org.jetbrains.kotlinx")
-        exclude(group = "org.slf4j")
-    }
-    implementation("io.ktor:ktor-client-content-negotiation:2.1.2") {
-        exclude(group = "org.jetbrains.kotlin")
-        exclude(group = "org.jetbrains.kotlinx")
-        exclude(group = "org.slf4j")
-    }
-    implementation("io.ktor:ktor-serialization-kotlinx-json:2.1.2") {
-        exclude(group = "org.jetbrains.kotlin")
-        exclude(group = "org.jetbrains.kotlinx")
-        exclude(group = "org.slf4j")
-    }
-    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.10.0") {
-        exclude(group = "org.jetbrains.kotlin")
-        exclude(group = "org.jetbrains.kotlinx")
-        exclude(group = "org.slf4j")
-    }
-    compileOnly("xyz.cssxsh.mirai:mirai-selenium-plugin:2.2.3")
-    compileOnly("xyz.cssxsh.mirai:mirai-administrator:1.2.8")
-    // test
-    testRuntimeOnly("xyz.cssxsh.mirai:mirai-selenium-plugin:2.2.3")
+    compileOnly("xyz.cssxsh.mirai:mirai-selenium-plugin:2.2.4")
+    compileOnly("xyz.cssxsh.mirai:mirai-administrator:1.3.0")
     testImplementation(kotlin("test"))
-    testImplementation("org.slf4j:slf4j-simple:2.0.3")
-    testImplementation("net.mamoe:mirai-logging-slf4j:2.13.0-RC")
+    testImplementation("xyz.cssxsh.mirai:mirai-selenium-plugin:2.2.4")
+    //
+    implementation(platform("net.mamoe:mirai-bom:2.13.2"))
+    compileOnly("net.mamoe:mirai-console-compiler-common")
+    testImplementation("net.mamoe:mirai-logging-slf4j")
+    //
+    implementation(platform("io.ktor:ktor-bom:2.1.3"))
+    implementation("io.ktor:ktor-client-okhttp")
+    implementation("io.ktor:ktor-client-encoding")
+    implementation("io.ktor:ktor-client-content-negotiation")
+    implementation("io.ktor:ktor-serialization-kotlinx-json")
+    implementation("com.squareup.okhttp3:okhttp-dnsoverhttps:4.10.0")
+    //
+    implementation(platform("org.slf4j:slf4j-parent:2.0.5"))
+    testImplementation("org.slf4j:slf4j-simple")
 }
 
 mirai {

readme.md

@@ -3,7 +3,7 @@
 > 基于 [Mirai Console](https://github.com/mamoe/mirai-console) 的 GitHub Notice 订阅插件
 
 [![Release](https://img.shields.io/github/v/release/gnuf0rce/github-helper)](https://github.com/gnuf0rce/github-helper/releases)
-[![Downloads](https://img.shields.io/github/downloads/gnuf0rce/github-helper/total)](https://shields.io/category/downloads)
+[![Downloads](https://img.shields.io/github/downloads/gnuf0rce/github-helper/total)](https://repo1.maven.org/maven2/io/github/gnuf0rce/mirai-content-censor/)
 [![MiraiForum](https://img.shields.io/badge/post-on%20MiraiForum-yellow)](https://mirai.mamoe.net/topic/554)
 
 **使用前应该查阅的相关文档或项目**
@@ -97,7 +97,7 @@
 
 举例：
 
-```
+```text
 问题：GitHub ID ?
 答案：cssxsh
 ```
@@ -108,24 +108,24 @@
 
 ### GithubConfig
 
-* `proxy` Format http://127.0.0.1:8080 or socks://127.0.0.1:1080
-* `doh` Dns Over Https Url
-* `github_token` [Personal Access Tokens](https://github.com/settings/tokens)
-* `reply_type` URL解析回复的消息格式
-* `timeout` Http 访问超时时间，单位秒
-* `percentage_member_join` 加群放行 GitHub 活跃等级（百分制），默认0，不开启功能
-* `percentages` 加群放行 GitHub 活跃等级（百分制），默认0，不开启功能
-* `sign_member_join` 加群放行提示信息
-* `github_readme_stats` stats card 绘制参数
+*   `proxy` Format http://127.0.0.1:8080 or socks://127.0.0.1:1080
+*   `doh` Dns Over Https Url
+*   `github_token` [Personal Access Tokens](https://github.com/settings/tokens)
+*   `reply_type` URL解析回复的消息格式
+*   `timeout` Http 访问超时时间，单位秒
+*   `percentage_member_join` 加群放行 GitHub 活跃等级（百分制），默认0，不开启功能
+*   `percentages` 加群放行 GitHub 活跃等级（百分制），默认0，不开启功能
+*   `sign_member_join` 加群放行提示信息
+*   `github_readme_stats` stats card 绘制参数
 
 ## 安装
 
 ### MCL 指令安装
 
 **请确认 mcl.jar 的版本是 2.1.0+**  
-`./mcl --update-package io.github.gnuf0rce:github-helper --channel stable --type plugin`
+`./mcl --update-package io.github.gnuf0rce:github-helper --channel maven-stable --type plugin`
 
 ### 手动安装
 
-* 运行 [Mirai Console](https://github.com/mamoe/mirai-console) 生成`plugins`文件夹
-* 从 [Releases](https://github.com/gnuf0rce/github-helper/releases) 下载`jar`并将其放入`plugins`文件夹中
+1.  从 [Releases](https://github.com/gnuf0rce/github-helper/releases) 或者 [Maven](https://repo1.maven.org/maven2/io/github/gnuf0rce/mirai-content-censor/) 下载 `mirai2.jar`
+2.  将其放入 `plugins` 文件夹中

src/main/kotlin/io/github/gnuf0rce/mirai/github/GitHubHelperPlugin.kt

@@ -29,7 +29,7 @@ public object GitHubHelperPlugin : KotlinPlugin(
     JvmPluginDescription(
         id = "io.github.gnuf0rce.github-helper",
         name = "github-helper",
-        version = "1.2.8",
+        version = "1.2.9",
     ) {
         author("cssxsh")
 

src/main/kotlin/io/github/gnuf0rce/mirai/github/GitHubMessage.kt

@@ -1027,8 +1027,8 @@ public suspend fun Repo.toMessage(contact: Contact, type: Format, notice: String
                     val size = when (additional) {
                         0L -> "0"
                         in 1L until (1 shl 10) -> "${additional}B"
-                        in (1 shl 10)  until (1 shl 20) -> "${additional.toDouble().div(1 shl 10)}KB"
-                        else -> "${additional.toDouble().div(1 shl 20)}MB"
+                        in (1 shl 10)  until (1 shl 20) -> "${additional.div(1 shl 10)}KB"
+                        else -> "${additional.div(1 shl 20)}MB"
                     }
                     appendLine("$language: $size")
                 }
@@ -1109,7 +1109,7 @@ public suspend fun Milestone.toMessage(contact: Contact, type: Format, notice: S
 
 public suspend fun Readme.toMessage(contact: Contact): Message {
     if (contact is FileSupported) {
-        contact.launch(SupervisorJob()) {
+        contact.launch {
             val file = if (selenium) {
                 logger.info { "将尝试发送 ${sha}.pdf to ${contact.render()}" }
                 pdf()

src/main/kotlin/io/github/gnuf0rce/mirai/github/GitHubReplier.kt

@@ -132,6 +132,7 @@ internal val PullReplier: MessageReplier = replier@{ result ->
 
 /**
  * 1. [https://github.com/{owner}/{repo}/releases/tag/{name}]
+ * 2. [https://github.com/{owner}/{repo}/releases/latest]
  */
 internal val RELEASE_REGEX = """(?<=github\.com/)([\w-.]+)/([\w-.]+)/releases/(tag|latest)/?(\S*)""".toRegex()
 

src/main/kotlin/io/github/gnuf0rce/mirai/github/GitHubSubscriber.kt

@@ -132,7 +132,7 @@ public abstract class GitHubSubscriber<T>(private val name: String) : CoroutineS
         }
     }
 
-    private fun launch(id: String) = launch(SupervisorJob()) {
+    private fun launch(id: String) = launch {
         logger.info { "$name with $id run start" }
         while (isActive) {
             val current = task(id) ?: break

src/main/kotlin/io/github/gnuf0rce/mirai/github/GitHubUitls.kt

@@ -22,7 +22,7 @@ import java.net.*
 import java.util.*
 import kotlin.coroutines.*
 
-internal const val IMAGE_FOLDER_PROPERTY = "io.github.gnuf0rce.mirai.plugin.image"
+internal const val IMAGE_FOLDER_PROPERTY = "io.github.gnuf0rce.mirai.github.image"
 
 /**
  * @see [GitHubHelperPlugin.logger]
@@ -73,7 +73,11 @@ internal val github by lazy {
                     true
                 }
                 is IOException -> {
-                    logger.warning({ "HttpClient Ignore" }, it)
+                    if (it.message == "Connection reset") {
+                        logger.warning { "HttpClient Ignore ${it.message}" }
+                    } else {
+                        logger.warning({ "HttpClient Ignore" }, it)
+                    }
                     true
                 }
                 else -> {