RTAkland/FancyBot
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: improve some command

Browse Source
This commit is contained in:
RTAkland
2024-09-27 23:31:01 +08:00
parent e040819e61
commit bc04c53517
18 files changed
+138 -134
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt
+1 -3
View File
@@ -19,8 +19,6 @@ class AboutCommand : BaseCommand() {
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addNewLine()
.addText("Bot名称: FancyBot")
.addNewLine()
.addText("作者: RTAkland")
@@ -29,6 +27,6 @@ class AboutCommand : BaseCommand() {
.addNewLine()
.addText("项目地址: https://repo.rtast.cn/RTAkland/FancyBot")
.build()
listener.sendGroupMessage(message.groupId, msg)
message.reply(msg)
}
}
src/main/kotlin/cn/rtast/fancybot/commands/lookup/AICommand.kt
+2 -4
View File
@@ -30,14 +30,13 @@ class AICommand : BaseCommand() {
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
if (args.isEmpty()) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addText("发送`/ai [模型] <问题>`即可询问AI哦~")
.addNewLine()
.addText("不指定模型默认为从配置文件中读取 >>>${openAIModel}")
.addNewLine()
.addText("发送`/ai list`可以获取可用的模型列表~")
.build()
listener.sendGroupMessage(message.groupId, msg)
message.reply(msg)
return
}
@@ -48,12 +47,11 @@ class AICommand : BaseCommand() {
)
val modelsString = models.data.joinToString(", ") { it.id }
val msg = MessageChain.Builder()
.addReply(message.messageId)
.addText("可用的模型列表如下: ")
.addNewLine()
.addText(modelsString)
.build()
listener.sendGroupMessage(message.groupId, msg)
message.reply(msg)
return
}
src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt
+1 -3
View File
@@ -27,13 +27,11 @@ class CigaretteCommand : BaseCommand() {
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
if (args.isEmpty()) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addNewLine()
.addText("发送/tobacco <名称> [数量] 来搜索结果哦~")
.addNewLine()
.addText("最多只能显示出10条结果哦, 不指定数量的话默认是3条~")
.build()
listener.sendGroupMessage(message.groupId, msg)
message.reply(msg)
return
}
val limit = if (args.size == 1) 3 else if (args.last().toInt() > 10) 3 else args.last().toInt()
src/main/kotlin/cn/rtast/fancybot/commands/lookup/DomainPriceCommand.kt
+4 -8
View File
@@ -24,7 +24,7 @@ import java.awt.image.BufferedImage
@CommandDescription("查询域名价格")
class DomainPriceCommand : BaseCommand() {
override val commandNames = listOf("/domain")
override val commandNames = listOf("/domain", "/dp")
private val canvasWidth = 400
private val canvasHeight = 300
@@ -80,10 +80,9 @@ class DomainPriceCommand : BaseCommand() {
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
if (args.isEmpty()) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addText("发送`/domain <域名>`即可查询对应的注册和续费价格~")
.build()
listener.sendGroupMessage(message.groupId, msg)
message.reply(msg)
return
}
val suffix = args.first()
@@ -103,10 +102,7 @@ class DomainPriceCommand : BaseCommand() {
} else {
this.createDomainPriceCard(suffix, response.realPrice to response.price)
}
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addImage(cardImage, true)
.build()
listener.sendGroupMessage(message.groupId, msg)
val msg = MessageChain.Builder().addImage(cardImage, true).build()
message.reply(msg)
}
}
src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubUserCommand.kt
+4 -10
View File
@@ -69,11 +69,8 @@ class GithubUserCommand : BaseCommand() {
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
if (args.isEmpty()) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addText("发送`gh <用户名>`即可查询用户的信息~")
.build()
listener.sendGroupMessage(message.groupId, msg)
val msg = MessageChain.Builder().addText("发送`gh <用户名>`即可查询用户的信息~").build()
message.reply(msg)
return
}
val username = args.first()
@@ -82,10 +79,7 @@ class GithubUserCommand : BaseCommand() {
headers = mapOf("Authorization" to configManager.githubKey)
)
val image = this.createUserInfoCard(userInfo)
val msg = MessageChain.Builder()
.addReply(message.messageId)
.addImage(image, true)
.build()
listener.sendGroupMessage(message.groupId, msg)
val msg = MessageChain.Builder().addImage(image, true).build()
message.reply(msg)
}
}
src/main/kotlin/cn/rtast/fancybot/commands/lookup/MCPingCommand.kt
+1 -3
View File
@@ -24,13 +24,11 @@ class MCPingCommand : BaseCommand() {
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
if (args.isEmpty()) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addNewLine()
.addText("使用方法: /mcping <host>:[port] [java|be]")
.addNewLine()
.addText("不添加平台默认Java版~")
.build()
listener.sendGroupMessage(message.groupId, msg)
message.reply(msg)
return
}
val platform = if (args.size == 2) args.last() else "java"
src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt
+1 -2
View File
@@ -25,11 +25,10 @@ class NslookupCommand : BaseCommand() {
val host = args.joinToString(" ")
try {
val msg = MessageChain.Builder()
.addReply(message.messageId)
.addText("域名: ${host}解析后的IP地址为: ")
.addText(withContext(Dispatchers.IO) { InetAddress.getByName(host) }.hostAddress)
.build()
listener.sendGroupMessage(message.groupId, msg)
message.reply(msg)
} catch (_: UnknownHostException) {
message.reply("未知的主机名: $host")
} catch (e: Exception) {
src/main/kotlin/cn/rtast/fancybot/commands/lookup/PixivCommand.kt
+21 -20
View File
@@ -14,6 +14,7 @@ import cn.rtast.fancybot.util.str.encodeToBase64
import cn.rtast.rob.entity.GroupMessage
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
import java.net.URI
@@ -27,30 +28,35 @@ class PixivCommand : BaseCommand() {
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
if (args.isEmpty()) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addText("发送/pixiv <id> | rank 来进行操作哦~")
.addText("发送`/pixiv <id> | rank` 来进行操作哦~")
.build()
listener.sendGroupMessage(message.groupId, msg)
message.reply(msg)
return
}
when (val keyword = args.first()) {
"rank", "排名", "r" -> {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addText("今日Pixiv Ranking~")
.addNewLine()
val node = NodeMessageChain.Builder()
.addMessageChain(
MessageChain.Builder().addText("今日Pixiv Ranking~").build(),
message.sender.userId
)
val result = Http.get<Ranking>(pixivRankingURL)
result.contents.asSequence().take(5).forEach {
try {
val msg = MessageChain.Builder()
val imageBase64 = URI(it.getOriginUrl()).toURL().readBytes().encodeToBase64()
msg.addText(it.title)
.addImage(imageBase64, true)
msg.addImage(imageBase64, true)
.addText("标题: ${it.title}")
.addNewLine()
.addText("用户: ${it.userName}(${it.userId}) | 作品ID: ${it.illustId}")
.addNewLine()
.addText("日期: ${it.date}")
node.addMessageChain(msg.build(), message.sender.userId)
} catch (_: Exception) {
}
}
listener.sendGroupMessage(message.groupId, msg.build())
node.addMessageChain(MessageChain.Builder().addText("图片来源: Pixiv").build(), message.sender.userId)
message.reply(node.build())
return
}
@@ -58,19 +64,14 @@ class PixivCommand : BaseCommand() {
try {
val id = keyword.toLong()
val imageBase64 = URI("$imageProxyURL/$id.png").toURL().readBytes().encodeToBase64()
println(imageBase64)
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addText("来咯~ 你要的图片~~~")
.addImage(imageBase64, true)
.addText("图片来源: Pixiv")
.build()
listener.sendGroupMessage(message.groupId, msg)
message.reply(msg)
} catch (_: Exception) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addText("输入错误~检查一下有没有输错吧~")
.build()
listener.sendGroupMessage(message.groupId, msg)
val msg = MessageChain.Builder().addText("输入错误~检查一下有没有输错吧~").build()
message.reply(msg)
}
}
}
src/main/kotlin/cn/rtast/fancybot/commands/lookup/QRCodeCommand.kt
+1 -2
View File
@@ -20,9 +20,8 @@ class QRCodeCommand : BaseCommand() {
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
val content = args.joinToString(" ")
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addImage("https://api.rtast.cn/api/generate_qr?data=$content")
.build()
listener.sendGroupMessage(message.groupId, msg)
message.reply(msg)
}
}
src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRedeemCommand.kt
+8 -12
View File
@@ -22,7 +22,7 @@ class NiuziRedeemCommand : BaseCommand() {
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
if (args.isEmpty()) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addReply(message.messageId)
.addText("发送 /rdm <物品名称> 即可兑换哦!")
.addNewLine()
.addText("发送 /rdm list 即可查看所有可兑换的物品~")
@@ -35,7 +35,7 @@ class NiuziRedeemCommand : BaseCommand() {
val status = niuziManager.getUser(message.sender.userId)
if (status == null) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addReply(message.messageId)
.addText("你还没有签到过呢要签到一次才能兑换哦~")
.build()
listener.sendGroupMessage(message.groupId, msg)
@@ -44,19 +44,15 @@ class NiuziRedeemCommand : BaseCommand() {
val item = args.first()
if (item == "list" || item == "列表") {
val priceTable =
itemManager.items.joinToString("\n") { "[${it.itemNames.joinToString("|")}]:${it.itemPrice}积分" }
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addNewLine()
.addText(priceTable)
.build()
listener.sendGroupMessage(message.groupId, msg)
itemManager.items.joinToString("\n")
{ "[${it.itemNames.joinToString("|")}]:${it.itemPrice}cm" }
message.reply(priceTable)
return
}
val selectedItem = itemManager.items.find { it.itemNames.any { any -> any == item } }
if (selectedItem == null) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addReply(message.messageId)
.addText("没有找到你想兑换的东西呢")
.addNewLine()
.addText("你可以发送 /rdm list来查看所有可兑换的物品")
@@ -67,7 +63,7 @@ class NiuziRedeemCommand : BaseCommand() {
val selectedItemPrice = selectedItem.itemPrice
if (selectedItemPrice > status.length) {
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addReply(message.messageId)
.addText("你的牛子长度不够兑换这个物品呢~")
.addNewLine()
.addText("你有: ${status.length}cm, 兑换需要: $selectedItemPrice cm~\"")
@@ -77,7 +73,7 @@ class NiuziRedeemCommand : BaseCommand() {
}
val afterStatus = niuziManager.redeemItem(message.sender.userId, selectedItemPrice)?.length!!
val msg = MessageChain.Builder()
.addAt(message.sender.userId)
.addReply(message.messageId)
.addText("兑换成功正在发送奖品中~")
.addNewLine()
.addText("你花费了${selectedItemPrice}cm来兑换奖品, 还剩${afterStatus}cm")
src/main/kotlin/cn/rtast/fancybot/commands/parse/BVParseCommand.kt
+26 -5
View File
@@ -7,18 +7,17 @@
package cn.rtast.fancybot.commands.parse
import cn.rtast.fancybot.entity.bili.ShortUrl
import cn.rtast.fancybot.entity.bili.UserStat
import cn.rtast.fancybot.entity.bili.VideoStat
import cn.rtast.fancybot.entity.bili.ViewCount
import cn.rtast.fancybot.entity.bili.*
import cn.rtast.fancybot.util.Http
import cn.rtast.fancybot.util.Resources
import cn.rtast.fancybot.util.drawCustomImage
import cn.rtast.fancybot.util.str.encodeToBase64
import cn.rtast.fancybot.util.str.formatNumber
import cn.rtast.fancybot.util.str.fromJson
import cn.rtast.fancybot.util.str.setTruncate
import cn.rtast.fancybot.util.toByteArray
import cn.rtast.rob.entity.GroupMessage
import cn.rtast.rob.enums.ArrayMessageType
import cn.rtast.rob.util.ob.MessageChain
import cn.rtast.rob.util.ob.OneBotListener
import okhttp3.OkHttpClient
@@ -150,7 +149,29 @@ object BVParseCommand {
}
}
suspend fun parse(listener: OneBotListener, bvid: String, message: GroupMessage) {
suspend fun parse(listener: OneBotListener, message: GroupMessage) {
// parse bilibili video with a link, bvid or b23.tv link
val bvid = if (message.rawMessage.startsWith("BV")) {
message.rawMessage
} else if (message.rawMessage.split(" ").last().startsWith("https://b23.tv/")) {
val shortUrl = message.rawMessage.split(" ").last()
BVParseCommand.getShortUrlBVID(shortUrl)
} else if (message.message.find { it.type == ArrayMessageType.json } != null) {
val card = message.message.find { it.type == ArrayMessageType.json }!!
.data.data!!.toString().fromJson<CardShare>()
val shortUrl = if (card.meta.detail == null) {
if (!card.meta.news?.tag!!.contains("哔哩哔哩")) return
card.meta.news.jumpUrl
} else {
if (!card.meta.detail.title.contains("哔哩哔哩")) return
card.meta.detail.qqDocUrl
}
BVParseCommand.getShortUrlBVID(shortUrl)
} else {
message.rawMessage.split("?").first()
.split("/")
.last { it.isNotEmpty() && it.isNotBlank() }
}
val videoInfo = this.getVideoStat(bvid)
val viewCount = this.getViewCount(bvid, videoInfo.data.cid)
val shortUrl = this.generateShortUrl(bvid, videoInfo.data.aid)