chore: upgrade ronebot to 2.4.1
This commit is contained in:
8 files changed
+26
-27
No files matched your search
@@ -1,6 +1,6 @@
|
|||||||
[versions]
|
[versions]
|
||||||
kotlinVersion = "2.0.20"
|
kotlinVersion = "2.0.20"
|
||||||
ronebotVersion = "2.3.6"
|
ronebotVersion = "2.4.1"
|
||||||
shadowVersion = "8.3.0"
|
shadowVersion = "8.3.0"
|
||||||
okhttpVersion = "5.0.0-alpha.14"
|
okhttpVersion = "5.0.0-alpha.14"
|
||||||
exposedVersion = "0.53.0"
|
exposedVersion = "0.53.0"
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import cn.rtast.fancybot.util.Http
|
|||||||
import cn.rtast.rob.entity.GroupMessage
|
import cn.rtast.rob.entity.GroupMessage
|
||||||
import cn.rtast.rob.util.BaseCommand
|
import cn.rtast.rob.util.BaseCommand
|
||||||
import cn.rtast.rob.util.ob.MessageChain
|
import cn.rtast.rob.util.ob.MessageChain
|
||||||
import cn.rtast.rob.util.ob.asNode
|
import cn.rtast.rob.util.ob.toNode
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
import java.net.InetAddress
|
import java.net.InetAddress
|
||||||
@@ -80,7 +80,7 @@ class NslookupCommand : BaseCommand() {
|
|||||||
.build()
|
.build()
|
||||||
messages.add(msg)
|
messages.add(msg)
|
||||||
}
|
}
|
||||||
message.reply(messages.asNode(configManager.selfId))
|
message.reply(messages.toNode(configManager.selfId))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import cn.rtast.fancybot.util.Http
|
|||||||
import cn.rtast.rob.entity.GroupMessage
|
import cn.rtast.rob.entity.GroupMessage
|
||||||
import cn.rtast.rob.util.BaseCommand
|
import cn.rtast.rob.util.BaseCommand
|
||||||
import cn.rtast.rob.util.ob.MessageChain
|
import cn.rtast.rob.util.ob.MessageChain
|
||||||
import cn.rtast.rob.util.ob.asNode
|
import cn.rtast.rob.util.ob.toNode
|
||||||
import java.time.LocalDateTime
|
import java.time.LocalDateTime
|
||||||
import java.time.ZoneId
|
import java.time.ZoneId
|
||||||
import java.time.format.DateTimeFormatter
|
import java.time.format.DateTimeFormatter
|
||||||
@@ -46,6 +46,6 @@ class TheHistoryOfTodayCommand : BaseCommand() {
|
|||||||
.build()
|
.build()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
message.reply(messages.asNode(configManager.selfId))
|
message.reply(messages.toNode(configManager.selfId))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -50,8 +50,8 @@ import cn.rtast.rob.entity.GroupMessage
|
|||||||
import cn.rtast.rob.entity.PrivateMessage
|
import cn.rtast.rob.entity.PrivateMessage
|
||||||
import cn.rtast.rob.util.BaseCommand
|
import cn.rtast.rob.util.BaseCommand
|
||||||
import cn.rtast.rob.util.ob.MessageChain
|
import cn.rtast.rob.util.ob.MessageChain
|
||||||
import cn.rtast.rob.util.ob.asMessageChain
|
import cn.rtast.rob.util.ob.toMessageChain
|
||||||
import cn.rtast.rob.util.ob.asNode
|
import cn.rtast.rob.util.ob.toNode
|
||||||
import okhttp3.FormBody
|
import okhttp3.FormBody
|
||||||
import java.awt.AlphaComposite
|
import java.awt.AlphaComposite
|
||||||
import java.awt.Color
|
import java.awt.Color
|
||||||
@@ -97,7 +97,7 @@ class MinecraftWikiCommand : BaseCommand() {
|
|||||||
"s", "搜索" -> {
|
"s", "搜索" -> {
|
||||||
val searchKeyword = args.drop(1).joinToString(" ").trim()
|
val searchKeyword = args.drop(1).joinToString(" ").trim()
|
||||||
val messages = mutableListOf<MessageChain>()
|
val messages = mutableListOf<MessageChain>()
|
||||||
val headerMessage = listOf("结果如下:").asMessageChain()
|
val headerMessage = listOf("结果如下:").toMessageChain()
|
||||||
messages.add(headerMessage)
|
messages.add(headerMessage)
|
||||||
Http.get<MCWikiSearchResponse>(
|
Http.get<MCWikiSearchResponse>(
|
||||||
"$baseApiUrl/search/title",
|
"$baseApiUrl/search/title",
|
||||||
@@ -116,7 +116,7 @@ class MinecraftWikiCommand : BaseCommand() {
|
|||||||
.addText("https://zh.minecraft.wiki/w/${it.title.uriEncode}")
|
.addText("https://zh.minecraft.wiki/w/${it.title.uriEncode}")
|
||||||
messages.add(msg.build())
|
messages.add(msg.build())
|
||||||
}
|
}
|
||||||
message.reply(messages.asNode(configManager.selfId))
|
message.reply(messages.toNode(configManager.selfId))
|
||||||
}
|
}
|
||||||
|
|
||||||
else -> {
|
else -> {
|
||||||
@@ -132,18 +132,18 @@ class MinecraftWikiCommand : BaseCommand() {
|
|||||||
response = Http.get<MCWikiPageResponse>(response.redirectTarget)
|
response = Http.get<MCWikiPageResponse>(response.redirectTarget)
|
||||||
}
|
}
|
||||||
val messages = mutableListOf<MessageChain>()
|
val messages = mutableListOf<MessageChain>()
|
||||||
val headerMsg = listOf("标题${response.title}的内容如下").asMessageChain()
|
val headerMsg = listOf("标题${response.title}的内容如下").toMessageChain()
|
||||||
val footerMsg = listOf(
|
val footerMsg = listOf(
|
||||||
"数据来源: https://zh.minecraft.wiki",
|
"数据来源: https://zh.minecraft.wiki",
|
||||||
"协议: ${response.license.title}(${response.license.url})"
|
"协议: ${response.license.title}(${response.license.url})"
|
||||||
).asMessageChain(true)
|
).toMessageChain(true)
|
||||||
val bodyMsg = MessageChain.Builder()
|
val bodyMsg = MessageChain.Builder()
|
||||||
.addText(response.source.convertToHTML().extractPlainTextFromHtml())
|
.addText(response.source.convertToHTML().extractPlainTextFromHtml())
|
||||||
.build()
|
.build()
|
||||||
messages.add(headerMsg)
|
messages.add(headerMsg)
|
||||||
messages.add(bodyMsg)
|
messages.add(bodyMsg)
|
||||||
messages.add(footerMsg)
|
messages.add(footerMsg)
|
||||||
message.reply(messages.asNode(configManager.selfId))
|
message.reply(messages.toNode(configManager.selfId))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -548,7 +548,7 @@ class RCONCommand : BaseCommand() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
val messages = mutableListOf<MessageChain>()
|
val messages = mutableListOf<MessageChain>()
|
||||||
.also { it.add(listOf("所有配置如下").asMessageChain()) }
|
.also { it.add(listOf("所有配置如下").toMessageChain()) }
|
||||||
allRcons.forEach {
|
allRcons.forEach {
|
||||||
val msg = MessageChain.Builder()
|
val msg = MessageChain.Builder()
|
||||||
.addText("名称: ${it.name}")
|
.addText("名称: ${it.name}")
|
||||||
@@ -559,7 +559,7 @@ class RCONCommand : BaseCommand() {
|
|||||||
.build()
|
.build()
|
||||||
messages.add(msg)
|
messages.add(msg)
|
||||||
}
|
}
|
||||||
message.reply(messages.asNode(configManager.selfId))
|
message.reply(messages.toNode(configManager.selfId))
|
||||||
}
|
}
|
||||||
|
|
||||||
"add" -> {
|
"add" -> {
|
||||||
@@ -591,9 +591,9 @@ class RCONCommand : BaseCommand() {
|
|||||||
try {
|
try {
|
||||||
val result = rconManager.executeCommand(message.sender.userId, name, command)
|
val result = rconManager.executeCommand(message.sender.userId, name, command)
|
||||||
val messages = mutableListOf<MessageChain>()
|
val messages = mutableListOf<MessageChain>()
|
||||||
.also { it.add(listOf("执行结果如下").asMessageChain()) }
|
.also { it.add(listOf("执行结果如下").toMessageChain()) }
|
||||||
.also { it.add(listOf(result).asMessageChain()) }
|
.also { it.add(listOf(result).toMessageChain()) }
|
||||||
.asNode(configManager.selfId)
|
.toNode(configManager.selfId)
|
||||||
message.reply(messages)
|
message.reply(messages)
|
||||||
} catch (_: AuthFailedException) {
|
} catch (_: AuthFailedException) {
|
||||||
message.reply("执行失败, 密码不正确")
|
message.reply("执行失败, 密码不正确")
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import cn.rtast.rob.entity.GroupMessage
|
|||||||
import cn.rtast.rob.enums.ArrayMessageType
|
import cn.rtast.rob.enums.ArrayMessageType
|
||||||
import cn.rtast.rob.util.BaseCommand
|
import cn.rtast.rob.util.BaseCommand
|
||||||
import cn.rtast.rob.util.ob.MessageChain
|
import cn.rtast.rob.util.ob.MessageChain
|
||||||
import cn.rtast.rob.util.ob.asMessageChain
|
import cn.rtast.rob.util.ob.toMessageChain
|
||||||
import com.madgag.gif.fmsware.GifDecoder
|
import com.madgag.gif.fmsware.GifDecoder
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.withContext
|
import kotlinx.coroutines.withContext
|
||||||
@@ -40,7 +40,6 @@ class AsciiArtCommand : BaseCommand() {
|
|||||||
private val font = Font("Monospaced", Font.PLAIN, FONT_SIZE)
|
private val font = Font("Monospaced", Font.PLAIN, FONT_SIZE)
|
||||||
private val logger = Logger.getLogger<AsciiArtCommand>()
|
private val logger = Logger.getLogger<AsciiArtCommand>()
|
||||||
val waitingList = mutableListOf<Long>()
|
val waitingList = mutableListOf<Long>()
|
||||||
private lateinit var imageBed: ImageBed
|
|
||||||
|
|
||||||
private fun BufferedImage.convertToAscii(): String {
|
private fun BufferedImage.convertToAscii(): String {
|
||||||
val width = this.width
|
val width = this.width
|
||||||
@@ -132,10 +131,10 @@ class AsciiArtCommand : BaseCommand() {
|
|||||||
return msg
|
return msg
|
||||||
}
|
}
|
||||||
} catch (_: OutOfMemoryError) {
|
} catch (_: OutOfMemoryError) {
|
||||||
return listOf("GIF处理失败: 内存溢出").asMessageChain()
|
return listOf("GIF处理失败: 内存溢出").toMessageChain()
|
||||||
logger.info("GIF处理失败: 内存溢出")
|
logger.info("GIF处理失败: 内存溢出")
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
return listOf("处理GIF失败: ${e.message}").asMessageChain()
|
return listOf("处理GIF失败: ${e.message}").toMessageChain()
|
||||||
logger.info("gif处理失败: ${e.message}")
|
logger.info("gif处理失败: ${e.message}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import cn.rtast.rob.entity.GetMessage
|
|||||||
import cn.rtast.rob.entity.GroupMessage
|
import cn.rtast.rob.entity.GroupMessage
|
||||||
import cn.rtast.rob.enums.ArrayMessageType
|
import cn.rtast.rob.enums.ArrayMessageType
|
||||||
import cn.rtast.rob.util.ob.MessageChain
|
import cn.rtast.rob.util.ob.MessageChain
|
||||||
import cn.rtast.rob.util.ob.asNode
|
import cn.rtast.rob.util.ob.toNode
|
||||||
|
|
||||||
object ImageURLCommand {
|
object ImageURLCommand {
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ object ImageURLCommand {
|
|||||||
.build()
|
.build()
|
||||||
messages.add(msg)
|
messages.add(msg)
|
||||||
}
|
}
|
||||||
groupMessage.reply(messages.asNode(configManager.selfId))
|
groupMessage.reply(messages.toNode(configManager.selfId))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ import cn.rtast.fancybot.util.misc.toURL
|
|||||||
import cn.rtast.rob.entity.GetMessage
|
import cn.rtast.rob.entity.GetMessage
|
||||||
import cn.rtast.rob.entity.GroupMessage
|
import cn.rtast.rob.entity.GroupMessage
|
||||||
import cn.rtast.rob.util.ob.MessageChain
|
import cn.rtast.rob.util.ob.MessageChain
|
||||||
import cn.rtast.rob.util.ob.asNode
|
import cn.rtast.rob.util.ob.toNode
|
||||||
import okio.IOException
|
import okio.IOException
|
||||||
|
|
||||||
object ImageBedCommand {
|
object ImageBedCommand {
|
||||||
@@ -49,7 +49,7 @@ object ImageBedCommand {
|
|||||||
.build()
|
.build()
|
||||||
messages.add(msg)
|
messages.add(msg)
|
||||||
}
|
}
|
||||||
message.reply(messages.asNode(configManager.selfId))
|
message.reply(messages.toNode(configManager.selfId))
|
||||||
}
|
}
|
||||||
} catch (_: IOException) {
|
} catch (_: IOException) {
|
||||||
message.reply("上传失败: 图片已过期")
|
message.reply("上传失败: 图片已过期")
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ import cn.rtast.fancybot.util.str.fromArrayJson
|
|||||||
import cn.rtast.rob.entity.GroupMessage
|
import cn.rtast.rob.entity.GroupMessage
|
||||||
import cn.rtast.rob.util.ob.MessageChain
|
import cn.rtast.rob.util.ob.MessageChain
|
||||||
import cn.rtast.rob.util.ob.NodeMessageChain
|
import cn.rtast.rob.util.ob.NodeMessageChain
|
||||||
import cn.rtast.rob.util.ob.asNode
|
import cn.rtast.rob.util.ob.toNode
|
||||||
import java.io.File
|
import java.io.File
|
||||||
import java.net.URI
|
import java.net.URI
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ private fun getImages(r18: Boolean): NodeMessageChain {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return msg.asNode(configManager.selfId)
|
return msg.toNode(configManager.selfId)
|
||||||
}
|
}
|
||||||
|
|
||||||
class TenSetuItem : Item() {
|
class TenSetuItem : Item() {
|
||||||
|
|||||||
Reference in New Issue
Block a user