chore(satori): update 24.08.02

build.gradle.kts

@@ -63,22 +63,24 @@ object Versions {
     const val MIRAI = "2.16.0-RC"
     const val KORD = "0.9.0"
     const val COROUTINE_TEST = "1.7.1"
-    const val LOMBOK = "1.18.28"
+    const val LOMBOK = "1.18.32"
 }
 dependencies {
     implementation("org.jetbrains.kotlin", "kotlin-reflect")
     implementation("org.jetbrains.kotlin", "kotlin-stdlib-jdk8")
     implementation("org.jetbrains.kotlin:kotlin-reflect")
 
     implementation("org.springframework.boot:spring-boot-starter-data-jpa")
+    implementation("org.springframework.boot:spring-boot-configuration-processor")
+
     implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2")
     implementation("org.jetbrains.kotlinx:atomicfu:0.20.0")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:1.8.21")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2")
     implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2")
 
-    implementation("com.github.Nyayurn.Yutori-Next:Yutori-Next:master-SNAPSHOT")
-//    implementation("com.github.Nyayurn:Yutori-Next-jvm:master-SNAPSHOT")
+//    implementation("com.github.Nyayurn.Yutori-Next:Yutori-Next:master-SNAPSHOT")
+    implementation("com.github.Nyayurn:Yutori-Next-jvm:master-SNAPSHOT")
 
 //    implementation(files("libs/fix-protocol-version-1.8.0.mirai2.jar"))
     implementation(files("libs/unidbg-fix.jar"))

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/kotlin/kurenai/imsyncbot/Bot.kt

@@ -36,6 +36,7 @@ internal val inlineCommands = HashMap<String, AbstractInlineCommand>()
 internal val qqHandlers = ArrayList<QQHandler>()
 
 internal lateinit var instants: MutableList<ImSyncBot>
+internal lateinit var imSyncBot: ImSyncBot
 
 //suspend fun main() {
 //    instants = loadInstants()
@@ -46,16 +47,17 @@ internal lateinit var instants: MutableList<ImSyncBot>
 
 suspend fun start() {
     Init.init() //td-lib
-    ImSyncBot(configProperties)
+    imSyncBot = ImSyncBot(configProperties)
+    imSyncBot.start()
     commonInit()
 }
 
 fun commonInit() {
-    registerTgCommand()
-    registerQQCommand()
+//    registerTgCommand()
+//    registerQQCommand()
     //TODO: 设置 inline 命令
 //    registerInlineCommand()
-    registerQQHandler()
+//    registerQQHandler()
     setUpTimer()
 }
 

src/main/kotlin/kurenai/imsyncbot/ImSyncBot.kt

@@ -4,13 +4,9 @@ import kotlinx.coroutines.*
 import kurenai.imsyncbot.bot.qq.QQBot
 import kurenai.imsyncbot.bot.qq.QQMessageHandler
 import kurenai.imsyncbot.bot.satori.SatoriBot
-import kurenai.imsyncbot.bot.qq.login.qsign.UnidbgFetchQSignFactory
 import kurenai.imsyncbot.bot.telegram.TelegramBot
 import kurenai.imsyncbot.service.GroupConfigService
 import kurenai.imsyncbot.service.UserConfigService
-import net.mamoe.mirai.internal.spi.EncryptService
-import net.mamoe.mirai.utils.LoggerAdapters
-import net.mamoe.mirai.utils.Services
 import org.apache.logging.log4j.Level
 import org.apache.logging.log4j.core.config.Configurator
 import java.net.InetSocketAddress
@@ -52,17 +48,8 @@ class ImSyncBot(
 //    internal val privateHandle = PrivateChatHandler(configProperties)
 
     init {
-        Services.register(
-            EncryptService.Factory::class.qualifiedName!!,
-            UnidbgFetchQSignFactory::class.qualifiedName!!,
-            ::UnidbgFetchQSignFactory
-        )
-        //mirai使用log4j2
-        LoggerAdapters.useLog4j2()
-
         if (configProperties.debug) {
             Configurator.setLevel("kurenai.imsyncbot", Level.DEBUG)
-            Configurator.setLevel("com.github.nyayurn.yutori", Level.DEBUG)
         }
         configProxy()
     }

src/main/kotlin/kurenai/imsyncbot/bot/qq/QQBot.kt

@@ -13,6 +13,7 @@ import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withLock
 import kurenai.imsyncbot.*
+import kurenai.imsyncbot.bot.qq.login.qsign.UnidbgFetchQSignFactory
 import kurenai.imsyncbot.domain.QQMessage
 import kurenai.imsyncbot.domain.QQMessageType
 import kurenai.imsyncbot.domain.getLocalDateTime
@@ -27,12 +28,15 @@ import net.mamoe.mirai.auth.BotAuthorization
 import net.mamoe.mirai.contact.nameCardOrNick
 import net.mamoe.mirai.event.Event
 import net.mamoe.mirai.event.events.*
+import net.mamoe.mirai.internal.spi.EncryptService
 import net.mamoe.mirai.message.data.At
 import net.mamoe.mirai.message.data.MessageChain.Companion.serializeToJsonString
 import net.mamoe.mirai.message.data.PlainText
 import net.mamoe.mirai.message.data.ids
 import net.mamoe.mirai.utils.BotConfiguration
 import net.mamoe.mirai.utils.ConcurrentHashMap
+import net.mamoe.mirai.utils.LoggerAdapters
+import net.mamoe.mirai.utils.Services
 import java.io.File
 import kotlin.coroutines.CoroutineContext
 
@@ -42,6 +46,17 @@ class QQBot(
 ) : CoroutineScope {
 
     companion object {
+
+        init {
+            Services.register(
+                EncryptService.Factory::class.qualifiedName!!,
+                UnidbgFetchQSignFactory::class.qualifiedName!!,
+                ::UnidbgFetchQSignFactory
+            )
+            //mirai使用log4j2
+            LoggerAdapters.useLog4j2()
+        }
+
         private val log = getLogger()
     }
 

src/main/kotlin/kurenai/imsyncbot/bot/satori/SatoriBot.kt

@@ -12,6 +12,8 @@ import kotlinx.coroutines.flow.update
 import kurenai.imsyncbot.*
 import kurenai.imsyncbot.bot.telegram.TelegramBot
 import kurenai.imsyncbot.utils.getLogger
+import org.apache.logging.log4j.Level
+import org.apache.logging.log4j.core.config.Configurator
 import kotlin.coroutines.CoroutineContext
 import kotlin.coroutines.cancellation.CancellationException
 
@@ -26,6 +28,9 @@ class SatoriBot(
 
     init {
         GlobalLoggerFactory.factory = SatoriLoggerFactory()
+        if (configProperties.debug) {
+            Configurator.setLevel("com.github.nyayurn.yutori", Level.DEBUG)
+        }
     }
 
     private val satoriConfig = bot.configProperties.bot.satori

src/main/kotlin/kurenai/imsyncbot/bot/satori/SatoriHandler.kt

@@ -32,17 +32,31 @@ class SatoriHandler(val configProperties: ConfigProperties) {
 
         val content = event.message.content
         val body = Jsoup.parse(content).body()
-        val text = body.text().escapeMarkdown()
+        var text = body.textNodes().joinToString().escapeMarkdown()
         val imgUrl = body.getElementsByTag("img").attr("src")
         val videoUrl = body.getElementsByTag("video").attr("src")
+        val quote = body.getElementsByTag("quote")
+
+        val author = quote.first()?.getElementsByTag("author")
+        val quoteName = author?.attr("name")?.escapeMarkdown() ?: ""
+        val quoteId = author?.attr("id") ?: ""
+        val quoteTitle = if (quoteId.isNotBlank()) "$quoteName($quoteId)" else ""
+        quote.takeIf { it.isNotEmpty() }?.let {
+            text = """
+                ```
+                $quoteTitle
+                ${quote.text()}
+                ```
+                $text
+            """.trimIndent()
+        }
 
 //        val at = body.getElementsByAttribute("at")  //TODO: don't work
 //
 //        at.attr("id").toLongOrNull()?.let { atId ->
 //            val atName = at.attr("name")
-//            val atTgId =
-//                if (atId == configProperties.bot.masterOfQq) configProperties.bot.masterOfTg else atId  //TODO: find bind user telegram id
-//            text = "[$atName](https://t.me/$atTgId) $text"
+//            val atTgId = if (atId == configProperties.bot.masterOfQq) configProperties.bot.masterOfTg else atId  //TODO: find bind user telegram id
+//            text = "[$atName](tg://user?id=$atTgId) $text"
 //        }
 
 

src/main/kotlin/kurenai/imsyncbot/bot/satori/SatoriLogger.kt

@@ -6,7 +6,7 @@ import com.github.nyayurn.yutori.LoggerFactory
 import kurenai.imsyncbot.utils.getLogger
 
 class SatoriLogger(
-    private val clazz: Class<*>
+    clazz: Class<*>
 ) : Logger {
 
     val log = getLogger(clazz.name)

src/main/resources/application.yaml

@@ -11,7 +11,6 @@ im-sync-bot:
       token: 1234567:adgcgasdfadf # tg机器人token
       username: your_bot_name  # tg机器人用户名
     #    base-url: http://api:8081  # 本地api
-  satori:
 
 
   handler: