From ddad36b28d710dc0144dd5d99533245ee9f998ac Mon Sep 17 00:00:00 2001 From: RTAkland Date: Wed, 25 Sep 2024 12:51:34 +0800 Subject: [PATCH] chore: update lib --- gradle/libs.versions.toml | 2 +- src/main/kotlin/cn/rtast/fancybot/FancyBot.kt | 21 +----------------- .../commands/lookup/CigaretteCommand.kt | 13 +++++------ .../fancybot/commands/lookup/ShotCommand.kt | 22 +++++-------------- .../fancybot/commands/misc/TenSetuCommand.kt | 7 ++---- 5 files changed, 15 insertions(+), 50 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 502acc5..2d90271 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlinVersion = "2.0.10" -ronebotVersion = "1.10.0" +ronebotVersion = "1.10.1" shadowVersion = "8.3.0" okhttpVersion = "5.0.0-alpha.14" exposedVersion = "0.53.0" diff --git a/src/main/kotlin/cn/rtast/fancybot/FancyBot.kt b/src/main/kotlin/cn/rtast/fancybot/FancyBot.kt index 59c4e3c..a563850 100644 --- a/src/main/kotlin/cn/rtast/fancybot/FancyBot.kt +++ b/src/main/kotlin/cn/rtast/fancybot/FancyBot.kt @@ -7,36 +7,18 @@ package cn.rtast.fancybot -import cn.rtast.fancybot.commands.AboutCommand -import cn.rtast.fancybot.commands.EchoCommand -import cn.rtast.fancybot.commands.HelpCommand -import cn.rtast.fancybot.commands.StatusCommand -import cn.rtast.fancybot.commands.lookup.* -import cn.rtast.fancybot.commands.misc.* -import cn.rtast.fancybot.commands.niuzi.* import cn.rtast.fancybot.commands.parse.AsciiArtCommand import cn.rtast.fancybot.commands.parse.BVParseCommand import cn.rtast.fancybot.commands.parse.CalculateCommand import cn.rtast.fancybot.commands.parse.GitHubParseCommand import cn.rtast.fancybot.commands.parse.ImageURLCommand import cn.rtast.fancybot.commands.parse.ReverseGIFCommand -import cn.rtast.fancybot.commands.record.* import cn.rtast.fancybot.entity.bili.CardShare import cn.rtast.fancybot.entity.enums.WSType -import cn.rtast.fancybot.items.BaisiItem -import cn.rtast.fancybot.items.HeisiItem -import cn.rtast.fancybot.items.SetuItem -import cn.rtast.fancybot.util.file.ConfigManager -import cn.rtast.fancybot.util.file.NiuziBankManager -import cn.rtast.fancybot.util.file.NiuziManager import cn.rtast.fancybot.util.initDatabase -import cn.rtast.fancybot.util.item.ItemManager import cn.rtast.fancybot.util.str.fromJson import cn.rtast.rob.ROneBotFactory -import cn.rtast.rob.entity.AddFriendRequest -import cn.rtast.rob.entity.FileEvent -import cn.rtast.rob.entity.GroupMessage -import cn.rtast.rob.entity.GroupRevokeMessage +import cn.rtast.rob.entity.* import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.ob.MessageChain import cn.rtast.rob.util.ob.OneBotListener @@ -45,7 +27,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import java.io.File import java.net.URI -import java.time.Instant class FancyBot : OneBotListener { diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt index cc27dcc..7a1b163 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt @@ -11,7 +11,6 @@ import cn.rtast.fancybot.entity.cigarette.Cigarette import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage -import cn.rtast.rob.segment.Node import cn.rtast.rob.util.BaseCommand import cn.rtast.rob.util.ob.MessageChain import cn.rtast.rob.util.ob.NodeMessageChain @@ -42,8 +41,7 @@ class CigaretteCommand : BaseCommand() { val headerMsg = MessageChain.Builder() .addText("搜索到${result.totalCount}条结果, 仅展示前 $limit 条结果哦~") .build() - val headerNode = Node(Node.Data("", message.userId.toString(), headerMsg.finalArrayMsgList)) - nodeMsg.addNode(headerNode) + nodeMsg.addMessageChain(headerMsg, message.sender.userId) result.productList.asSequence().take(limit).forEach { val imageBase64 = URI(it.cover).toURL().readBytes().encodeToBase64() val tempMsg = MessageChain.Builder() @@ -55,14 +53,13 @@ class CigaretteCommand : BaseCommand() { .addText("参考价: 单盒: ${it.packPrice}元 | 整条: ${it.barPrice}元") .addNewLine() .build() - val tempNode = Node(Node.Data("", message.userId.toString(), tempMsg.finalArrayMsgList)) - nodeMsg.addNode(tempNode) + nodeMsg.addMessageChain(tempMsg, message.sender.userId) } val footerMsg = MessageChain.Builder() .addText("吸烟有害健康, 尽早戒烟有益健康。") .build() - val footerNode = Node(Node.Data("", message.userId.toString(), footerMsg.finalArrayMsgList)) - nodeMsg.addNode(footerNode) - listener.sendGroupForwardMsg(message.groupId, nodeMsg.build()) + nodeMsg.addMessageChain(footerMsg, message.sender.userId) + message.reply(nodeMsg.build()) + message.sender.groupPoke() } } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/ShotCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/ShotCommand.kt index 768fc26..bf228a4 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/ShotCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/ShotCommand.kt @@ -9,24 +9,17 @@ package cn.rtast.fancybot.commands.lookup import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType -import cn.rtast.rob.segment.Node -import cn.rtast.rob.segment.PlainText import cn.rtast.rob.util.BaseCommand +import cn.rtast.rob.util.ob.MessageChain import cn.rtast.rob.util.ob.NodeMessageChain import cn.rtast.rob.util.ob.OneBotListener -private fun generateNodeMessage(targetName: String, targetId: String, times: Int = 10): NodeMessageChain { +private fun generateNodeMessage(targetId: String, times: Int = 10): NodeMessageChain { val nodeMsg = NodeMessageChain.Builder() repeat(times) { - val node = Node( - Node.Data( - targetName, - targetId, - listOf(PlainText(PlainText.Data("我是傻逼"))) - ) - ) - nodeMsg.addNode(node) + val msg = MessageChain.Builder().addText("我是傻逼").build() + nodeMsg.addMessageChain(msg, targetId.toLong()) } return nodeMsg.build() } @@ -35,10 +28,7 @@ class ShotSelfCommand : BaseCommand() { override val commandNames = listOf("骂我") override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { - listener.sendGroupForwardMsg( - message.groupId, - generateNodeMessage(message.sender.nickname, message.sender.userId.toString()) - ) + listener.sendGroupForwardMsg(message.groupId, generateNodeMessage(message.sender.userId.toString())) } } @@ -53,6 +43,6 @@ class ShotOtherCommand : BaseCommand() { var times = if (args.size == 1) 10 else if (args.last() == "") 10 else args.last().toInt() if (times >= 200) times = 10 val target = message.message.find { it.type == ArrayMessageType.at }?.data!! - listener.sendGroupForwardMsg(message.groupId, generateNodeMessage(target.name!!, target.qq!!, times)) + listener.sendGroupForwardMsg(message.groupId, generateNodeMessage(target.qq!!, times)) } } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/TenSetuCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/TenSetuCommand.kt index e429c00..05c409b 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/TenSetuCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/TenSetuCommand.kt @@ -12,7 +12,6 @@ import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.fancybot.util.str.fromArrayJson import cn.rtast.rob.entity.GroupMessage -import cn.rtast.rob.segment.Node import cn.rtast.rob.util.BaseCommand import cn.rtast.rob.util.ob.MessageChain import cn.rtast.rob.util.ob.NodeMessageChain @@ -30,8 +29,7 @@ class TenSetuCommand : BaseCommand() { try { val imageBase64 = URI(it.urls.large).toURL().readBytes().encodeToBase64() val tempMsg = MessageChain.Builder().addImage(imageBase64, true).build() - val tempNode = Node(Node.Data("", message.userId.toString(), tempMsg.finalArrayMsgList)) - nodeMsg.addNode(tempNode) + nodeMsg.addMessageChain(tempMsg, message.sender.userId) } catch (_: Exception) { } } @@ -41,8 +39,7 @@ class TenSetuCommand : BaseCommand() { .addNewLine() .addText("因为过滤了R18的图片~") .build() - val footerNode = Node(Node.Data("", message.userId.toString(), footerMsg.finalArrayMsgList)) - nodeMsg.addNode(footerNode) + nodeMsg.addMessageChain(footerMsg, message.sender.userId) listener.sendGroupForwardMsg(message.groupId, nodeMsg.build()) } } \ No newline at end of file