fix: fix music command not work and bump ronebot version
This commit is contained in:
20 files changed
+60
-67
No files matched your search
@@ -14,7 +14,6 @@ import cn.rtast.fancybot.entity.gpt.ChatCompletionsResponse
|
||||
import cn.rtast.fancybot.entity.gpt.LlamaResponse
|
||||
import cn.rtast.fancybot.entity.gpt.ModelList
|
||||
import cn.rtast.fancybot.enums.CommandAction
|
||||
import cn.rtast.fancybot.instance
|
||||
import cn.rtast.fancybot.util.Http
|
||||
import cn.rtast.fancybot.util.file.insertActionRecord
|
||||
import cn.rtast.fancybot.util.str.toJson
|
||||
@@ -70,7 +69,7 @@ class AICommand : BaseCommand() {
|
||||
.addText(response.choices.first().message.content)
|
||||
.build()
|
||||
nodeMsg.addMessageChain(msg, configManager.selfId)
|
||||
instance.action.sendGroupForwardMsg(message.groupId, nodeMsg.build())
|
||||
message.action.sendGroupForwardMsg(message.groupId, nodeMsg.build())
|
||||
insertActionRecord(CommandAction.AI, message.sender.userId, "$content-$model-GPT")
|
||||
}
|
||||
}
|
||||
@@ -97,7 +96,7 @@ class LlamaCommand : BaseCommand() {
|
||||
.addText(response.message.content)
|
||||
.build()
|
||||
nodeMsg.addMessageChain(msg, configManager.selfId)
|
||||
instance.action.sendGroupForwardMsg(message.groupId, nodeMsg.build())
|
||||
message.action.sendGroupForwardMsg(message.groupId, nodeMsg.build())
|
||||
insertActionRecord(CommandAction.AI, message.sender.userId, "$prompt-LLAMA")
|
||||
}
|
||||
}
|
||||
@@ -10,7 +10,6 @@ package cn.rtast.fancybot.commands.lookup
|
||||
import cn.rtast.fancybot.annotations.CommandDescription
|
||||
import cn.rtast.fancybot.configManager
|
||||
import cn.rtast.fancybot.entity.bgm.BGMSearch
|
||||
import cn.rtast.fancybot.instance
|
||||
import cn.rtast.fancybot.util.Http
|
||||
import cn.rtast.fancybot.util.str.encodeToBase64
|
||||
import cn.rtast.rob.entity.GroupMessage
|
||||
@@ -59,7 +58,7 @@ class AnimeSearchCommand : BaseCommand() {
|
||||
}
|
||||
val footerNode = MessageChain.Builder().addText("数据来源: Bangumi").build()
|
||||
nodeMsg.addMessageChain(footerNode, configManager.selfId)
|
||||
instance.action.sendGroupForwardMsg(message.groupId, nodeMsg.build())
|
||||
message.action.sendGroupForwardMsg(message.groupId, nodeMsg.build())
|
||||
} catch (_: Exception) {
|
||||
message.reply("没有搜索到结果呢~")
|
||||
}
|
||||
|
||||
@@ -114,7 +114,7 @@ class MusicCommand : BaseCommand() {
|
||||
val msg = MessageChain.Builder()
|
||||
.addMusicShare(MusicShareType.Netease, result.toString())
|
||||
.build()
|
||||
message.reply(msg)
|
||||
message.action.sendGroupMessage(message.groupId, msg)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -162,6 +162,6 @@ class QQMusicCommand : BaseCommand() {
|
||||
mapOf("key" to keyword)
|
||||
).response.data.song.list.first().songId
|
||||
val msg = MessageChain.Builder().addMusicShare(MusicShareType.QQ, response.toString()).build()
|
||||
message.reply(msg)
|
||||
message.action.sendGroupMessage(message.groupId, msg)
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,6 @@
|
||||
package cn.rtast.fancybot.commands.lookup
|
||||
|
||||
import cn.rtast.fancybot.annotations.CommandDescription
|
||||
import cn.rtast.fancybot.instance
|
||||
import cn.rtast.rob.entity.GroupMessage
|
||||
import cn.rtast.rob.enums.ArrayMessageType
|
||||
import cn.rtast.rob.util.BaseCommand
|
||||
@@ -31,7 +30,7 @@ class ShotSelfCommand : BaseCommand() {
|
||||
override val commandNames = listOf("骂我")
|
||||
|
||||
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
|
||||
instance.action.sendGroupForwardMsg(message.groupId, generateNodeMessage(message.sender.userId.toString()))
|
||||
message.action.sendGroupForwardMsg(message.groupId, generateNodeMessage(message.sender.userId.toString()))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -41,7 +40,7 @@ class ShotOtherCommand : BaseCommand() {
|
||||
|
||||
override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List<String>) {
|
||||
if (args.isEmpty()) {
|
||||
instance.action.sendGroupForwardMsg(
|
||||
message.action.sendGroupForwardMsg(
|
||||
message.groupId, generateNodeMessage(message.sender.userId.toString(), 20)
|
||||
)
|
||||
return
|
||||
@@ -49,6 +48,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!!
|
||||
instance.action.sendGroupForwardMsg(message.groupId, generateNodeMessage(target.qq!!, times))
|
||||
message.action.sendGroupForwardMsg(message.groupId, generateNodeMessage(target.qq!!, times))
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user