From f36c008edff677d30a75f959bcff4a73f1b47aff Mon Sep 17 00:00:00 2001 From: RTAkland Date: Thu, 19 Sep 2024 11:06:40 +0800 Subject: [PATCH] feat: add zibi and unset zibi command, bump rob to 1.8.4 --- gradle/libs.versions.toml | 2 +- src/main/kotlin/cn/rtast/fancybot/FancyBot.kt | 12 +++++-- .../rtast/fancybot/commands/AboutCommand.kt | 4 +-- .../fancybot/commands/AntiRevokeCommand.kt | 10 ++++-- .../fancybot/commands/CompilerCommand.kt | 4 +-- .../cn/rtast/fancybot/commands/EchoCommand.kt | 4 +-- .../rtast/fancybot/commands/FKXQSCommand.kt | 4 +-- .../cn/rtast/fancybot/commands/HelpCommand.kt | 4 +-- .../fancybot/commands/HitokotoCommand.kt | 4 +-- .../rtast/fancybot/commands/LikeMeCommand.kt | 4 +-- .../cn/rtast/fancybot/commands/RUACommand.kt | 4 +-- .../rtast/fancybot/commands/RemakeCommand.kt | 4 +-- .../fancybot/commands/SendMailCommand.kt | 4 +-- .../cn/rtast/fancybot/commands/ZiBiCommand.kt | 31 +++++++++++++++++-- .../commands/lookup/CigaretteCommand.kt | 4 +-- .../commands/lookup/DomainPriceCommand.kt | 4 +-- .../fancybot/commands/lookup/GPTCommand.kt | 4 +-- .../commands/lookup/GithubUserCommand.kt | 4 +-- .../fancybot/commands/lookup/MCPingCommand.kt | 4 +-- .../fancybot/commands/lookup/MusicCommand.kt | 8 ++--- .../commands/lookup/NslookupCommand.kt | 4 +-- .../fancybot/commands/lookup/PixivCommand.kt | 4 +-- .../fancybot/commands/lookup/QRCodeCommand.kt | 4 +-- .../commands/lookup/WeatherCommand.kt | 4 +-- .../fancybot/commands/parse/BVParseCommand.kt | 4 +-- .../commands/parse/GitHubParseCommand.kt | 4 +-- .../commands/parse/ImageURLCommand.kt | 4 +-- .../commands/parse/ReverseGIFCommand.kt | 4 +-- .../fancybot/commands/record/JrrpCommand.kt | 4 +-- .../commands/record/MyPointCommand.kt | 4 +-- .../fancybot/commands/record/NiuziCommand.kt | 8 ++--- .../fancybot/commands/record/RedeemCommand.kt | 4 +-- .../fancybot/commands/record/SignCommand.kt | 4 +-- .../cn/rtast/fancybot/items/BaisiItem.kt | 5 ++- .../cn/rtast/fancybot/items/HeisiItem.kt | 4 +-- .../cn/rtast/fancybot/items/SetuItem.kt | 4 +-- .../fancybot/util/file/BadWordManager.kt | 2 +- .../cn/rtast/fancybot/util/item/Item.kt | 10 +++--- 38 files changed, 120 insertions(+), 84 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 21e03b3..890a1f0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlinVersion = "2.0.10" -ronebotVersion = "1.8.1" +ronebotVersion = "1.8.4" 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 483a3bf..ad4c0fe 100644 --- a/src/main/kotlin/cn/rtast/fancybot/FancyBot.kt +++ b/src/main/kotlin/cn/rtast/fancybot/FancyBot.kt @@ -45,14 +45,15 @@ 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.GetMessage import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.entity.GroupRevokeMessage import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener -class FancyBot : OBMessage { +class FancyBot : OneBotListener { override suspend fun onGroupMessage(message: GroupMessage, json: String) { val sender = message.sender.nickname @@ -130,6 +131,10 @@ class FancyBot : OBMessage { override suspend fun onWebsocketErrorEvent(ex: Exception) { ex.printStackTrace() } + + override suspend fun onAddFriendRequest(event: AddFriendRequest) { + event.approve() + } } val configManager = ConfigManager() @@ -159,7 +164,8 @@ val commands = listOf( CompilerCommand(), GPTCommand(), GithubUserCommand(), AboutCommand(), MusicPlayUrlCommand(), DomainPriceCommand(), - SendMailCommand(), ZiBiCommand() + SendMailCommand(), ZiBiCommand(), + UnsetZiBiCommand() ) suspend fun main() { diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt index 5c27380..818b5bf 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt @@ -10,12 +10,12 @@ package cn.rtast.fancybot.commands 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class AboutCommand : BaseCommand() { override val commandNames = listOf("/about", "/关于") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { val msg = MessageChain.Builder() .addAt(message.sender.userId) .addNewLine() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/AntiRevokeCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/AntiRevokeCommand.kt index c7f45ad..81fddf9 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/AntiRevokeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/AntiRevokeCommand.kt @@ -7,18 +7,22 @@ package cn.rtast.fancybot.commands +import cn.rtast.fancybot.configManager import cn.rtast.rob.entity.ArrayMessage import cn.rtast.rob.entity.GetMessage import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.BaseCommand import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class AntiRevokeCommand : BaseCommand() { override val commandNames = listOf("/revoke", "/rv", "/防撤回") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + if (message.sender.userId !in configManager.admins) { + message.reply("你不许用防撤回") + } val messageId = args.first().toLong() listener.getMessage(messageId, "revoke", message.groupId) val msg = MessageChain.Builder() @@ -29,7 +33,7 @@ class AntiRevokeCommand : BaseCommand() { } companion object { - suspend fun callback(listener: OBMessage, message: GetMessage) { + suspend fun callback(listener: OneBotListener, message: GetMessage) { val msgList = mutableListOf() msgList.add( ArrayMessage( diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/CompilerCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/CompilerCommand.kt index 31b7590..fa44026 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/CompilerCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/CompilerCommand.kt @@ -16,7 +16,7 @@ import cn.rtast.fancybot.util.str.toJson 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class CompilerCommand : BaseCommand() { override val commandNames = listOf("/compiler", "/exec") @@ -24,7 +24,7 @@ class CompilerCommand : BaseCommand() { private val kotlinCompilerServer = "https://api.kotlinlang.org/api/2.0.20/compiler/run" private val glotCompilerServer = "https://glot.io/run" - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/EchoCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/EchoCommand.kt index a277ba6..54d894e 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/EchoCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/EchoCommand.kt @@ -9,12 +9,12 @@ package cn.rtast.fancybot.commands import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class EchoCommand : BaseCommand() { override val commandNames = listOf("/echo") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { listener.sendGroupMessage(message.groupId, args.joinToString(" ")) } } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/FKXQSCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/FKXQSCommand.kt index e3436de..82cea65 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/FKXQSCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/FKXQSCommand.kt @@ -12,12 +12,12 @@ import cn.rtast.fancybot.util.Http 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class FKXQSCommand : BaseCommand() { override val commandNames = listOf("/fkxqs", "/fk", "/疯狂星期四") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { val response = Http.get("https://api.shadiao.pro/kfc").data.text val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt index db0c3cb..6c28ee6 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt @@ -11,12 +11,12 @@ import cn.rtast.fancybot.commands 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class HelpCommand : BaseCommand() { override val commandNames = listOf("/help", "/帮助") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { val allCommands = commands.joinToString("\n") { "[${it.javaClass.name.split(".").last().replace("Command", "")}] 命令:${it.commandNames.joinToString(",")}" } diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/HitokotoCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/HitokotoCommand.kt index 9c32453..674aedf 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/HitokotoCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/HitokotoCommand.kt @@ -11,12 +11,12 @@ import cn.rtast.fancybot.util.Http 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class HitokotoCommand : BaseCommand() { override val commandNames = listOf("/hitokoto", "/1") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { val response = Http.get("https://v1.jinrishici.com/rensheng/mengxiang.txt") val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/LikeMeCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/LikeMeCommand.kt index b9dad6b..b59c8f5 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/LikeMeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/LikeMeCommand.kt @@ -10,12 +10,12 @@ package cn.rtast.fancybot.commands 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class LikeMeCommand : BaseCommand() { override val commandNames = listOf("赞我") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { listener.sendLike(message.sender.userId, 10) val msg = MessageChain.Builder() .addReply(message.messageId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/RUACommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/RUACommand.kt index 83e1cc0..6422bcb 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/RUACommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/RUACommand.kt @@ -11,12 +11,12 @@ import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.BaseCommand import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class RUACommand : BaseCommand() { override val commandNames = listOf("/rua", "rua") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/RemakeCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/RemakeCommand.kt index 4a7f75a..8dad73d 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/RemakeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/RemakeCommand.kt @@ -12,7 +12,7 @@ import cn.rtast.fancybot.util.randomBooleanWithProbability 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class RemakeCommand : BaseCommand() { override val commandNames = listOf("/remake", "/重开", "remake", "重开") @@ -28,7 +28,7 @@ class RemakeCommand : BaseCommand() { "鸽子", "鼠鼠", "化石", "狗狗" ) - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { val isSuccess = randomBooleanWithProbability(0.7) val msg = MessageChain.Builder().addReply(message.messageId) if (isSuccess) { diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/SendMailCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/SendMailCommand.kt index b61a9ef..d60df47 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/SendMailCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/SendMailCommand.kt @@ -11,7 +11,7 @@ import cn.rtast.fancybot.configManager 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener import org.simplejavamail.api.mailer.config.TransportStrategy import org.simplejavamail.email.EmailBuilder import org.simplejavamail.mailer.MailerBuilder @@ -40,7 +40,7 @@ class SendMailCommand : BaseCommand() { this.mailer.sendMail(email) } - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/ZiBiCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/ZiBiCommand.kt index 77e9f0f..2f8a26a 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/ZiBiCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/ZiBiCommand.kt @@ -8,21 +8,28 @@ package cn.rtast.fancybot.commands import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.entity.PrivateMessage import cn.rtast.rob.util.BaseCommand import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener + +val users = mutableMapOf() class ZiBiCommand : BaseCommand() { override val commandNames = listOf("/自闭", "自闭") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { try { + users.remove(message.sender.userId) val duration = if (args.isEmpty()) 1 else args.first().toInt() message.sender.ban(duration * 60) val msg = MessageChain.Builder() .addText("你先自闭${duration}分钟吧~") + .addNewLine() + .addText("私聊发送`我想开了`即可取消禁言~") .build() message.reply(msg) + users[message.sender.userId] = message.groupId } catch (_: Exception) { val msg = MessageChain.Builder() .addText("你输入有误所以我决定让你自闭1天~") @@ -31,4 +38,24 @@ class ZiBiCommand : BaseCommand() { message.sender.ban(86400) } } +} + +class UnsetZiBiCommand : BaseCommand() { + override val commandNames = listOf("我想开了") + + override suspend fun executePrivate(listener: OneBotListener, message: PrivateMessage, args: List) { + if (!users.any { it.key == message.sender.userId }) { + val msg = MessageChain.Builder() + .addText("你没有在自闭列表中~") + .build() + message.reply(msg) + return + } + listener.setGroupBan(users.getValue(message.sender.userId), message.sender.userId, 0) + val msg = MessageChain.Builder() + .addText("祝你天天开心不要自闭~~") + .build() + message.reply(msg) + users.remove(message.sender.userId) + } } \ No newline at end of file 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 ad54663..4f61925 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt @@ -12,12 +12,12 @@ import cn.rtast.fancybot.util.Http 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class CigaretteCommand : BaseCommand() { override val commandNames = listOf("/香烟", "/tobacco", "/cigarette") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/DomainPriceCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/DomainPriceCommand.kt index bb9d86f..051ba88 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/DomainPriceCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/DomainPriceCommand.kt @@ -16,7 +16,7 @@ import cn.rtast.fancybot.util.toByteArray 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener import java.awt.Color import java.awt.Font import java.awt.image.BufferedImage @@ -75,7 +75,7 @@ class DomainPriceCommand : BaseCommand() { } - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GPTCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GPTCommand.kt index 1946c79..02a410d 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GPTCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GPTCommand.kt @@ -16,12 +16,12 @@ import cn.rtast.fancybot.util.str.toJson 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class GPTCommand : BaseCommand() { override val commandNames = listOf("/gpt") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubUserCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubUserCommand.kt index f3e4980..a6b4fb6 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubUserCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubUserCommand.kt @@ -18,7 +18,7 @@ import cn.rtast.fancybot.util.toByteArray 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener import java.awt.Color import java.awt.Font import java.awt.image.BufferedImage @@ -65,7 +65,7 @@ class GithubUserCommand : BaseCommand() { return canvas.toByteArray().encodeToBase64() } - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MCPingCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MCPingCommand.kt index c5a5267..5a3be4d 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MCPingCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MCPingCommand.kt @@ -13,14 +13,14 @@ import cn.rtast.motdpinger.MotdPinger 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class MCPingCommand : BaseCommand() { override val commandNames = listOf("/mcping", "/mcPing") private val pingInstance = MotdPinger() - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MusicCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MusicCommand.kt index 4c78e8d..8650a8c 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MusicCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MusicCommand.kt @@ -16,7 +16,7 @@ import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.MusicShareType import cn.rtast.rob.util.BaseCommand import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener import java.time.Instant class MusicCommand : BaseCommand() { @@ -33,7 +33,7 @@ class MusicCommand : BaseCommand() { } } - private suspend fun legacyMusicCommand(listener: OBMessage, message: GroupMessage, args: List) { + private suspend fun legacyMusicCommand(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) @@ -104,7 +104,7 @@ class MusicCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.last() == "legacy" || args.last() == "l" || args.last() in "0".."4") { this.legacyMusicCommand(listener, message, args) return @@ -136,7 +136,7 @@ class MusicPlayUrlCommand : BaseCommand() { return Http.get("${configManager.ncmAPI}/song/url", mapOf("id" to id)).data.first().url } - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { val url = if (args.last() == "id" || args.last() == "i") { val id = args.first() this.getPlayUrl(id) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt index 4a8fe96..9b3650a 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt @@ -10,13 +10,13 @@ package cn.rtast.fancybot.commands.lookup 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener import java.net.InetAddress class NslookupCommand : BaseCommand() { override val commandNames = listOf("/nslookup", "/ns") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { val msg = MessageChain.Builder() .addReply(message.messageId) .addText("域名: ${args.first()}解析后的IP地址为: ") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/PixivCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/PixivCommand.kt index a390151..777f14b 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/PixivCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/PixivCommand.kt @@ -12,7 +12,7 @@ import cn.rtast.fancybot.util.Http 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class PixivCommand : BaseCommand() { override val commandNames = listOf("/pixiv", "/p") @@ -20,7 +20,7 @@ class PixivCommand : BaseCommand() { private val pixivRankingURL = "https://proxy.rtast.cn/https/www.pixiv.net/ranking.php?format=json&mode=daily&p=1" private val imageProxyURL = "https://pixiv.nl" - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/QRCodeCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/QRCodeCommand.kt index e874004..2c619d3 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/QRCodeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/QRCodeCommand.kt @@ -10,12 +10,12 @@ package cn.rtast.fancybot.commands.lookup 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class QRCodeCommand : BaseCommand() { override val commandNames = listOf("/qrcode", "/qr", "/二维码") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { val content = args.joinToString(" ") val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WeatherCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WeatherCommand.kt index 3953d25..ec1527c 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WeatherCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WeatherCommand.kt @@ -20,7 +20,7 @@ import cn.rtast.fancybot.util.toByteArray 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener import java.awt.Color import java.awt.Font import java.awt.image.BufferedImage @@ -56,7 +56,7 @@ class WeatherCommand : BaseCommand() { return emptyImage.toByteArray().encodeToBase64() } - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/parse/BVParseCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/parse/BVParseCommand.kt index b132775..41fd9cc 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/BVParseCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/BVParseCommand.kt @@ -20,7 +20,7 @@ import cn.rtast.fancybot.util.str.setTruncat import cn.rtast.fancybot.util.toByteArray import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener import okhttp3.OkHttpClient import okhttp3.Request import java.awt.Color @@ -150,7 +150,7 @@ object BVParseCommand { } } - suspend fun parse(listener: OBMessage, bvid: String, message: GroupMessage) { + suspend fun parse(listener: OneBotListener, bvid: String, message: GroupMessage) { val videoInfo = this.getVideoStat(bvid) val viewCount = this.getViewCount(bvid, videoInfo.data.cid) val shortUrl = this.generateShortUrl(bvid, videoInfo.data.aid) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/parse/GitHubParseCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/parse/GitHubParseCommand.kt index 27845a6..a2a1970 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/GitHubParseCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/GitHubParseCommand.kt @@ -19,7 +19,7 @@ import cn.rtast.fancybot.util.str.setTruncat import cn.rtast.fancybot.util.toByteArray import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener import java.awt.Color import java.awt.Font import java.awt.RenderingHints @@ -114,7 +114,7 @@ object GitHubParseCommand { return canvas.toByteArray().encodeToBase64() } - suspend fun parse(listener: OBMessage, message: GroupMessage) { + suspend fun parse(listener: OneBotListener, message: GroupMessage) { val path = message.rawMessage .replace(".git", "") .replace("https://github.com/", "") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/parse/ImageURLCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/parse/ImageURLCommand.kt index 2a1caaa..6c3edf8 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/ImageURLCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/ImageURLCommand.kt @@ -10,11 +10,11 @@ package cn.rtast.fancybot.commands.parse import cn.rtast.rob.entity.GetMessage import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener object ImageURLCommand { - suspend fun callback(listener: OBMessage, message: GetMessage) { + suspend fun callback(listener: OneBotListener, message: GetMessage) { val msg = MessageChain.Builder() .addReply(message.data.messageId) .addText("哈哈哈哈图片来咯~") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/parse/ReverseGIFCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/parse/ReverseGIFCommand.kt index c06fcc9..e6d51a5 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/ReverseGIFCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/ReverseGIFCommand.kt @@ -11,7 +11,7 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GetMessage import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener import com.madgag.gif.fmsware.AnimatedGifEncoder import com.madgag.gif.fmsware.GifDecoder import java.io.ByteArrayOutputStream @@ -37,7 +37,7 @@ object ReverseGIFCommand { return gifBytes.encodeToBase64() } - suspend fun callback(listener: OBMessage, message: GetMessage) { + suspend fun callback(listener: OneBotListener, message: GetMessage) { val gifUrl = if (message.data.message.find { it.type == ArrayMessageType.mface } == null) { message.data.message.find { it.type == ArrayMessageType.image }!!.data.file!! } else { diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/record/JrrpCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/record/JrrpCommand.kt index e6b1711..24c47f6 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/record/JrrpCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/record/JrrpCommand.kt @@ -11,14 +11,14 @@ import cn.rtast.fancybot.util.file.JrrpManager 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class JrrpCommand : BaseCommand() { override val commandNames = listOf("/jrrp", "/今日人品") private val jrrpManager = JrrpManager() - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (jrrpManager.isJrrped(message.sender.userId)) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/record/MyPointCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/record/MyPointCommand.kt index add8ff5..109b548 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/record/MyPointCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/record/MyPointCommand.kt @@ -13,12 +13,12 @@ import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.UserRole import cn.rtast.rob.util.BaseCommand import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class MyPointCommand : BaseCommand() { override val commandNames = listOf("/我的点数", "/mp") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { // query target's point if (args.isNotEmpty() && (message.sender.role == UserRole.admin || message.sender.userId in configManager.admins)) { val targetId = args.first().toLong() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/record/NiuziCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/record/NiuziCommand.kt index 4415525..d821439 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/record/NiuziCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/record/NiuziCommand.kt @@ -12,12 +12,12 @@ import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.BaseCommand import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class NiuziSignCommand : BaseCommand() { override val commandNames = listOf("牛子签到") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (niuziManager.isSigned(message.sender.userId)) { val msg = MessageChain.Builder() .addAt(message.sender.userId) @@ -40,7 +40,7 @@ class NiuziSignCommand : BaseCommand() { class JiJianCommand : BaseCommand() { override val commandNames = listOf("击剑", "jj") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) @@ -126,7 +126,7 @@ class JiJianCommand : BaseCommand() { class MyNiuziCommand : BaseCommand() { override val commandNames = listOf("我的牛子") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { val niuzi = niuziManager.getUser(message.sender.userId) if (niuzi == null) { val msg = MessageChain.Builder() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/record/RedeemCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/record/RedeemCommand.kt index a58d99b..593b55f 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/record/RedeemCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/record/RedeemCommand.kt @@ -12,12 +12,12 @@ import cn.rtast.fancybot.signManager 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class RedeemCommand : BaseCommand() { override val commandNames = listOf("/redeem", "/兑换", "/rdm") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/record/SignCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/record/SignCommand.kt index 65d3c66..a2590da 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/record/SignCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/record/SignCommand.kt @@ -11,13 +11,13 @@ import cn.rtast.fancybot.signManager 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.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class SignCommand : BaseCommand() { override val commandNames = listOf("/签到", "/sign") - override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List) { + override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { if (signManager.isSigned(message.sender.userId)) { val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt index 68604ab..c23b52a 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt @@ -12,19 +12,18 @@ import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.item.Item import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class BaisiItem : Item() { override val itemNames = listOf("baisi", "白丝", "bs") override val itemPrice = 70 - override suspend fun redeemInGroup(listener: OBMessage, message: GroupMessage, after: Long) { + override suspend fun redeemInGroup(listener: OneBotListener, message: GroupMessage, after: Long) { val url = Http.get("https://v2.api-m.com/api/baisi").data val msg = MessageChain.Builder() .addAt(message.sender.userId) .addImage(url) .build() listener.sendGroupMessage(message.groupId, msg) - } } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt index 3f51806..ae61f2b 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt @@ -12,13 +12,13 @@ import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.item.Item import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class HeisiItem : Item() { override val itemNames = listOf("heisi", "黑丝", "hs") override val itemPrice = 70 - override suspend fun redeemInGroup(listener: OBMessage, message: GroupMessage, after: Long) { + override suspend fun redeemInGroup(listener: OneBotListener, message: GroupMessage, after: Long) { val url = Http.get("https://v2.api-m.com/api/heisi").data val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt index d92dafb..4ce0302 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt @@ -12,13 +12,13 @@ import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.item.Item import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener class SetuItem : Item() { override val itemNames = listOf("setu", "色图", "st") override val itemPrice = 80 - override suspend fun redeemInGroup(listener: OBMessage, message: GroupMessage, after: Long) { + override suspend fun redeemInGroup(listener: OneBotListener, message: GroupMessage, after: Long) { val url = Http.get("https://api.rtast.cn/api/setu").urls.large val msg = MessageChain.Builder() .addAt(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/util/file/BadWordManager.kt b/src/main/kotlin/cn/rtast/fancybot/util/file/BadWordManager.kt index 332775b..00f54ef 100644 --- a/src/main/kotlin/cn/rtast/fancybot/util/file/BadWordManager.kt +++ b/src/main/kotlin/cn/rtast/fancybot/util/file/BadWordManager.kt @@ -9,7 +9,7 @@ package cn.rtast.fancybot.util.file import cn.rtast.fancybot.util.JsonFileHandler -class BadWordManager: JsonFileHandler>("bd.json", listOf()) { +class BadWordManager : JsonFileHandler>("bd.json", listOf()) { fun contain(word: String): Boolean { return this.read>().any { word.contains(it) } diff --git a/src/main/kotlin/cn/rtast/fancybot/util/item/Item.kt b/src/main/kotlin/cn/rtast/fancybot/util/item/Item.kt index 575b89c..6f97677 100644 --- a/src/main/kotlin/cn/rtast/fancybot/util/item/Item.kt +++ b/src/main/kotlin/cn/rtast/fancybot/util/item/Item.kt @@ -9,21 +9,21 @@ package cn.rtast.fancybot.util.item import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.entity.PrivateMessage -import cn.rtast.rob.util.ob.OBMessage +import cn.rtast.rob.util.ob.OneBotListener abstract class Item { abstract val itemNames: List abstract val itemPrice: Int - protected open suspend fun redeemInGroup(listener: OBMessage, message: GroupMessage, after: Long) {} + protected open suspend fun redeemInGroup(listener: OneBotListener, message: GroupMessage, after: Long) {} - protected open suspend fun redeemInPrivate(listener: OBMessage, message: PrivateMessage, after: Long) {} + protected open suspend fun redeemInPrivate(listener: OneBotListener, message: PrivateMessage, after: Long) {} - suspend fun redeemGroup(listener: OBMessage, message: GroupMessage, after: Long) { + suspend fun redeemGroup(listener: OneBotListener, message: GroupMessage, after: Long) { this.redeemInGroup(listener, message, after) } - suspend fun redeemPrivate(listener: OBMessage, message: PrivateMessage, after: Long) { + suspend fun redeemPrivate(listener: OneBotListener, message: PrivateMessage, after: Long) { this.redeemInPrivate(listener, message, after) } } \ No newline at end of file