From 2c0ca2f7395f8e50b12d1db6d093911ee0ffcbbb Mon Sep 17 00:00:00 2001 From: RTAkland Date: Thu, 31 Oct 2024 14:02:04 +0800 Subject: [PATCH] chore: bump rob --- gradle/libs.versions.toml | 2 +- src/main/kotlin/cn/rtast/fancybot/FancyBot.kt | 9 ++++---- .../rtast/fancybot/commands/AboutCommand.kt | 3 +-- .../cn/rtast/fancybot/commands/EchoCommand.kt | 5 ++-- .../cn/rtast/fancybot/commands/HelpCommand.kt | 3 +-- .../rtast/fancybot/commands/StatusCommand.kt | 3 +-- .../fancybot/commands/SupportMeCommand.kt | 8 +------ .../fancybot/commands/lookup/AICommand.kt | 5 ++-- .../commands/lookup/AnimeSearchCommand.kt | 3 +-- .../commands/lookup/CigaretteCommand.kt | 3 +-- .../commands/lookup/DomainPriceCommand.kt | 5 ++-- .../lookup/GithubLatestCommitCommand.kt | 3 +-- .../commands/lookup/GithubUserCommand.kt | 3 +-- .../commands/lookup/GravatarCommand.kt | 3 +-- .../commands/lookup/IdiomExplainCommand.kt | 3 +-- .../fancybot/commands/lookup/MusicCommand.kt | 11 ++++----- .../commands/lookup/NslookupCommand.kt | 3 +-- .../fancybot/commands/lookup/PixivCommand.kt | 3 +-- .../fancybot/commands/lookup/ShotCommand.kt | 5 ++-- .../fancybot/commands/lookup/TheCatCommand.kt | 3 +-- .../lookup/TheHistoryOfTodayCommand.kt | 3 +-- .../commands/lookup/WeatherCommand.kt | 3 +-- .../commands/lookup/WikipediaCommand.kt | 3 +-- .../commands/misc/AntiRevokeCommand.kt | 3 +-- .../commands/misc/BullShitGenerateCommand.kt | 3 +-- .../fancybot/commands/misc/CompilerCommand.kt | 3 +-- .../commands/misc/GaoKaoDaysRemainCommand.kt | 3 +-- .../fancybot/commands/misc/HTTPCatCommand.kt | 3 +-- .../fancybot/commands/misc/HTTPDogCommand.kt | 3 +-- .../fancybot/commands/misc/HitokotoCommand.kt | 3 +-- .../fancybot/commands/misc/JrrpCommand.kt | 3 +-- .../fancybot/commands/misc/JueCommand.kt | 3 +-- .../fancybot/commands/misc/KFCCommand.kt | 3 +-- .../commands/misc/MinecraftCommand.kt | 23 +++++++++---------- .../fancybot/commands/misc/PastebinCommand.kt | 3 +-- .../fancybot/commands/misc/QRCodeCommand.kt | 5 ++-- .../fancybot/commands/misc/RUACommand.kt | 3 +-- .../commands/misc/RandomMusicCommand.kt | 3 +-- .../fancybot/commands/misc/ReactionCommand.kt | 3 +-- .../fancybot/commands/misc/RemakeCommand.kt | 3 +-- .../fancybot/commands/misc/SendLikeCommand.kt | 4 +--- .../fancybot/commands/misc/SendMailCommand.kt | 3 +-- .../commands/misc/ShortLinkCommand.kt | 3 +-- .../fancybot/commands/misc/TTSCommand.kt | 3 +-- .../fancybot/commands/misc/TenSetuCommand.kt | 3 +-- .../commands/misc/TodayEatDrinkCommand.kt | 9 ++++---- .../fancybot/commands/misc/ZDJDCommand.kt | 3 +-- .../fancybot/commands/misc/ZiBiCommand.kt | 5 ++-- .../fancybot/commands/niuzi/MyNiuziCommand.kt | 3 +-- .../commands/niuzi/NiuziBankCommand.kt | 19 ++++++++------- .../commands/niuzi/NiuziJiJianCommand.kt | 3 +-- .../commands/niuzi/NiuziManagerCommand.kt | 5 ++-- .../commands/niuzi/NiuziQueryCommand.kt | 3 +-- .../commands/niuzi/NiuziRankCommand.kt | 5 ++-- .../commands/niuzi/NiuziRedeemCommand.kt | 5 ++-- .../commands/niuzi/NiuziSignCommand.kt | 5 ++-- .../commands/niuzi/NiuziTransferCommand.kt | 3 +-- .../commands/parse/AsciiArtCommand.kt | 3 +-- .../commands/parse/BilibiliParseCommand.kt | 5 ++-- .../commands/parse/ReverseGIFCommand.kt | 3 +-- .../fancybot/db/MinecraftAccessTokenTable.kt | 2 +- .../cn/rtast/fancybot/db/NiuziBankTable.kt | 2 +- .../kotlin/cn/rtast/fancybot/db/RCONTable.kt | 2 +- .../cn/rtast/fancybot/entity/Hitokoto.kt | 2 +- .../entity/apispace/IdiomExplainResponse.kt | 2 +- .../cn/rtast/fancybot/entity/bgm/BGMSearch.kt | 4 ++-- .../rtast/fancybot/entity/bili/CardShare.kt | 4 ++-- .../cn/rtast/fancybot/entity/bili/ShortUrl.kt | 4 ++-- .../cn/rtast/fancybot/entity/bili/UserInfo.kt | 4 ++-- .../cn/rtast/fancybot/entity/bili/UserStat.kt | 4 ++-- .../rtast/fancybot/entity/bili/VideoStat.kt | 2 +- .../rtast/fancybot/entity/bili/ViewCount.kt | 4 ++-- .../fancybot/entity/bullshit/BullShit.kt | 2 +- .../fancybot/entity/cigarette/Cigarette.kt | 6 ++--- .../fancybot/entity/compiler/GLOTPayload.kt | 4 ++-- .../fancybot/entity/compiler/KCSPayload.kt | 4 ++-- .../fancybot/entity/compiler/KCSResponse.kt | 4 ++-- .../fancybot/entity/domain/PricePayload.kt | 2 +- .../fancybot/entity/domain/PriceResponse.kt | 6 ++--- .../fancybot/entity/douyin/DouyinVideo.kt | 10 ++++---- .../fancybot/entity/github/LatestCommit.kt | 4 ++-- .../rtast/fancybot/entity/github/RepoInfo.kt | 2 +- .../entity/github/UploadContentResponse.kt | 2 +- .../entity/gpt/ChatCompletionsPayload.kt | 4 ++-- .../entity/gpt/ChatCompletionsResponse.kt | 4 ++-- .../fancybot/entity/gpt/LlamaResponse.kt | 2 +- .../cn/rtast/fancybot/entity/gpt/ModelList.kt | 2 +- .../cn/rtast/fancybot/entity/mc/MCVersion.kt | 6 ++--- .../fancybot/entity/mc/MCWikiPageResponse.kt | 2 +- .../entity/mc/MCWikiSearchResponse.kt | 6 ++--- .../entity/mc/oauth/DeviceCodeResponse.kt | 2 +- .../entity/mc/oauth/LoginXboxLiveResponse.kt | 4 ++-- .../cn/rtast/fancybot/entity/music/Search.kt | 6 ++--- .../fancybot/entity/music/SearchedResult.kt | 2 +- .../cn/rtast/fancybot/entity/music/SongUrl.kt | 4 ++-- .../cn/rtast/fancybot/entity/music/TopSong.kt | 6 ++--- .../fancybot/entity/music/qq/QQMSearch.kt | 6 ++--- .../cn/rtast/fancybot/entity/pixiv/Ranking.kt | 2 +- .../cn/rtast/fancybot/entity/setu/Setu.kt | 2 +- .../entity/shortlink/ShortLinkPayload.kt | 2 +- .../entity/shortlink/ShortLinkResponse.kt | 2 +- .../entity/tianxing/HistoryOfToday.kt | 6 ++--- .../rtast/fancybot/entity/tts/TTSResponse.kt | 2 +- .../cn/rtast/fancybot/entity/weather/Geo.kt | 2 +- .../rtast/fancybot/entity/weather/Weather.kt | 4 ++-- .../fancybot/entity/wiki/PageInfoResponse.kt | 6 ++--- .../fancybot/entity/wiki/WikipediaResponse.kt | 4 ++-- .../entity/yt/YoutubeVideoResponse.kt | 6 ++--- .../cn/rtast/fancybot/items/BaisiItem.kt | 7 +----- .../cn/rtast/fancybot/items/HeisiItem.kt | 7 +----- .../cn/rtast/fancybot/items/NiuziItem.kt | 7 +----- .../cn/rtast/fancybot/items/SetuItem.kt | 7 +----- .../cn/rtast/fancybot/items/TenSetuItem.kt | 13 ++--------- .../kotlin/cn/rtast/fancybot/util/Http.kt | 18 +++++++-------- .../cn/rtast/fancybot/util/item/Item.kt | 4 +--- .../cn/rtast/fancybot/util/mcbot/MCClient.kt | 2 +- .../cn/rtast/fancybot/util/misc/Image.kt | 2 +- .../cn/rtast/fancybot/util/misc/Misc.kt | 5 ++-- 118 files changed, 208 insertions(+), 303 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 4708036..72fb1fa 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlinVersion = "2.0.20" -ronebotVersion = "2.2.0" +ronebotVersion = "2.2.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 f01e975..f7a90d2 100644 --- a/src/main/kotlin/cn/rtast/fancybot/FancyBot.kt +++ b/src/main/kotlin/cn/rtast/fancybot/FancyBot.kt @@ -36,6 +36,7 @@ import cn.rtast.fancybot.util.str.toJson import cn.rtast.rob.ROneBotFactory import cn.rtast.rob.entity.* import cn.rtast.rob.entity.custom.BeKickEvent +import cn.rtast.rob.entity.custom.ErrorEvent import cn.rtast.rob.entity.custom.MemberKickEvent import cn.rtast.rob.entity.custom.MemberLeaveEvent import cn.rtast.rob.entity.lagrange.FileEvent @@ -87,8 +88,8 @@ class FancyBot : OneBotListener { ReverseGIFCommand.callback(message) AsciiArtCommand.callback(message) ScanQRCodeCommand.callback(message) - BiliVideoParseCommand.parse(this, message) - BiliUserParseCommand.parse(this, message) + BiliVideoParseCommand.parse(message) + BiliUserParseCommand.parse(message) DouyinVideoParseCommand.parse(message) YoutubeVideoParseCommand.parse(message) @@ -202,8 +203,8 @@ class FancyBot : OneBotListener { message.action.sendGroupMessage(message.groupId, msg) } - override suspend fun onWebsocketErrorEvent(action: OneBotAction, ex: Exception) { - ex.printStackTrace() + override suspend fun onWebsocketErrorEvent(event: ErrorEvent) { + event.exception.printStackTrace() } override suspend fun onAddFriendRequest(event: AddFriendRequestEvent) { diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt index 791caeb..2a8225f 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt @@ -11,13 +11,12 @@ import cn.rtast.fancybot.annotations.CommandDescription 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.OneBotListener @CommandDescription("关于") class AboutCommand : BaseCommand() { override val commandNames = listOf("/about", "/关于") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val msg = MessageChain.Builder() .addText("Bot名称: FancyBot") .addNewLine() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/EchoCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/EchoCommand.kt index 866d5fe..45efd2b 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/EchoCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/EchoCommand.kt @@ -12,13 +12,12 @@ import cn.rtast.fancybot.enums.CommandAction import cn.rtast.fancybot.util.file.insertActionRecord import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OneBotListener @CommandDescription("Echo") class EchoCommand : BaseCommand() { override val commandNames = listOf("/echo") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (message.sender.isAdmin || message.sender.isOwner) { message.reply(args.joinToString(" ")) insertActionRecord(CommandAction.Echo, message.sender.userId) @@ -32,7 +31,7 @@ class EchoCommand : BaseCommand() { class ShuffleEchoCommand : BaseCommand() { override val commandNames = listOf("/secho", "/se") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (message.sender.isAdmin || message.sender.isOwner) { message.reply(message.rawMessage.toList().shuffled().joinToString("")) insertActionRecord(CommandAction.Echo, 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 04824fe..be1c487 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt @@ -14,7 +14,6 @@ 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 kotlin.reflect.full.findAnnotation import kotlin.reflect.full.hasAnnotation @@ -22,7 +21,7 @@ import kotlin.reflect.full.hasAnnotation class HelpCommand : BaseCommand() { override val commandNames = listOf("/help", "/帮助") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { val node = NodeMessageChain.Builder() val msg = MessageChain.Builder() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/StatusCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/StatusCommand.kt index 61b4559..2a1e306 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/StatusCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/StatusCommand.kt @@ -14,14 +14,13 @@ import cn.rtast.fancybot.util.file.insertActionRecord 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.OneBotListener import java.time.Instant @CommandDescription("状态") class StatusCommand : BaseCommand() { override val commandNames = listOf("/status") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val runtime = Runtime.getRuntime() val maxMemory = runtime.maxMemory() / (1024 * 1024) val allocatedMemory = runtime.totalMemory() / (1024 * 1024) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/SupportMeCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/SupportMeCommand.kt index 17e9d7a..04d601a 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/SupportMeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/SupportMeCommand.kt @@ -13,19 +13,13 @@ 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.OneBotListener import java.net.URI @CommandDescription("给我打钱!") class SupportMeCommand : BaseCommand() { override val commandNames = listOf("打钱", "给我打钱", "给满子打钱") - override suspend fun executeGroup( - listener: OneBotListener, - message: GroupMessage, - args: List, - matchedCommand: String - ) { + override suspend fun executeGroup(message: GroupMessage, args: List, matchedCommand: String) { if (matchedCommand == "给满子打钱") { message.reply("你打牛魔呢?") return diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AICommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AICommand.kt index dbe0ca8..d9b4be1 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AICommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AICommand.kt @@ -21,7 +21,6 @@ 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 @CommandDescription("问AI(GPT)") class AICommand : BaseCommand() { @@ -29,7 +28,7 @@ class AICommand : BaseCommand() { private val openAIModel = configManager.openAIModel - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addText("发送`/ai [模型] <问题>`即可询问AI哦~") @@ -81,7 +80,7 @@ class LlamaCommand : BaseCommand() { private val llamaURL = configManager.llamaUrl private val llamaModel = configManager.llamaModel - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`/llama <问题>`即可使用llama模型来回复") return diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AnimeSearchCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AnimeSearchCommand.kt index d5bc523..26c9110 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AnimeSearchCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AnimeSearchCommand.kt @@ -16,7 +16,6 @@ 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 okhttp3.OkHttpClient import okhttp3.Request @@ -37,7 +36,7 @@ class AnimeSearchCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`/dm <关键词>`即可搜索番剧啦~") return 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 5018a95..fb92e7d 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt @@ -16,7 +16,6 @@ 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 @CommandDescription("查询香烟价格") @@ -25,7 +24,7 @@ class CigaretteCommand : BaseCommand() { private val apiUrl = "https://www.yanyue.cn/api/rc/product/yanlist" - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addText("发送/tobacco <名称> [数量] 来搜索结果哦~") 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 12dfade..77858d8 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/DomainPriceCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/DomainPriceCommand.kt @@ -17,7 +17,6 @@ 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.OneBotListener import java.awt.Color import java.awt.Font import java.awt.image.BufferedImage @@ -61,7 +60,7 @@ class DomainPriceCommand : BaseCommand() { domain: String, available: Boolean, premium: Boolean, - domainPrice: Pair + domainPrice: Pair, ): String { val canvas = this.createCommonCanvas() val g2d = canvas.createGraphics() @@ -77,7 +76,7 @@ class DomainPriceCommand : BaseCommand() { } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addText("发送`/domain <域名>`即可查询对应的注册和续费价格~") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubLatestCommitCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubLatestCommitCommand.kt index da4aba9..520765f 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubLatestCommitCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubLatestCommitCommand.kt @@ -16,7 +16,6 @@ import cn.rtast.fancybot.util.str.fromArrayJson 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.OneBotListener @CommandDescription("查询Github上的仓库的最新一次的提交信息") class GithubLatestCommitCommand : BaseCommand() { @@ -24,7 +23,7 @@ class GithubLatestCommitCommand : BaseCommand() { private val userInfoUrl = "https://api.github.com/repos" - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`.commit <用户名/仓库名>`即可查询仓库最新一次的提交信息") } 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 b89528c..9f600fa 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubUserCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubUserCommand.kt @@ -19,7 +19,6 @@ 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.OneBotListener import java.awt.Color import java.awt.Font import java.awt.image.BufferedImage @@ -67,7 +66,7 @@ class GithubUserCommand : BaseCommand() { return canvas.toByteArray().encodeToBase64() } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder().addText("发送`gh <用户名>`即可查询用户的信息~").build() message.reply(msg) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GravatarCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GravatarCommand.kt index 85015a1..39e44e0 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GravatarCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GravatarCommand.kt @@ -14,7 +14,6 @@ import cn.rtast.fancybot.util.str.getMD5 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.OneBotListener @CommandDescription("查询用户的Gravatar头像") class GravatarCommand : BaseCommand() { @@ -24,7 +23,7 @@ class GravatarCommand : BaseCommand() { private const val GRAVATAR_URL = "https://gravatar.rtast.cn/avatar" } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val emailMD5 = if (args.first().trim().lowercase().contains("@")) args.first().trim().lowercase().getMD5() else args.first().trim().lowercase() val avatarImage = "$GRAVATAR_URL/$emailMD5?size=256".toURL().readBytes().encodeToBase64() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/IdiomExplainCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/IdiomExplainCommand.kt index 53f93e5..8a830ab 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/IdiomExplainCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/IdiomExplainCommand.kt @@ -14,7 +14,6 @@ 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.OneBotListener @CommandDescription("解释一个成语") class IdiomExplainCommand : BaseCommand() { @@ -22,7 +21,7 @@ class IdiomExplainCommand : BaseCommand() { private val apiSpaceUrl = "https://eolink.o.apispace.com/cyudac/api/v1/idioms/SearchIdiomsByPinyin/search" - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`成语解释 <成语>`就能解释这个成语的意思了") return 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 d6fdb40..b8227f3 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MusicCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MusicCommand.kt @@ -18,7 +18,6 @@ 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.OneBotListener import java.time.Instant @CommandDescription("网易云音乐点歌") @@ -38,7 +37,7 @@ class MusicCommand : BaseCommand() { } } - private suspend fun legacyMusicCommand(listener: OneBotListener, message: GroupMessage, args: List) { + private suspend fun legacyMusicCommand(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`/点歌` <关键词> 来搜索音乐~") return @@ -93,9 +92,9 @@ class MusicCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.last() == "legacy" || args.last() == "l" || args.last() in "0".."4") { - this.legacyMusicCommand(listener, message, args) + this.legacyMusicCommand(message, args) return } if (args.isEmpty()) { @@ -128,7 +127,7 @@ class MusicPlayUrlCommand : BaseCommand() { return Http.get("$musicApiUrl/song/url", mapOf("id" to id)).data.first().url } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val url = if (args.last() == "id" || args.last() == "i") { val id = args.first() this.getPlayUrl(id) @@ -151,7 +150,7 @@ class QQMusicCommand : BaseCommand() { private val qqMusicApiUrl = configManager.qqMusicApiUrl - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`/qm <关键词>`即可搜索qq音乐的音乐哦") return 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 e7c9ce6..1ba9f43 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt @@ -14,7 +14,6 @@ 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.OneBotListener import cn.rtast.rob.util.ob.asNode import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext @@ -52,7 +51,7 @@ class NslookupCommand : BaseCommand() { private fun geo(ip: String) = Http.get(IP_INFO_API.replace("###", ip)) - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val host = args.first() val nsType = if (args.size == 3) args[1] else "common" val srvType = if (args.size == 3) args.last() else "mc" 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 dba3cb2..c8d8fa3 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/PixivCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/PixivCommand.kt @@ -16,7 +16,6 @@ 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 @CommandDescription("获取Pixiv上的图片") @@ -26,7 +25,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.re" - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addText("发送`/pixiv | rank` 来进行操作哦~") 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 ec5d532..2157f73 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/ShotCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/ShotCommand.kt @@ -13,7 +13,6 @@ 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.NodeMessageChain -import cn.rtast.rob.util.ob.OneBotListener private fun generateNodeMessage(targetId: String, times: Int = 10): NodeMessageChain { @@ -29,7 +28,7 @@ private fun generateNodeMessage(targetId: String, times: Int = 10): NodeMessageC class ShotSelfCommand : BaseCommand() { override val commandNames = listOf("骂我") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { message.action.sendGroupForwardMsg(message.groupId, generateNodeMessage(message.sender.userId.toString())) } } @@ -38,7 +37,7 @@ class ShotSelfCommand : BaseCommand() { class ShotOtherCommand : BaseCommand() { override val commandNames = listOf("骂") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.action.sendGroupForwardMsg( message.groupId, generateNodeMessage(message.sender.userId.toString(), 20) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheCatCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheCatCommand.kt index 81fa4d6..0339a2f 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheCatCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheCatCommand.kt @@ -17,7 +17,6 @@ import cn.rtast.fancybot.util.str.proxy 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.OneBotListener @CommandDescription("随机猫猫图") class TheCatCommand : BaseCommand() { @@ -25,7 +24,7 @@ class TheCatCommand : BaseCommand() { private val theCatApiUrl = "https://api.thecatapi.com/v1/images/search" - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val imageBase64 = Http.get(theCatApiUrl) .fromArrayJson>().first().url .proxy.toURL().readBytes().encodeToBase64() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheHistoryOfTodayCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheHistoryOfTodayCommand.kt index 31acdc6..33b1cce 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheHistoryOfTodayCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheHistoryOfTodayCommand.kt @@ -14,7 +14,6 @@ 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.OneBotListener import cn.rtast.rob.util.ob.asNode import java.time.LocalDateTime import java.time.ZoneId @@ -27,7 +26,7 @@ class TheHistoryOfTodayCommand : BaseCommand() { private val tianXingApiUrl = "https://apis.tianapi.com/lishi/index" private val tianXingApiKey = configManager.tianXingApiKey - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val currentDateTime = LocalDateTime.now(ZoneId.of("Asia/Shanghai")) val formatter = DateTimeFormatter.ofPattern("MMdd") val currentDate = currentDateTime.format(formatter) 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 e9cde2d..25af52b 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WeatherCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WeatherCommand.kt @@ -21,7 +21,6 @@ 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.OneBotListener import java.awt.Color import java.awt.Font import java.awt.image.BufferedImage @@ -58,7 +57,7 @@ class WeatherCommand : BaseCommand() { return emptyImage.toByteArray().encodeToBase64() } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(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/WikipediaCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WikipediaCommand.kt index 07b466e..1cba6bb 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WikipediaCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WikipediaCommand.kt @@ -16,7 +16,6 @@ import cn.rtast.fancybot.util.file.insertActionRecord 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.OneBotListener import org.jsoup.Jsoup @CommandDescription("查询wiki百科") @@ -32,7 +31,7 @@ class WikipediaCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addText("发送`/wiki <关键字>`即可查询出最匹配的wiki页面~") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/AntiRevokeCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/AntiRevokeCommand.kt index fc6ad1b..9ecbf3e 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/AntiRevokeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/AntiRevokeCommand.kt @@ -14,13 +14,12 @@ import cn.rtast.rob.entity.ArrayMessage import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OneBotListener @CommandDescription("防撤回(获取消息)") class AntiRevokeCommand : BaseCommand() { override val commandNames = listOf("/revoke", "/rv") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (message.sender.isAdmin || message.sender.isOwner) { val messageId = args.first().toLong() val getMsg = message.action.getMessage(messageId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/BullShitGenerateCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/BullShitGenerateCommand.kt index ff73bea..d1bb9f5 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/BullShitGenerateCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/BullShitGenerateCommand.kt @@ -16,7 +16,6 @@ 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 kotlin.random.Random @CommandDescription("狗屁不通文章生成器") @@ -47,7 +46,7 @@ class BullShitGenerateCommand : BaseCommand() { return ".\n\n " } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val topic = args.joinToString(" ") val nextFamousQuote = shuffleList(bullShitData.famous) val nextBosh = shuffleList(bullShitData.bosh) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/CompilerCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/CompilerCommand.kt index 6b01ced..5aadac4 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/CompilerCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/CompilerCommand.kt @@ -19,7 +19,6 @@ 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.OneBotListener @CommandDescription("执行不同语言的代码") class CompilerCommand : BaseCommand() { @@ -28,7 +27,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: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("使用`/exec` <语言> <代码> 即可执行~") return diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/GaoKaoDaysRemainCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/GaoKaoDaysRemainCommand.kt index d0a0877..5bd1d62 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/GaoKaoDaysRemainCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/GaoKaoDaysRemainCommand.kt @@ -10,7 +10,6 @@ package cn.rtast.fancybot.commands.misc import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OneBotListener import java.time.LocalDate import java.time.temporal.ChronoUnit @@ -18,7 +17,7 @@ import java.time.temporal.ChronoUnit class GaoKaoDaysRemainCommand : BaseCommand() { override val commandNames = listOf("高考倒计时") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val gaoKaoDate = LocalDate.of(LocalDate.now().year, 6, 7) val currentDate = LocalDate.now() val adjustedGaoKaoDate = if (currentDate.isAfter(gaoKaoDate)) gaoKaoDate.plusYears(1) else gaoKaoDate diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPCatCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPCatCommand.kt index fd081e0..099a9b4 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPCatCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPCatCommand.kt @@ -14,7 +14,6 @@ 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.OneBotListener @CommandDescription("随机HTTP猫猫") class HTTPCatCommand : BaseCommand() { @@ -26,7 +25,7 @@ class HTTPCatCommand : BaseCommand() { return Resources.loadFromResourcesAsBytes("httpcat/${code}.jpg")?.encodeToBase64() ?: notFoundCatBase64 } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val statusCode = if (args.isEmpty()) HttpStatusCode.entries.random().code.toString() else args.first() val image = loadHTTPCat(statusCode) val msg = MessageChain.Builder().addImage(image, true).build() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPDogCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPDogCommand.kt index 11fdccd..f2bf107 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPDogCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPDogCommand.kt @@ -14,7 +14,6 @@ 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.OneBotListener @CommandDescription("随机HTTP狗狗") class HTTPDogCommand : BaseCommand() { @@ -26,7 +25,7 @@ class HTTPDogCommand : BaseCommand() { return Resources.loadFromResourcesAsBytes("httpdog/${code}.jpg")?.encodeToBase64() ?: notFoundCatBase64 } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val statusCode = if (args.isEmpty()) HttpStatusCode.entries.random().code.toString() else args.first() val image = loadHTTPDog(statusCode) val msg = MessageChain.Builder().addImage(image, true).build() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/HitokotoCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/HitokotoCommand.kt index ef5bb7a..553aa71 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/HitokotoCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/HitokotoCommand.kt @@ -13,13 +13,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.OneBotListener @CommandDescription("一言") class HitokotoCommand : BaseCommand() { override val commandNames = listOf("/1") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val response = Http.get("https://v1.hitokoto.cn/?c=b") val msg = MessageChain.Builder() .addText("⌊${response.sentence}⌉ ---《${response.from}》") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/JrrpCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/JrrpCommand.kt index 0ab48c2..d825501 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/JrrpCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/JrrpCommand.kt @@ -12,7 +12,6 @@ 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.OneBotListener @CommandDescription("今日人品~") class JrrpCommand : BaseCommand() { @@ -20,7 +19,7 @@ class JrrpCommand : BaseCommand() { private val jrrpManager = JrrpManager() - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(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/misc/JueCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/JueCommand.kt index 8ad243d..bcea7f3 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/JueCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/JueCommand.kt @@ -17,7 +17,6 @@ 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.OneBotListener import com.madgag.gif.fmsware.GifDecoder import java.awt.image.BufferedImage import java.net.URI @@ -59,7 +58,7 @@ class JueCommand : BaseCommand() { return gif } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val target = message.message.find { it.type == ArrayMessageType.at }?.data?.qq.toString() val source = message.sender.userId.toString() val gif = this.createJueGIF(source, target) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/KFCCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/KFCCommand.kt index 79f85d0..d5df41c 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/KFCCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/KFCCommand.kt @@ -12,7 +12,6 @@ import cn.rtast.fancybot.entity.KFC import cn.rtast.fancybot.util.Http import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OneBotListener import java.time.DayOfWeek import java.time.Instant import java.time.LocalDateTime @@ -32,7 +31,7 @@ class KFCCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (!isThursday()) { message.reply("很可惜今天并不是星期四~") return diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt index f1e46f4..5885103 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt @@ -50,7 +50,6 @@ 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.OneBotListener import cn.rtast.rob.util.ob.asMessageChain import cn.rtast.rob.util.ob.asNode import okhttp3.FormBody @@ -70,7 +69,7 @@ class MCVersionCommand : BaseCommand() { private val javaEditionAPI = "https://launchermeta.mojang.com/mc/game/version_manifest.json" - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val mcVersion = Http.get(javaEditionAPI) val msg = MessageChain.Builder() .addText("最新正式版: ${mcVersion.latest.release}") @@ -92,7 +91,7 @@ class MinecraftWikiCommand : BaseCommand() { private val baseApiUrl = "https://zh.minecraft.wiki/rest.php/v1" private val logger = Logger.getLogger() - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val action = args.first() when (action) { "s", "搜索" -> { @@ -178,7 +177,7 @@ class SlimeChunkHelperCommand : BaseCommand() { private fun findMaxSlimeChunks( worldSeed: Long, searchRange: Int, - chunkSize: Int + chunkSize: Int, ): Pair, Pair>, Int> { var maxCount = 0 var bestStartLocation = Pair(0, 0) @@ -221,7 +220,7 @@ class SlimeChunkHelperCommand : BaseCommand() { return image.toByteArray().encodeToBase64() } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addText("此指令可以借助一个种子来帮助查找最适合史莱姆农场的位置") @@ -299,7 +298,7 @@ class MCSkinCommand : BaseCommand() { return zoom.toByteArray().encodeToBase64() } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`/skin `即可查询他的皮肤~ (仅限Java版)") return @@ -332,7 +331,7 @@ class MCPingCommand : BaseCommand() { return this.replace(Regex("§."), "") } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addText("使用方法: /mcping :[port] [java|be]") @@ -459,7 +458,7 @@ class MCLoginCommand : BaseCommand() { return response.token } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("这个命令可以获取你的MC登录Token发送 `/mclogin login`进行操作吧") return @@ -500,7 +499,7 @@ class MCLoginCommand : BaseCommand() { } } - override suspend fun executePrivate(listener: OneBotListener, message: PrivateMessage, args: List) { + override suspend fun executePrivate(message: PrivateMessage, args: List) { val token = getAccessTokenById(message.sender.userId) if (token == null) { message.reply("你还没登录呢!") @@ -522,11 +521,11 @@ class MCLoginCommand : BaseCommand() { class RCONCommand : BaseCommand() { override val commandNames = listOf("/rcon", "/r") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { message.reply("请在私聊中使用此命令") } - override suspend fun executePrivate(listener: OneBotListener, message: PrivateMessage, args: List) { + override suspend fun executePrivate(message: PrivateMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addText("这条指令用于在群内操作mc服务器") @@ -616,7 +615,7 @@ class MCBotCommand : BaseCommand() { return response.players.max to response.players.online } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val clients = mutableListOf() val action = args.first() when (action) { diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/PastebinCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/PastebinCommand.kt index 2eba20f..5eadf20 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/PastebinCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/PastebinCommand.kt @@ -19,7 +19,6 @@ import cn.rtast.fancybot.util.file.insertActionRecord 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.OneBotListener @CommandDescription("Pastebin!") class PastebinCommand : BaseCommand() { @@ -36,7 +35,7 @@ class PastebinCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("使用`/pb <内容>`或者回复一个消息`/pb`可以快速创建一个pastebin") return diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/QRCodeCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/QRCodeCommand.kt index 2206c3b..258b444 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/QRCodeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/QRCodeCommand.kt @@ -17,7 +17,6 @@ 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.OneBotListener import com.google.zxing.BarcodeFormat import com.google.zxing.BinaryBitmap import com.google.zxing.EncodeHintType @@ -40,7 +39,7 @@ class GenerateQRCodeCommand : BaseCommand() { return MatrixToImageWriter.toBufferedImage(bitMatrix).toByteArray().encodeToBase64() } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`/qr <内容>`即可生成一张二维码的图片") return @@ -85,7 +84,7 @@ class ScanQRCodeCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (message.sender() !in waitingList) { waitingList.add(message.sender()) message.reply("继续发送一张二维码图片") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/RUACommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/RUACommand.kt index d894b18..40b5bef 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/RUACommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/RUACommand.kt @@ -12,13 +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.OneBotListener @CommandDescription("RUA!") class RUACommand : BaseCommand() { override val commandNames = listOf("/rua", "rua") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(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/misc/RandomMusicCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/RandomMusicCommand.kt index 0266999..bb5c72c 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/RandomMusicCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/RandomMusicCommand.kt @@ -15,7 +15,6 @@ 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.OneBotListener @CommandDescription("获取随机热榜音乐(网易云)") class RandomMusicCommand : BaseCommand() { @@ -23,7 +22,7 @@ class RandomMusicCommand : BaseCommand() { private val ncmApiUrl = "${configManager.ncmAPI}/top/song" - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val id = Http.get(ncmApiUrl).data.random().privilege.id val msg = MessageChain.Builder() .addMusicShare(MusicShareType.Netease, id.toString()) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/ReactionCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/ReactionCommand.kt index 92152cb..fa0bc43 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/ReactionCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/ReactionCommand.kt @@ -12,7 +12,6 @@ import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.QQFace import cn.rtast.rob.util.BaseCommand import cn.rtast.rob.util.ob.OneBotAction -import cn.rtast.rob.util.ob.OneBotListener @CommandDescription("让你的消息得到回应(reaction)!") class ReactionCommand : BaseCommand() { @@ -24,6 +23,6 @@ class ReactionCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) = + override suspend fun executeGroup(message: GroupMessage, args: List) = reaction(message.action, message.groupId, message.messageId) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/RemakeCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/RemakeCommand.kt index 65ab2a7..aba8a4c 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/RemakeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/RemakeCommand.kt @@ -13,7 +13,6 @@ import cn.rtast.fancybot.util.misc.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.OneBotListener @CommandDescription("人生重开模拟器") class RemakeCommand : BaseCommand() { @@ -30,7 +29,7 @@ class RemakeCommand : BaseCommand() { "鸽子", "鼠鼠", "化石", "狗狗" ) - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(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/misc/SendLikeCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/SendLikeCommand.kt index a59dd70..644cea6 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/SendLikeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/SendLikeCommand.kt @@ -11,16 +11,14 @@ import cn.rtast.fancybot.annotations.CommandDescription 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.OneBotListener @CommandDescription("资料卡点赞") class SendLikeCommand : BaseCommand() { override val commandNames = listOf("赞我") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { message.action.sendLike(message.sender.userId, 10) val msg = MessageChain.Builder() - .addReply(message.messageId) .addText("👍了你十下~~😁") .build() message.reply(msg) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/SendMailCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/SendMailCommand.kt index a0ea059..fab3802 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/SendMailCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/SendMailCommand.kt @@ -13,7 +13,6 @@ import cn.rtast.fancybot.enums.CommandAction import cn.rtast.fancybot.util.file.insertActionRecord import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OneBotListener import org.simplejavamail.api.mailer.config.TransportStrategy import org.simplejavamail.email.EmailBuilder import org.simplejavamail.mailer.MailerBuilder @@ -43,7 +42,7 @@ class SendMailCommand : BaseCommand() { this.mailer.sendMail(email) } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`/mail <收件人地址>`即可发送测试邮件~") return diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/ShortLinkCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/ShortLinkCommand.kt index f6def79..52945bd 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/ShortLinkCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/ShortLinkCommand.kt @@ -16,7 +16,6 @@ import cn.rtast.fancybot.util.Http 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.OneBotListener @CommandDescription("生成短链接") class ShortLinkCommand : BaseCommand() { @@ -34,7 +33,7 @@ class ShortLinkCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`/s `来生成短链接`不要放入一些奇怪的链接哦~") return diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/TTSCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/TTSCommand.kt index 4ea284f..62c73e4 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/TTSCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/TTSCommand.kt @@ -14,7 +14,6 @@ import cn.rtast.fancybot.util.str.proxy 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.OneBotListener import okhttp3.FormBody @CommandDescription("将文字转换成语音(TTS)!") @@ -23,7 +22,7 @@ class TTSCommand : BaseCommand() { private val ttsApiUrl = "https://ttsmp3.com/makemp3_new.php" - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`/tts <文字>`就可以生成语音啦~") return 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 01b3f58..27aa01b 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/TenSetuCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/TenSetuCommand.kt @@ -11,14 +11,13 @@ import cn.rtast.fancybot.annotations.CommandDescription 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.OneBotListener @Deprecated("已迁移到兑换列表中") @CommandDescription("获得十张色图!") class TenSetuCommand : BaseCommand() { override val commandNames = listOf("十张色图") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val msg = MessageChain.Builder() .addText("指令已经迁移到兑换列表中") .addNewLine() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/TodayEatDrinkCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/TodayEatDrinkCommand.kt index c0d1c22..1558c81 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/TodayEatDrinkCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/TodayEatDrinkCommand.kt @@ -10,7 +10,6 @@ package cn.rtast.fancybot.commands.misc import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OneBotListener import kotlin.random.Random @CommandDescription("今天吃什么") @@ -25,7 +24,7 @@ class TodayEatCommand : BaseCommand() { "酸辣粉", "煲仔饭", "⑩", "史" ) - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (KFCCommand.isThursday() && Random.nextBoolean()) { message.reply("今天是疯! 狂! 星! 期! 四!, 所以吃肯德基!") return @@ -38,7 +37,7 @@ class TodayEatCommand : BaseCommand() { class TodayDontEatCommand : BaseCommand() { override val commandNames = listOf("今天不吃什么") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { message.reply("你吃个结巴, 是吧") } } @@ -54,7 +53,7 @@ class TodayDrinkCommand : BaseCommand() { "气泡水", "奶盖茶", "冰可乐", "草莓汁", "芒果汁", "蓝莓汁", "热奶茶", "蜂蜜柚子茶" ) - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { message.reply("今天喝${drinkList.random()}吧~") } } @@ -63,7 +62,7 @@ class TodayDrinkCommand : BaseCommand() { class TodayDontDrinkCommand : BaseCommand() { override val commandNames = listOf("今天不喝什么") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { message.reply("你喝个结巴, 是吧") } } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/ZDJDCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/ZDJDCommand.kt index 759048a..3e1c5ff 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/ZDJDCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/ZDJDCommand.kt @@ -13,7 +13,6 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OneBotListener @CommandDescription("将人类的语言翻译成尊嘟假嘟语还能将尊嘟假嘟语翻译成人类的语言!") class ZDJDCommand : BaseCommand() { @@ -78,7 +77,7 @@ class ZDJDCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val text = if (message.message.any { it.type == ArrayMessageType.image }) { message.message.find { it.type == ArrayMessageType.image }!!.data.file!! } else args.joinToString(" ") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/misc/ZiBiCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/misc/ZiBiCommand.kt index e630570..452a57e 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/ZiBiCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/ZiBiCommand.kt @@ -12,7 +12,6 @@ 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.OneBotListener val users = mutableMapOf() @@ -20,7 +19,7 @@ val users = mutableMapOf() class ZiBiCommand : BaseCommand() { override val commandNames = listOf("/自闭", "自闭") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { try { users.remove(message.sender.userId) val duration = if (args.isEmpty()) 1 else args.first().toInt() @@ -47,7 +46,7 @@ class ZiBiCommand : BaseCommand() { class UnsetZiBiCommand : BaseCommand() { override val commandNames = listOf("我想开了") - override suspend fun executePrivate(listener: OneBotListener, message: PrivateMessage, args: List) { + override suspend fun executePrivate(message: PrivateMessage, args: List) { if (!users.any { it.key == message.sender.userId }) { val msg = MessageChain.Builder() .addText("你没有在自闭列表中~") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/MyNiuziCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/MyNiuziCommand.kt index 921d979..4ec88f3 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/MyNiuziCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/MyNiuziCommand.kt @@ -12,14 +12,13 @@ import cn.rtast.fancybot.niuziManager 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.OneBotListener @CommandDescription("查询自己牛子的长度") class MyNiuziCommand : BaseCommand() { override val commandNames = listOf("我的牛子", "mp") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val niuzi = niuziManager.getUser(message.sender.userId) if (niuzi == null) { message.reply("你还没有牛子呢, 发送`牛子签到`来领取一根专属于你的牛子吧~") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziBankCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziBankCommand.kt index e58f980..cab2ca0 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziBankCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziBankCommand.kt @@ -16,7 +16,6 @@ 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.OneBotListener private suspend fun noAccount(message: GroupMessage) { message.reply("你还没有银行账户呢, 发送`创建账户`来创建一个账户吧~") @@ -28,7 +27,7 @@ private const val INTEREST_RATE = 0.0054 class NiuziBankCommand : BaseCommand() { override val commandNames = listOf("牛子银行") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val niuziCommands = commands.filter { it::class.simpleName?.startsWith("Niuzi")!! && !it::class.simpleName?.lowercase()?.contains("redeem")!! }.joinToString("\n") { it.commandNames.joinToString(",") { join -> "`$join`" } } @@ -49,7 +48,7 @@ class NiuziBankCommand : BaseCommand() { class BankBalanceCommand : BaseCommand() { override val commandNames = listOf("余额查询") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val balanceData = niuziBankManager.getUser(message.sender.userId) if (balanceData == null) { noAccount(message) @@ -63,7 +62,7 @@ class BankBalanceCommand : BaseCommand() { class CreateBankAccountCommand : BaseCommand() { override val commandNames = listOf("创建账户") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (niuziBankManager.getUser(message.sender.userId) != null) { message.reply("你已经有账户了!") return @@ -78,7 +77,7 @@ class CreateBankAccountCommand : BaseCommand() { class BankTransferCommand : BaseCommand() { override val commandNames = listOf("银行转账") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val currentUserBalance = niuziBankManager.getUser(message.sender.userId) if (currentUserBalance == null) { noAccount(message) @@ -94,7 +93,7 @@ class BankTransferCommand : BaseCommand() { message.reply("你的牛子长度不够转账!") return } - val username = listener.getUserName(message.action, message.groupId, message.sender.userId) + val username = message.action.getUserName(message.groupId, message.sender.userId) val result = niuziBankManager.transfer(message.sender.userId, target, amount, username) message.reply("转账成功! 你在银行内剩余的牛子长度为: ${result?.balance}") } @@ -104,7 +103,7 @@ class BankTransferCommand : BaseCommand() { class WithdrawCommand : BaseCommand() { override val commandNames = listOf("取牛子") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val amount = args.last().toDouble() val currentBalance = niuziBankManager.getUser(message.sender.userId) val niuzi = niuziManager.getUser(message.sender.userId) @@ -124,7 +123,7 @@ class WithdrawCommand : BaseCommand() { message.reply("取出的长度必须大于0!") return } - val username = listener.getUserName(message.action, message.groupId, message.sender.userId) + val username = message.action.getUserName(message.groupId, message.sender.userId) val result = niuziBankManager.withdraw(message.sender.userId, amount, username) niuziManager.updateLength(message.sender.userId, amount + amount * INTEREST_RATE) message.reply("取牛子成功, 你现在还剩${result.balance}cm的牛子在银行内") @@ -135,7 +134,7 @@ class WithdrawCommand : BaseCommand() { class DepositCommand : BaseCommand() { override val commandNames = listOf("存牛子") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val currentBalance = niuziBankManager.getUser(message.sender.userId) val niuzi = niuziManager.getUser(message.sender.userId) val amount = args.last().toDouble() @@ -155,7 +154,7 @@ class DepositCommand : BaseCommand() { message.reply("你身上的牛子不够用啦, 没办法存进银行! >>> ${niuzi.length}") return } - val username = listener.getUserName(message.action, message.groupId, message.sender.userId) + val username = message.action.getUserName(message.groupId, message.sender.userId) val self = niuziManager.updateLength(message.sender.userId, -amount) val result = niuziBankManager.deposit(message.sender.userId, amount, username) message.reply("存入成功你身上的牛子还有${self?.length}cm 银行账户内还有: ${result.balance}cm") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziJiJianCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziJiJianCommand.kt index 5cdc455..fcee982 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziJiJianCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziJiJianCommand.kt @@ -13,13 +13,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.OneBotListener @CommandDescription("来一起激情击剑吧!") class NiuziJiJianCommand : BaseCommand() { override val commandNames = listOf("击剑", "jj") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`击剑 @xxx`即可对某人进行击剑") return diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziManagerCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziManagerCommand.kt index f84cb06..d122f3f 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziManagerCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziManagerCommand.kt @@ -15,13 +15,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.OneBotListener @CommandDescription("在群内设置某个成员的牛子银行余额或者现金牛子长度") class NiuziManagerCommand : BaseCommand() { override val commandNames = listOf("管理牛子") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("此命令可以管理成员的牛子或者银行账户") return @@ -37,7 +36,7 @@ class NiuziManagerCommand : BaseCommand() { "yh", "银行" -> { val before = niuziBankManager.getUser(target) niuziBankManager.deposit( - target, amount, listener.getUserName(message.action, message.groupId, target) + target, amount, message.action.getUserName(message.groupId, target) ) val after = niuziBankManager.getUser(target) val msg = MessageChain.Builder() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziQueryCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziQueryCommand.kt index f743719..e9304d3 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziQueryCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziQueryCommand.kt @@ -12,13 +12,12 @@ import cn.rtast.fancybot.niuziManager import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OneBotListener @CommandDescription("查询别人的牛子长度") class NiuziQueryCommand : BaseCommand() { override val commandNames = listOf("牛子查询") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("输入`牛子查询 @某人`即可查询他的牛子长度") return diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRankCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRankCommand.kt index a4a96dd..2245212 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRankCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRankCommand.kt @@ -13,13 +13,12 @@ import cn.rtast.fancybot.niuziManager 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.OneBotListener @CommandDescription("查询所有人的牛子的排行榜") class NiuziRankCommand : BaseCommand() { override val commandNames = listOf("牛子排行榜", "牛子排行") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val allNiuzi = niuziManager.getAllNiuzi().sortedBy { it.length }.reversed() val msg = MessageChain.Builder().addText("牛子长度排行榜如下").addNewLine() allNiuzi.forEach { @@ -33,7 +32,7 @@ class NiuziRankCommand : BaseCommand() { class NiuziBankRankCommand : BaseCommand() { override val commandNames = listOf("牛子富豪榜", "富豪榜") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { val allNiuziBankAccounts = niuziBankManager.getAllAccount() .sortedBy { it.balance }.reversed() val msg = MessageChain.Builder().addText("牛子银行富豪榜排行如下").addNewLine() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRedeemCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRedeemCommand.kt index 24a758f..e646f7c 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRedeemCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRedeemCommand.kt @@ -13,13 +13,12 @@ import cn.rtast.fancybot.niuziManager 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.OneBotListener @CommandDescription("使用牛子长度兑换物品") class NiuziRedeemCommand : BaseCommand() { override val commandNames = listOf("/rdm") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { val msg = MessageChain.Builder() .addText("发送 /rdm <物品名称> 即可兑换哦!") @@ -64,7 +63,7 @@ class NiuziRedeemCommand : BaseCommand() { return } val afterStatus = niuziManager.redeemItem(message.sender.userId, selectedItemPrice)?.length!! - val action = selectedItem.redeemInGroup(listener, message, afterStatus) + val action = selectedItem.redeemInGroup(message, afterStatus) val msg = MessageChain.Builder() .addText("兑换成功! 你花费了${selectedItemPrice}cm来兑换奖品, 还剩${afterStatus}cm") .addNewLine() diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziSignCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziSignCommand.kt index 15dfc6d..e4decba 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziSignCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziSignCommand.kt @@ -13,18 +13,17 @@ import cn.rtast.fancybot.util.misc.getUserName 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.OneBotListener @CommandDescription("牛子签到~") class NiuziSignCommand : BaseCommand() { override val commandNames = listOf("牛子签到", "签到") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (niuziManager.isSigned(message.sender.userId)) { message.reply("你今天已经对你的牛子使用了签到啦,明天再来吧~") return } - val username = listener.getUserName(message.action, message.groupId, message.sender.userId) + val username = message.action.getUserName(message.groupId, message.sender.userId) val afterStatus = niuziManager.sign(message.sender.userId, username) val msg = MessageChain.Builder() .addReply(message.messageId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziTransferCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziTransferCommand.kt index fe472e5..3a7a4dc 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziTransferCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziTransferCommand.kt @@ -12,13 +12,12 @@ import cn.rtast.fancybot.niuziManager import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OneBotListener @CommandDescription("将自己的牛子长度转账给别人") class NiuziTransferCommand : BaseCommand() { override val commandNames = listOf("牛子转账", "zz") - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (args.isEmpty()) { message.reply("发送`牛子转账 @某人 <长度>` 即可把自己的牛子长度转账给TA") return diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/parse/AsciiArtCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/parse/AsciiArtCommand.kt index b17fe1f..b3fe554 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/AsciiArtCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/AsciiArtCommand.kt @@ -20,7 +20,6 @@ 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.OneBotListener import cn.rtast.rob.util.ob.asMessageChain import com.madgag.gif.fmsware.GifDecoder import kotlinx.coroutines.Dispatchers @@ -179,7 +178,7 @@ class AsciiArtCommand : BaseCommand() { private data class UnifiedMessage(val type: ArrayMessageType, val file: String?, val url: String?) } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (message.sender.userId !in waitingList) { message.reply("请继续发送一张图片, 如果输入错误则取消本次操作, 如果GIF帧数过多可能会需要很长时间(也可能处理失败)") waitingList.add(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/parse/BilibiliParseCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/parse/BilibiliParseCommand.kt index 93a2255..b095cb8 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/BilibiliParseCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/BilibiliParseCommand.kt @@ -22,7 +22,6 @@ import cn.rtast.fancybot.util.str.setTruncate 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 import okhttp3.Request import java.awt.Color @@ -184,7 +183,7 @@ object BiliVideoParseCommand { return String(bytes) } - suspend fun parse(listener: OneBotListener, message: GroupMessage) { + suspend fun parse(message: GroupMessage) { try { val bvid = if (bvRegex.containsMatchIn(message.rawMessage)) { message.rawMessage.extractBv() @@ -275,7 +274,7 @@ object BiliUserParseCommand { return image.toByteArray().encodeToBase64() } - suspend fun parse(listener: OneBotListener, message: GroupMessage) { + suspend fun parse(message: GroupMessage) { val match = idRegex.find(message.rawMessage) if (match != null) { val userId = match.groupValues[1] 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 726212f..d06443d 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/ReverseGIFCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/ReverseGIFCommand.kt @@ -15,7 +15,6 @@ 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.OneBotListener import com.madgag.gif.fmsware.GifDecoder import java.net.URI @@ -63,7 +62,7 @@ class ReverseGIFCommand : BaseCommand() { } } - override suspend fun executeGroup(listener: OneBotListener, message: GroupMessage, args: List) { + override suspend fun executeGroup(message: GroupMessage, args: List) { if (message.sender.userId !in waitingList) { message.reply("发送一张动图来继续操作") waitingList.add(message.sender.userId) diff --git a/src/main/kotlin/cn/rtast/fancybot/db/MinecraftAccessTokenTable.kt b/src/main/kotlin/cn/rtast/fancybot/db/MinecraftAccessTokenTable.kt index b1eaa1b..7aa9d13 100644 --- a/src/main/kotlin/cn/rtast/fancybot/db/MinecraftAccessTokenTable.kt +++ b/src/main/kotlin/cn/rtast/fancybot/db/MinecraftAccessTokenTable.kt @@ -29,7 +29,7 @@ object MinecraftAccessTokenTable : Table("mc_access_token") { data class MCAccessTokenEntity( val token: String, val userId: Long, - val timestamp: Long + val timestamp: Long, ) suspend fun insertNewAccessToken(accessToken: String, id: Long) { diff --git a/src/main/kotlin/cn/rtast/fancybot/db/NiuziBankTable.kt b/src/main/kotlin/cn/rtast/fancybot/db/NiuziBankTable.kt index 51de62b..00107cb 100644 --- a/src/main/kotlin/cn/rtast/fancybot/db/NiuziBankTable.kt +++ b/src/main/kotlin/cn/rtast/fancybot/db/NiuziBankTable.kt @@ -24,5 +24,5 @@ data class NiuziBankAccount( val balance: Double, val interestRate: Double, val timestamp: Long, - val nickname: String + val nickname: String, ) \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/db/RCONTable.kt b/src/main/kotlin/cn/rtast/fancybot/db/RCONTable.kt index ab5ff89..32001d9 100644 --- a/src/main/kotlin/cn/rtast/fancybot/db/RCONTable.kt +++ b/src/main/kotlin/cn/rtast/fancybot/db/RCONTable.kt @@ -24,6 +24,6 @@ data class RCONEntity( val port: Int, val userId: Long, val name: String, - val password: String + val password: String, ) diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/Hitokoto.kt b/src/main/kotlin/cn/rtast/fancybot/entity/Hitokoto.kt index 7e04c10..6c991e3 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/Hitokoto.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/Hitokoto.kt @@ -13,5 +13,5 @@ data class Hitokoto( val uuid: String, @SerializedName("hitokoto") val sentence: String, - val from: String + val from: String, ) \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/apispace/IdiomExplainResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/apispace/IdiomExplainResponse.kt index e55a40a..5bda11e 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/apispace/IdiomExplainResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/apispace/IdiomExplainResponse.kt @@ -8,7 +8,7 @@ package cn.rtast.fancybot.entity.apispace data class IdiomExplainResponse( - val data: List + val data: List, ) { data class Data( val name: String, diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/bgm/BGMSearch.kt b/src/main/kotlin/cn/rtast/fancybot/entity/bgm/BGMSearch.kt index b362d69..9b8f0d9 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/bgm/BGMSearch.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/bgm/BGMSearch.kt @@ -10,7 +10,7 @@ package cn.rtast.fancybot.entity.bgm import com.google.gson.annotations.SerializedName data class BGMSearch( - val list: List + val list: List, ) { data class Result( val url: String, @@ -21,6 +21,6 @@ data class BGMSearch( ) data class Images( - val large: String + val large: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/bili/CardShare.kt b/src/main/kotlin/cn/rtast/fancybot/entity/bili/CardShare.kt index b2cbce8..f051607 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/bili/CardShare.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/bili/CardShare.kt @@ -15,7 +15,7 @@ data class CardShare( data class Meta( @SerializedName("detail_1") val detail: Detail?, - val news: News? + val news: News?, ) data class Detail( @@ -26,6 +26,6 @@ data class CardShare( data class News( val tag: String, - val jumpUrl: String + val jumpUrl: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/bili/ShortUrl.kt b/src/main/kotlin/cn/rtast/fancybot/entity/bili/ShortUrl.kt index d853f24..b3c2012 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/bili/ShortUrl.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/bili/ShortUrl.kt @@ -8,9 +8,9 @@ package cn.rtast.fancybot.entity.bili data class ShortUrl( - val data: Data + val data: Data, ) { data class Data( - val content: String + val content: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/bili/UserInfo.kt b/src/main/kotlin/cn/rtast/fancybot/entity/bili/UserInfo.kt index f1a0751..93a654f 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/bili/UserInfo.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/bili/UserInfo.kt @@ -10,7 +10,7 @@ package cn.rtast.fancybot.entity.bili import com.google.gson.annotations.SerializedName data class UserInfo( - val data: Data + val data: Data, ) { data class Data( val card: Card, @@ -22,7 +22,7 @@ data class UserInfo( val fans: Int, val sign: String, @SerializedName("level_info") - val levelInfo: LevelInfo + val levelInfo: LevelInfo, ) data class LevelInfo( diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/bili/UserStat.kt b/src/main/kotlin/cn/rtast/fancybot/entity/bili/UserStat.kt index 59be2cc..b2e598e 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/bili/UserStat.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/bili/UserStat.kt @@ -8,9 +8,9 @@ package cn.rtast.fancybot.entity.bili data class UserStat( - val data: Data + val data: Data, ) { data class Data( - val follower: Int + val follower: Int, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/bili/VideoStat.kt b/src/main/kotlin/cn/rtast/fancybot/entity/bili/VideoStat.kt index 1acc1fc..f6ba07f 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/bili/VideoStat.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/bili/VideoStat.kt @@ -8,7 +8,7 @@ package cn.rtast.fancybot.entity.bili data class VideoStat( - val data: Data + val data: Data, ) { data class Data( val aid: Long, diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/bili/ViewCount.kt b/src/main/kotlin/cn/rtast/fancybot/entity/bili/ViewCount.kt index c426915..d7bb452 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/bili/ViewCount.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/bili/ViewCount.kt @@ -8,9 +8,9 @@ package cn.rtast.fancybot.entity.bili data class ViewCount( - val data: Data + val data: Data, ) { data class Data( - val total: String + val total: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/bullshit/BullShit.kt b/src/main/kotlin/cn/rtast/fancybot/entity/bullshit/BullShit.kt index 27d14c5..44f5ddc 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/bullshit/BullShit.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/bullshit/BullShit.kt @@ -4,5 +4,5 @@ data class BullShit( val after: List, val before: List, val bosh: List, - val famous: List + val famous: List, ) \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/cigarette/Cigarette.kt b/src/main/kotlin/cn/rtast/fancybot/entity/cigarette/Cigarette.kt index 254e059..06ea608 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/cigarette/Cigarette.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/cigarette/Cigarette.kt @@ -13,7 +13,7 @@ data class Cigarette( @SerializedName("totalnum") val totalCount: Int, @SerializedName("productlist") - val productList: List + val productList: List, ) { data class Product( @SerializedName("productname") @@ -26,11 +26,11 @@ data class Cigarette( @SerializedName("packprice") val packPrice: Float, @SerializedName("barprice") - val barPrice: Float + val barPrice: Float, ) data class CigaretteType( @SerializedName("typename") - val typeName: String + val typeName: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/compiler/GLOTPayload.kt b/src/main/kotlin/cn/rtast/fancybot/entity/compiler/GLOTPayload.kt index 96855fa..fee2372 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/compiler/GLOTPayload.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/compiler/GLOTPayload.kt @@ -8,10 +8,10 @@ package cn.rtast.fancybot.entity.compiler data class GLOTPayload( - val files: List + val files: List, ) { data class File( val content: String, - val name: String = "main" + val name: String = "main", ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/compiler/KCSPayload.kt b/src/main/kotlin/cn/rtast/fancybot/entity/compiler/KCSPayload.kt index 2e8d184..7185abb 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/compiler/KCSPayload.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/compiler/KCSPayload.kt @@ -10,11 +10,11 @@ package cn.rtast.fancybot.entity.compiler data class KCSPayload( val files: List, val args: String = "", - val confType: String = "java" + val confType: String = "java", ) { data class File( val text: String, val name: String = "File.kt", - val publicId: String = "" + val publicId: String = "", ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/compiler/KCSResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/compiler/KCSResponse.kt index 7737350..76d76e7 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/compiler/KCSResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/compiler/KCSResponse.kt @@ -13,10 +13,10 @@ data class KCSResponse( val errors: Errors, val exception: Any, val jvmByteCode: Any, - val text: String + val text: String, ) { data class Errors( @SerializedName("File.kt") - val file: List + val file: List, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/domain/PricePayload.kt b/src/main/kotlin/cn/rtast/fancybot/entity/domain/PricePayload.kt index d86a335..6659988 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/domain/PricePayload.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/domain/PricePayload.kt @@ -24,5 +24,5 @@ data class PricePayload( @SerializedName("Version") val version: String = "2018-08-08", @SerializedName("Action") - val action: String = "BatchCheckDomain" + val action: String = "BatchCheckDomain", ) \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/domain/PriceResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/domain/PriceResponse.kt index 21bc6d1..3418844 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/domain/PriceResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/domain/PriceResponse.kt @@ -10,16 +10,16 @@ package cn.rtast.fancybot.entity.domain import com.google.gson.annotations.SerializedName data class PriceResponse( - val data: Data + val data: Data, ) { data class Data( @SerializedName("Response") - val response: Response + val response: Response, ) data class Response( @SerializedName("DomainList") - val domainList: List + val domainList: List, ) data class Domain( diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/douyin/DouyinVideo.kt b/src/main/kotlin/cn/rtast/fancybot/entity/douyin/DouyinVideo.kt index 912bd33..5058463 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/douyin/DouyinVideo.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/douyin/DouyinVideo.kt @@ -10,11 +10,11 @@ package cn.rtast.fancybot.entity.douyin import com.google.gson.annotations.SerializedName data class DouyinVideo( - val data: Data + val data: Data, ) { data class Data( @SerializedName("aweme_detail") - val awemeDetail: AwemeDetail + val awemeDetail: AwemeDetail, ) data class AwemeDetail( @@ -62,12 +62,12 @@ data class DouyinVideo( @SerializedName("cover_original_scale") val coverOriginalScale: CoverOriginalScale, @SerializedName("bit_rate") - val bitRate: List + val bitRate: List, ) data class BitRate( @SerializedName("play_addr") - val playAddr: PlayAddr + val playAddr: PlayAddr, ) data class PlayAddr( @@ -79,6 +79,6 @@ data class DouyinVideo( @SerializedName("url_list") val urlList: List, val height: Int, - val width: Int + val width: Int, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/github/LatestCommit.kt b/src/main/kotlin/cn/rtast/fancybot/entity/github/LatestCommit.kt index f0c29b0..840f5c6 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/github/LatestCommit.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/github/LatestCommit.kt @@ -9,10 +9,10 @@ package cn.rtast.fancybot.entity.github data class LatestCommit( val sha: String, - val commit: Commit + val commit: Commit, ) { data class Commit( - val committer: Committer + val committer: Committer, ) data class Committer( diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/github/RepoInfo.kt b/src/main/kotlin/cn/rtast/fancybot/entity/github/RepoInfo.kt index fb56397..91d92f1 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/github/RepoInfo.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/github/RepoInfo.kt @@ -22,7 +22,7 @@ data class RepoInfo( @SerializedName("open_issues_count") val openIssueCount: Int, val fork: Boolean, - val parent: Parent? + val parent: Parent?, ) { data class Owner( @SerializedName("avatar_url") diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/github/UploadContentResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/github/UploadContentResponse.kt index 95bdde7..4ce1c50 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/github/UploadContentResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/github/UploadContentResponse.kt @@ -8,7 +8,7 @@ package cn.rtast.fancybot.entity.github data class UploadContentResponse( - val content: Content + val content: Content, ) { data class Content( val name: String, diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ChatCompletionsPayload.kt b/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ChatCompletionsPayload.kt index 4f0190d..2f2533b 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ChatCompletionsPayload.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ChatCompletionsPayload.kt @@ -12,11 +12,11 @@ import cn.rtast.fancybot.enums.GPTUserRole data class ChatCompletionsPayload( val model: String, val messages: List, - val stream: Boolean = false + val stream: Boolean = false, ) { data class Message( val content: String, val role: GPTUserRole = GPTUserRole.user, - val temperature: Float = 0.3f + val temperature: Float = 0.3f, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ChatCompletionsResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ChatCompletionsResponse.kt index 978d512..fc33c9f 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ChatCompletionsResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ChatCompletionsResponse.kt @@ -10,10 +10,10 @@ package cn.rtast.fancybot.entity.gpt import cn.rtast.fancybot.enums.GPTUserRole data class ChatCompletionsResponse( - val choices: List + val choices: List, ) { data class Choice( - val message: Message + val message: Message, ) data class Message( diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/gpt/LlamaResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/gpt/LlamaResponse.kt index cfbfb36..723993e 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/gpt/LlamaResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/gpt/LlamaResponse.kt @@ -8,7 +8,7 @@ package cn.rtast.fancybot.entity.gpt data class LlamaResponse( - val message: Message + val message: Message, ) { data class Message( val content: String, diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ModelList.kt b/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ModelList.kt index be3aa1b..706a650 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ModelList.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/gpt/ModelList.kt @@ -8,7 +8,7 @@ package cn.rtast.fancybot.entity.gpt data class ModelList( - val data: List + val data: List, ) { data class Data( val id: String, diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCVersion.kt b/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCVersion.kt index fd28d4e..6317126 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCVersion.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCVersion.kt @@ -11,16 +11,16 @@ import cn.rtast.fancybot.enums.mc.MCVersionType data class MCVersion( val latest: Latest, - val versions: List + val versions: List, ) { data class Latest( val release: String, - val snapshot: String + val snapshot: String, ) data class Version( val id: String, val type: MCVersionType, - val releaseTime: String + val releaseTime: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCWikiPageResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCWikiPageResponse.kt index 625da10..22ff4ad 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCWikiPageResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCWikiPageResponse.kt @@ -17,7 +17,7 @@ data class MCWikiPageResponse( val title: String, val latest: Latest, val source: String, - val license: License + val license: License, ) { data class Latest( val id: Int, diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCWikiSearchResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCWikiSearchResponse.kt index 172e961..61de145 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCWikiSearchResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/mc/MCWikiSearchResponse.kt @@ -8,15 +8,15 @@ package cn.rtast.fancybot.entity.mc data class MCWikiSearchResponse( - val pages: List + val pages: List, ) { data class Page( val id: Int, val title: String, - val thumbnail: Thumbnail? + val thumbnail: Thumbnail?, ) data class Thumbnail( - val url: String + val url: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/mc/oauth/DeviceCodeResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/mc/oauth/DeviceCodeResponse.kt index 37cc34c..bd6d85e 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/mc/oauth/DeviceCodeResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/mc/oauth/DeviceCodeResponse.kt @@ -15,5 +15,5 @@ data class DeviceCodeResponse( @SerializedName("device_code") val deviceCode: String, @SerializedName("verification_uri") - val verificationUri: String + val verificationUri: String, ) \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/mc/oauth/LoginXboxLiveResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/mc/oauth/LoginXboxLiveResponse.kt index 82468a9..6929db4 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/mc/oauth/LoginXboxLiveResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/mc/oauth/LoginXboxLiveResponse.kt @@ -16,10 +16,10 @@ data class LoginXboxLiveResponse( val displayClaims: DisplayClaims, ) { data class DisplayClaims( - val xui: List + val xui: List, ) data class XUI( - val uhs: String + val uhs: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/music/Search.kt b/src/main/kotlin/cn/rtast/fancybot/entity/music/Search.kt index 07dc1bc..1be3427 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/music/Search.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/music/Search.kt @@ -11,16 +11,16 @@ data class Search( val result: Result, ) { data class Result( - val songs: List + val songs: List, ) data class Song( val id: Long, val name: String, - val artists: List + val artists: List, ) data class Artist( - val name: String + val name: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/music/SearchedResult.kt b/src/main/kotlin/cn/rtast/fancybot/entity/music/SearchedResult.kt index 5dccedb..c6230d8 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/music/SearchedResult.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/music/SearchedResult.kt @@ -11,5 +11,5 @@ data class SearchedResult( val id: Long, val name: String, val artists: String, - val timestamp: Long + val timestamp: Long, ) \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/music/SongUrl.kt b/src/main/kotlin/cn/rtast/fancybot/entity/music/SongUrl.kt index e7eb8f6..9bbdb70 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/music/SongUrl.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/music/SongUrl.kt @@ -8,9 +8,9 @@ package cn.rtast.fancybot.entity.music data class SongUrl( - val data: List + val data: List, ) { data class Data( - val url: String + val url: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/music/TopSong.kt b/src/main/kotlin/cn/rtast/fancybot/entity/music/TopSong.kt index e8196a7..94adb79 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/music/TopSong.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/music/TopSong.kt @@ -8,13 +8,13 @@ package cn.rtast.fancybot.entity.music data class TopSong( - val data: List + val data: List, ) { data class Data( - val privilege: Privilege + val privilege: Privilege, ) data class Privilege( - val id: Long + val id: Long, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/music/qq/QQMSearch.kt b/src/main/kotlin/cn/rtast/fancybot/entity/music/qq/QQMSearch.kt index 32a70a8..3b4aa37 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/music/qq/QQMSearch.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/music/qq/QQMSearch.kt @@ -13,15 +13,15 @@ data class QQMSearch( val response: Response, ) { data class Response( - val data: Data + val data: Data, ) data class Data( - val song: Songs + val song: Songs, ) data class Songs( - val list: List + val list: List, ) data class Song( diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/pixiv/Ranking.kt b/src/main/kotlin/cn/rtast/fancybot/entity/pixiv/Ranking.kt index bb81565..3434bd1 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/pixiv/Ranking.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/pixiv/Ranking.kt @@ -10,7 +10,7 @@ package cn.rtast.fancybot.entity.pixiv import com.google.gson.annotations.SerializedName data class Ranking( - val contents: List + val contents: List, ) { data class Content( val title: String, diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/setu/Setu.kt b/src/main/kotlin/cn/rtast/fancybot/entity/setu/Setu.kt index 38dc5fe..85bb3ac 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/setu/Setu.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/setu/Setu.kt @@ -16,6 +16,6 @@ data class Setu( val authorId: Long, ) { data class URLS( - val large: String + val large: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/shortlink/ShortLinkPayload.kt b/src/main/kotlin/cn/rtast/fancybot/entity/shortlink/ShortLinkPayload.kt index 7f42c49..9691745 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/shortlink/ShortLinkPayload.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/shortlink/ShortLinkPayload.kt @@ -8,5 +8,5 @@ package cn.rtast.fancybot.entity.shortlink data class ShortLinkPayload( - val target: String + val target: String, ) \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/shortlink/ShortLinkResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/shortlink/ShortLinkResponse.kt index 00dfd6c..3becb31 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/shortlink/ShortLinkResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/shortlink/ShortLinkResponse.kt @@ -8,5 +8,5 @@ package cn.rtast.fancybot.entity.shortlink data class ShortLinkResponse( - val id: String + val id: String, ) \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/tianxing/HistoryOfToday.kt b/src/main/kotlin/cn/rtast/fancybot/entity/tianxing/HistoryOfToday.kt index 1ac06fc..6f3fb15 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/tianxing/HistoryOfToday.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/tianxing/HistoryOfToday.kt @@ -10,15 +10,15 @@ package cn.rtast.fancybot.entity.tianxing import com.google.gson.annotations.SerializedName data class HistoryOfToday( - val result: Result + val result: Result, ) { data class Result( - val list: List + val list: List, ) data class Element( val title: String, @SerializedName("lsdate") - val lsDate: String + val lsDate: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/tts/TTSResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/tts/TTSResponse.kt index e21be19..5e2cbd8 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/tts/TTSResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/tts/TTSResponse.kt @@ -11,5 +11,5 @@ import com.google.gson.annotations.SerializedName data class TTSResponse( @SerializedName("URL") - val url: String + val url: String, ) \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/weather/Geo.kt b/src/main/kotlin/cn/rtast/fancybot/entity/weather/Geo.kt index 55b3d75..710fd62 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/weather/Geo.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/weather/Geo.kt @@ -8,7 +8,7 @@ package cn.rtast.fancybot.entity.weather data class Geo( - val location: List + val location: List, ) { data class Location( val name: String, diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/weather/Weather.kt b/src/main/kotlin/cn/rtast/fancybot/entity/weather/Weather.kt index a443610..29da23d 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/weather/Weather.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/weather/Weather.kt @@ -9,7 +9,7 @@ package cn.rtast.fancybot.entity.weather data class Weather( val now: Now, - val refer: Refer + val refer: Refer, ) { data class Now( val temp: String, @@ -19,6 +19,6 @@ data class Weather( ) data class Refer( - val sources: List + val sources: List, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/wiki/PageInfoResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/wiki/PageInfoResponse.kt index 1fc7f21..70b4cda 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/wiki/PageInfoResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/wiki/PageInfoResponse.kt @@ -10,14 +10,14 @@ package cn.rtast.fancybot.entity.wiki import com.google.gson.annotations.SerializedName data class PageInfoResponse( - val query: Query + val query: Query, ) { data class Query( - val pages: Map + val pages: Map, ) data class PageInfo( @SerializedName("fullurl") - val fullUrl: String + val fullUrl: String, ) } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/wiki/WikipediaResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/wiki/WikipediaResponse.kt index 2705cff..284f76a 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/wiki/WikipediaResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/wiki/WikipediaResponse.kt @@ -10,10 +10,10 @@ package cn.rtast.fancybot.entity.wiki import com.google.gson.annotations.SerializedName data class WikipediaResponse( - val query: Query + val query: Query, ) { data class Query( - val search: List + val search: List, ) data class Search( diff --git a/src/main/kotlin/cn/rtast/fancybot/entity/yt/YoutubeVideoResponse.kt b/src/main/kotlin/cn/rtast/fancybot/entity/yt/YoutubeVideoResponse.kt index 5dd387a..8591daf 100644 --- a/src/main/kotlin/cn/rtast/fancybot/entity/yt/YoutubeVideoResponse.kt +++ b/src/main/kotlin/cn/rtast/fancybot/entity/yt/YoutubeVideoResponse.kt @@ -9,11 +9,11 @@ package cn.rtast.fancybot.entity.yt data class YoutubeVideoResponse( - val items: List + val items: List, ) { data class Item( val snippet: Snippet, - val statistics: Statistics + val statistics: Statistics, ) data class Snippet( @@ -23,7 +23,7 @@ data class YoutubeVideoResponse( ) data class Thumbnails( - val standard: Standard + val standard: Standard, ) data class Standard( diff --git a/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt index 79bfb51..3eeb2ce 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt @@ -12,17 +12,12 @@ 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.OneBotListener class BaisiItem : Item() { override val itemNames = listOf("baisi", "白丝", "bs") override val itemPrice = 3.0 - override suspend fun redeemInGroup( - listener: OneBotListener, - message: GroupMessage, - after: Double - ): MessageChain.Builder { + override suspend fun redeemInGroup(message: GroupMessage, after: Double): MessageChain.Builder { val url = Http.get("https://v2.api-m.com/api/baisi").data val msg = MessageChain.Builder().addImage(url) return msg diff --git a/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt index 7ff972d..1150128 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt @@ -12,17 +12,12 @@ 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.OneBotListener class HeisiItem : Item() { override val itemNames = listOf("heisi", "黑丝", "hs") override val itemPrice = 3.0 - override suspend fun redeemInGroup( - listener: OneBotListener, - message: GroupMessage, - after: Double - ): MessageChain.Builder { + override suspend fun redeemInGroup(message: GroupMessage, after: Double): MessageChain.Builder { val url = Http.get("https://v2.api-m.com/api/heisi").data val msg = MessageChain.Builder().addImage(url) return msg diff --git a/src/main/kotlin/cn/rtast/fancybot/items/NiuziItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/NiuziItem.kt index c2eadbe..354d724 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/NiuziItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/NiuziItem.kt @@ -11,17 +11,12 @@ import cn.rtast.fancybot.niuziManager 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.OneBotListener class NiuziItem : Item() { override val itemNames = listOf("牛子", "nz", "niuzi") override val itemPrice = 10.0 - override suspend fun redeemInGroup( - listener: OneBotListener, - message: GroupMessage, - after: Double - ): MessageChain.Builder { + override suspend fun redeemInGroup(message: GroupMessage, after: Double): MessageChain.Builder { val before = niuziManager.getUser(message.sender.userId)!! val afterNiuzi = niuziManager.updateLength(message.sender.userId, -2.0)!! val msg = MessageChain.Builder() diff --git a/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt index ca825be..51e9d5c 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt @@ -16,18 +16,13 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.fancybot.util.str.fromArrayJson import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OneBotListener import java.net.URI class SetuItem : Item() { override val itemNames = listOf("setu", "色图", "st") override val itemPrice = 4.0 - override suspend fun redeemInGroup( - listener: OneBotListener, - message: GroupMessage, - after: Double - ): MessageChain.Builder { + override suspend fun redeemInGroup(message: GroupMessage, after: Double): MessageChain.Builder { val response = Http.get("$API_RTAST_URL/api/setu") .fromArrayJson>().first() if (response.r18) { diff --git a/src/main/kotlin/cn/rtast/fancybot/items/TenSetuItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/TenSetuItem.kt index 44f9d40..911ea73 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/TenSetuItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/TenSetuItem.kt @@ -19,7 +19,6 @@ import cn.rtast.fancybot.util.str.fromArrayJson import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.ob.MessageChain import cn.rtast.rob.util.ob.NodeMessageChain -import cn.rtast.rob.util.ob.OneBotListener import cn.rtast.rob.util.ob.asNode import java.io.File import java.net.URI @@ -66,11 +65,7 @@ class TenSetuItem : Item() { override val itemNames = listOf("十张色图") override val itemPrice = 20.0 - override suspend fun redeemInGroup( - listener: OneBotListener, - message: GroupMessage, - after: Double - ): MessageChain.Builder { + override suspend fun redeemInGroup(message: GroupMessage, after: Double): MessageChain.Builder { val msg = getImages(false) message.reply(msg) return MessageChain.Builder() @@ -81,11 +76,7 @@ class TenSetuR18Item : Item() { override val itemNames = listOf("十张色图r") override val itemPrice = 50.0 - override suspend fun redeemInGroup( - listener: OneBotListener, - message: GroupMessage, - after: Double - ): MessageChain.Builder { + override suspend fun redeemInGroup(message: GroupMessage, after: Double): MessageChain.Builder { message.reply(getImages(true)) return MessageChain.Builder() } diff --git a/src/main/kotlin/cn/rtast/fancybot/util/Http.kt b/src/main/kotlin/cn/rtast/fancybot/util/Http.kt index 284d2fd..911a134 100644 --- a/src/main/kotlin/cn/rtast/fancybot/util/Http.kt +++ b/src/main/kotlin/cn/rtast/fancybot/util/Http.kt @@ -57,7 +57,7 @@ object Http { fun get( url: String, params: Map? = null, - headers: Map? = null + headers: Map? = null, ): String { val paramsUrl = buildParams(url, params) val request = Request.Builder() @@ -71,7 +71,7 @@ object Http { inline fun get( url: String, params: Map? = null, - headers: Map? = null + headers: Map? = null, ): T { return get(url, params, headers).fromJson() } @@ -81,7 +81,7 @@ object Http { url: String, formBody: Map? = null, headers: Map? = null, - params: Map? = null + params: Map? = null, ): T { val body = FormBody.Builder() val paramsUrl = buildParams(url, params) @@ -102,7 +102,7 @@ object Http { url: String, jsonBody: String, headers: Map? = null, - params: Map? = null + params: Map? = null, ): T { val result = post(url, jsonBody, headers, params) return result.fromJson() @@ -113,7 +113,7 @@ object Http { url: String, jsonBody: String, headers: Map? = null, - params: Map? = null + params: Map? = null, ): String { val body = jsonBody.toRequestBody(jsonMediaType) val paramsUrl = buildParams(url, params) @@ -129,7 +129,7 @@ object Http { inline fun post( url: String, form: FormBody, - headers: Map? = null + headers: Map? = null, ): T { val request = Request.Builder() .post(form) @@ -142,7 +142,7 @@ object Http { inline fun post( url: String, form: MultipartBody, - headers: Map? = null + headers: Map? = null, ): T { val request = Request.Builder() .post(form) @@ -155,7 +155,7 @@ object Http { url: String, jsonBody: String, headers: Map? = null, - params: Map? = null + params: Map? = null, ): T { val paramsUrl = buildParams(url, params) val request = Request.Builder() @@ -169,7 +169,7 @@ object Http { url: String, jsonBody: String, headers: Map? = null, - params: Map? = null + params: Map? = null, ): String { val paramsUrl = buildParams(url, params) val request = Request.Builder() 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 9dbe899..0a60407 100644 --- a/src/main/kotlin/cn/rtast/fancybot/util/item/Item.kt +++ b/src/main/kotlin/cn/rtast/fancybot/util/item/Item.kt @@ -9,15 +9,13 @@ package cn.rtast.fancybot.util.item import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OneBotListener abstract class Item { abstract val itemNames: List abstract val itemPrice: Double abstract suspend fun redeemInGroup( - listener: OneBotListener, message: GroupMessage, - after: Double + after: Double, ): MessageChain.Builder } \ No newline at end of file diff --git a/src/main/kotlin/cn/rtast/fancybot/util/mcbot/MCClient.kt b/src/main/kotlin/cn/rtast/fancybot/util/mcbot/MCClient.kt index c9ac245..c664c3e 100644 --- a/src/main/kotlin/cn/rtast/fancybot/util/mcbot/MCClient.kt +++ b/src/main/kotlin/cn/rtast/fancybot/util/mcbot/MCClient.kt @@ -42,7 +42,7 @@ import kotlin.random.Random class MCClient( private val serverHost: String, private val serverPort: Int, - private val botName: String + private val botName: String, ) { private lateinit var client: TcpClientSession private val logger = Logger.getLogger() diff --git a/src/main/kotlin/cn/rtast/fancybot/util/misc/Image.kt b/src/main/kotlin/cn/rtast/fancybot/util/misc/Image.kt index 92f4c1e..4cea849 100644 --- a/src/main/kotlin/cn/rtast/fancybot/util/misc/Image.kt +++ b/src/main/kotlin/cn/rtast/fancybot/util/misc/Image.kt @@ -35,7 +35,7 @@ fun Graphics2D.drawCustomImage( y: Int, maxWidth: Double, maxHeight: Double, - clip: Boolean = false + clip: Boolean = false, ) { val (targetWidth, targetHeight) = image.getScaledWidth(maxWidth, maxHeight) if (clip) { diff --git a/src/main/kotlin/cn/rtast/fancybot/util/misc/Misc.kt b/src/main/kotlin/cn/rtast/fancybot/util/misc/Misc.kt index 1bf9915..f4cbd7d 100644 --- a/src/main/kotlin/cn/rtast/fancybot/util/misc/Misc.kt +++ b/src/main/kotlin/cn/rtast/fancybot/util/misc/Misc.kt @@ -12,7 +12,6 @@ import cn.rtast.fancybot.util.Http import cn.rtast.rob.BotInstance import cn.rtast.rob.ROneBotFactory import cn.rtast.rob.util.ob.OneBotAction -import cn.rtast.rob.util.ob.OneBotListener import java.io.File import kotlin.random.Random import kotlin.time.Duration.Companion.hours @@ -23,8 +22,8 @@ fun randomBooleanWithProbability(probability: Double): Boolean { return randomValue <= (probability * 100) } -suspend fun OneBotListener.getUserName(action: OneBotAction, groupId: Long, userId: Long): String { - val info = action.getGroupMemberInfo(groupId, userId) +suspend fun OneBotAction.getUserName(groupId: Long, userId: Long): String { + val info = this.getGroupMemberInfo(groupId, userId) return info.card ?: info.nickname }