From 1c000935600c9f8bafbab1e4a982f94d392edcc4 Mon Sep 17 00:00:00 2001
From: RTAkland <me@rtast.cn>
Date: Thu, 10 Oct 2024 14:59:09 +0800
Subject: [PATCH] fix: fix wikitext parse

---
 build.gradle.kts                                     |  1 -
 gradle/libs.versions.toml                            |  2 --
 .../rtast/fancybot/entity/wiki/WikipediaConvert.kt   | 11 +++++++++++
 .../kotlin/cn/rtast/fancybot/util/str/WikiText.kt    | 12 ++++++++++--
 4 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 src/main/kotlin/cn/rtast/fancybot/entity/wiki/WikipediaConvert.kt

diff --git a/build.gradle.kts b/build.gradle.kts
index 3539cec..d4c97ff 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -46,7 +46,6 @@ dependencies {
     implementation(libs.logback.classic)
     implementation(libs.slf4j.api)
     implementation(libs.aws.s3.sdk)
-    implementation(libs.bliki.core)
 }
 
 tasks.build {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e8a914d..99ca3a8 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -14,7 +14,6 @@ zxingVersion = "3.5.3"
 logbackClassicVersion = "1.5.8"
 sl4jVersion = "2.0.16"
 awsS3SDKVersion = "2.28.18"
-blikiWikiVersion = "3.1.1-SNAPSHOT"
 
 [libraries]
 ronebot = { group = "cn.rtast", name = "ROneBot", version.ref = "ronebotVersion" }
@@ -32,7 +31,6 @@ zxing-javase = { group = "com.google.zxing", name = "javase", version.ref = "zxi
 logback-classic = { group = "ch.qos.logback", name = "logback-classic", version.ref = "logbackClassicVersion" }
 slf4j-api = { group = "org.slf4j", name = "slf4j-api", version.ref = "sl4jVersion" }
 aws-s3-sdk = { group = "software.amazon.awssdk", name = "s3", version.ref = "awsS3SDKVersion" }
-bliki-core = { group = "info.bliki.wiki", name = "bliki-core", version.ref = "blikiWikiVersion" }
 
 [bundles]
 
diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/wiki/WikipediaConvert.kt b/src/main/kotlin/cn/rtast/fancybot/entity/wiki/WikipediaConvert.kt
new file mode 100644
index 0000000..d320bd1
--- /dev/null
+++ b/src/main/kotlin/cn/rtast/fancybot/entity/wiki/WikipediaConvert.kt
@@ -0,0 +1,11 @@
+/*
+ * Copyright © 2024 RTAkland
+ * Author: RTAkland
+ * Date: 2024/10/10
+ */
+
+
+package cn.rtast.fancybot.entity.wiki
+
+data class WikipediaConvertPayload(val content: String, )
+data class WikipediaConvertResponse(val parsed: String, )
\ No newline at end of file
diff --git a/src/main/kotlin/cn/rtast/fancybot/util/str/WikiText.kt b/src/main/kotlin/cn/rtast/fancybot/util/str/WikiText.kt
index 070d901..db1f500 100644
--- a/src/main/kotlin/cn/rtast/fancybot/util/str/WikiText.kt
+++ b/src/main/kotlin/cn/rtast/fancybot/util/str/WikiText.kt
@@ -7,8 +7,16 @@
 
 package cn.rtast.fancybot.util.str
 
-import info.bliki.wiki.model.WikiModel
+import cn.rtast.fancybot.API_RTAST_URL
+import cn.rtast.fancybot.entity.wiki.WikipediaConvertPayload
+import cn.rtast.fancybot.entity.wiki.WikipediaConvertResponse
+import cn.rtast.fancybot.util.Http
 
 fun String.convertToHTML(): String {
-    return WikiModel.toHtml(this)
+    val payload = WikipediaConvertPayload(this)
+    val response = Http.post<WikipediaConvertResponse>(
+        "$API_RTAST_URL/api/wikitext",
+        payload.toJson()
+    )
+    return response.parsed
 }
\ No newline at end of file