From 5b8de20430018c5f09b8fb184b45d091c0f09452 Mon Sep 17 00:00:00 2001 From: RTAkland Date: Fri, 8 Nov 2024 20:59:51 +0800 Subject: [PATCH] chore: upgrade ronebot to 2.4.5 --- gradle/libs.versions.toml | 2 +- src/main/kotlin/cn/rtast/fancybot/FancyBot.kt | 8 +++----- .../kotlin/cn/rtast/fancybot/commands/AboutCommand.kt | 2 +- src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt | 4 ++-- .../kotlin/cn/rtast/fancybot/commands/StatusCommand.kt | 2 +- .../kotlin/cn/rtast/fancybot/commands/SupportMeCommand.kt | 2 +- .../kotlin/cn/rtast/fancybot/commands/lookup/AICommand.kt | 4 ++-- .../rtast/fancybot/commands/lookup/AnimeSearchCommand.kt | 4 ++-- .../cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt | 4 ++-- .../rtast/fancybot/commands/lookup/DomainPriceCommand.kt | 2 +- .../fancybot/commands/lookup/GithubLatestCommitCommand.kt | 2 +- .../rtast/fancybot/commands/lookup/GithubUserCommand.kt | 2 +- .../cn/rtast/fancybot/commands/lookup/GravatarCommand.kt | 2 +- .../rtast/fancybot/commands/lookup/IdiomExplainCommand.kt | 2 +- .../cn/rtast/fancybot/commands/lookup/MusicCommand.kt | 2 +- .../cn/rtast/fancybot/commands/lookup/NslookupCommand.kt | 4 ++-- .../cn/rtast/fancybot/commands/lookup/PixivCommand.kt | 4 ++-- .../cn/rtast/fancybot/commands/lookup/ShotCommand.kt | 4 ++-- .../cn/rtast/fancybot/commands/lookup/TheCatCommand.kt | 2 +- .../fancybot/commands/lookup/TheHistoryOfTodayCommand.kt | 4 ++-- .../cn/rtast/fancybot/commands/lookup/WeatherCommand.kt | 2 +- .../cn/rtast/fancybot/commands/lookup/WikipediaCommand.kt | 2 +- .../fancybot/commands/misc/BullShitGenerateCommand.kt | 4 ++-- .../cn/rtast/fancybot/commands/misc/CompilerCommand.kt | 2 +- .../cn/rtast/fancybot/commands/misc/HTTPCatCommand.kt | 2 +- .../cn/rtast/fancybot/commands/misc/HTTPDogCommand.kt | 2 +- .../cn/rtast/fancybot/commands/misc/HitokotoCommand.kt | 2 +- .../kotlin/cn/rtast/fancybot/commands/misc/JrrpCommand.kt | 2 +- .../kotlin/cn/rtast/fancybot/commands/misc/JueCommand.kt | 2 +- .../cn/rtast/fancybot/commands/misc/MinecraftCommand.kt | 6 +++--- .../cn/rtast/fancybot/commands/misc/QRCodeCommand.kt | 2 +- .../kotlin/cn/rtast/fancybot/commands/misc/RUACommand.kt | 2 +- .../cn/rtast/fancybot/commands/misc/RandomMusicCommand.kt | 2 +- .../cn/rtast/fancybot/commands/misc/ReactionCommand.kt | 2 +- .../cn/rtast/fancybot/commands/misc/RemakeCommand.kt | 2 +- .../cn/rtast/fancybot/commands/misc/SendLikeCommand.kt | 2 +- .../kotlin/cn/rtast/fancybot/commands/misc/TTSCommand.kt | 2 +- .../cn/rtast/fancybot/commands/misc/TenSetuCommand.kt | 2 +- .../kotlin/cn/rtast/fancybot/commands/misc/ZiBiCommand.kt | 2 +- .../cn/rtast/fancybot/commands/niuzi/MyNiuziCommand.kt | 2 +- .../cn/rtast/fancybot/commands/niuzi/NiuziBankCommand.kt | 2 +- .../rtast/fancybot/commands/niuzi/NiuziJiJianCommand.kt | 2 +- .../rtast/fancybot/commands/niuzi/NiuziManagerCommand.kt | 2 +- .../cn/rtast/fancybot/commands/niuzi/NiuziRankCommand.kt | 2 +- .../rtast/fancybot/commands/niuzi/NiuziRedeemCommand.kt | 2 +- .../cn/rtast/fancybot/commands/niuzi/NiuziSignCommand.kt | 2 +- .../cn/rtast/fancybot/commands/parse/AsciiArtCommand.kt | 4 ++-- .../rtast/fancybot/commands/parse/BilibiliParseCommand.kt | 2 +- .../fancybot/commands/parse/DouyinVideoParseCommand.kt | 2 +- .../rtast/fancybot/commands/parse/GitHubParseCommand.kt | 2 +- .../cn/rtast/fancybot/commands/parse/ImageURLCommand.kt | 4 ++-- .../cn/rtast/fancybot/commands/parse/ReverseGIFCommand.kt | 2 +- .../fancybot/commands/parse/YoutubeVideoParseCommand.kt | 2 +- .../cn/rtast/fancybot/commands/reply/ImageBedCommand.kt | 4 ++-- .../rtast/fancybot/commands/reply/InvertImageCommand.kt | 2 +- .../cn/rtast/fancybot/commands/reply/RandomRGBCommand.kt | 2 +- .../cn/rtast/fancybot/commands/reply/SpeedUpGIFCommand.kt | 2 +- src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt | 2 +- src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt | 2 +- src/main/kotlin/cn/rtast/fancybot/items/NiuziItem.kt | 2 +- src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt | 2 +- src/main/kotlin/cn/rtast/fancybot/items/TenSetuItem.kt | 6 +++--- src/main/kotlin/cn/rtast/fancybot/util/item/Item.kt | 2 +- src/main/kotlin/cn/rtast/fancybot/util/misc/Misc.kt | 2 +- 64 files changed, 82 insertions(+), 84 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1cbfb28..58052e2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,6 +1,6 @@ [versions] kotlinVersion = "2.0.20" -ronebotVersion = "2.4.4" +ronebotVersion = "2.4.5" 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 0a5bf4e..cdb4f6a 100644 --- a/src/main/kotlin/cn/rtast/fancybot/FancyBot.kt +++ b/src/main/kotlin/cn/rtast/fancybot/FancyBot.kt @@ -17,8 +17,6 @@ import cn.rtast.fancybot.commands.reply.ImageBedCommand import cn.rtast.fancybot.commands.reply.InvertImageCommand import cn.rtast.fancybot.commands.reply.RandomRGBCommand import cn.rtast.fancybot.commands.reply.SpeedUpGIFCommand -import cn.rtast.fancybot.entity.nailong.NaiLongDetectPayload -import cn.rtast.fancybot.entity.nailong.NaiLongDetectResponse import cn.rtast.fancybot.enums.WSType import cn.rtast.fancybot.util.* import cn.rtast.fancybot.util.misc.ImageBed @@ -45,9 +43,9 @@ import cn.rtast.rob.entity.lagrange.FileEvent import cn.rtast.rob.entity.lagrange.PokeEvent import cn.rtast.rob.enums.ArrayMessageType import cn.rtast.rob.enums.QQFace -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.OneBotAction -import cn.rtast.rob.util.ob.OneBotListener +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.OneBotAction +import cn.rtast.rob.onebot.OneBotListener import com.madgag.gif.fmsware.GifDecoder import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt index 2a8225f..bd3c624 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/AboutCommand.kt @@ -9,8 +9,8 @@ package cn.rtast.fancybot.commands import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("关于") class AboutCommand : BaseCommand() { diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt index be1c487..33544ce 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/HelpCommand.kt @@ -11,9 +11,9 @@ import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.fancybot.commands import cn.rtast.fancybot.configManager import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.NodeMessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.NodeMessageChain import kotlin.reflect.full.findAnnotation import kotlin.reflect.full.hasAnnotation diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/StatusCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/StatusCommand.kt index 63349f5..7cfe115 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/StatusCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/StatusCommand.kt @@ -13,8 +13,8 @@ import cn.rtast.fancybot.enums.CommandAction import cn.rtast.fancybot.util.CommandInterceptor import cn.rtast.fancybot.util.file.insertActionRecord import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import java.time.Instant @CommandDescription("状态") diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/SupportMeCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/SupportMeCommand.kt index 04d601a..851800f 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/SupportMeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/SupportMeCommand.kt @@ -11,8 +11,8 @@ import cn.rtast.fancybot.ASSETS_BASE_URL import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import java.net.URI @CommandDescription("给我打钱!") 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 d9b4be1..83547de 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AICommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AICommand.kt @@ -18,9 +18,9 @@ import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.file.insertActionRecord import cn.rtast.fancybot.util.str.toJson import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.NodeMessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.NodeMessageChain @CommandDescription("问AI(GPT)") class AICommand : BaseCommand() { 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 26c9110..4ec9fe4 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AnimeSearchCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/AnimeSearchCommand.kt @@ -13,9 +13,9 @@ import cn.rtast.fancybot.entity.bgm.BGMSearch import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.NodeMessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.NodeMessageChain import okhttp3.OkHttpClient import okhttp3.Request 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 fb92e7d..700b0ba 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/CigaretteCommand.kt @@ -13,9 +13,9 @@ import cn.rtast.fancybot.entity.cigarette.Cigarette import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.NodeMessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.NodeMessageChain import java.net.URI @CommandDescription("查询香烟价格") 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 77858d8..6879a41 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/DomainPriceCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/DomainPriceCommand.kt @@ -15,8 +15,8 @@ import cn.rtast.fancybot.util.misc.toByteArray import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.fancybot.util.str.toJson import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import java.awt.Color import java.awt.Font import java.awt.image.BufferedImage 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 520765f..044f6ec 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubLatestCommitCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubLatestCommitCommand.kt @@ -14,8 +14,8 @@ import cn.rtast.fancybot.entity.github.LatestCommit import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.str.fromArrayJson import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("查询Github上的仓库的最新一次的提交信息") class GithubLatestCommitCommand : BaseCommand() { 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 9f600fa..380918e 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubUserCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GithubUserCommand.kt @@ -17,8 +17,8 @@ import cn.rtast.fancybot.util.misc.toBufferedImage import cn.rtast.fancybot.util.misc.toByteArray import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import java.awt.Color import java.awt.Font import java.awt.image.BufferedImage 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 39e44e0..d826392 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GravatarCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/GravatarCommand.kt @@ -12,8 +12,8 @@ import cn.rtast.fancybot.util.misc.toURL import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.fancybot.util.str.getMD5 import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("查询用户的Gravatar头像") class GravatarCommand : BaseCommand() { 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 8a830ab..f9940d0 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/IdiomExplainCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/IdiomExplainCommand.kt @@ -12,8 +12,8 @@ import cn.rtast.fancybot.configManager import cn.rtast.fancybot.entity.apispace.IdiomExplainResponse import cn.rtast.fancybot.util.Http import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("解释一个成语") class IdiomExplainCommand : BaseCommand() { 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 b8227f3..c12757a 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MusicCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/MusicCommand.kt @@ -16,8 +16,8 @@ import cn.rtast.fancybot.entity.music.qq.QQMSearch import cn.rtast.fancybot.util.Http import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.MusicShareType +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import java.time.Instant @CommandDescription("网易云音乐点歌") 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 1087215..36972f7 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/NslookupCommand.kt @@ -12,9 +12,9 @@ import cn.rtast.fancybot.configManager import cn.rtast.fancybot.entity.IPGeo import cn.rtast.fancybot.util.Http import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.toNode import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.toNode import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.net.InetAddress 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 c8d8fa3..1091361 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/PixivCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/PixivCommand.kt @@ -13,9 +13,9 @@ import cn.rtast.fancybot.entity.pixiv.Ranking import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.NodeMessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.NodeMessageChain import java.net.URI @CommandDescription("获取Pixiv上的图片") 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 2157f73..1af97b9 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/ShotCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/ShotCommand.kt @@ -10,9 +10,9 @@ package cn.rtast.fancybot.commands.lookup import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.NodeMessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.NodeMessageChain private fun generateNodeMessage(targetId: String, times: Int = 10): NodeMessageChain { 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 0339a2f..6a94db8 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheCatCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheCatCommand.kt @@ -15,8 +15,8 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.fancybot.util.str.fromArrayJson import cn.rtast.fancybot.util.str.proxy import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("随机猫猫图") class TheCatCommand : BaseCommand() { 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 7e80713..2da8627 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheHistoryOfTodayCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/TheHistoryOfTodayCommand.kt @@ -12,9 +12,9 @@ import cn.rtast.fancybot.configManager import cn.rtast.fancybot.entity.tianxing.HistoryOfToday import cn.rtast.fancybot.util.Http import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.toNode import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.toNode import java.time.LocalDateTime import java.time.ZoneId import java.time.format.DateTimeFormatter 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 25af52b..9010fec 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WeatherCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WeatherCommand.kt @@ -19,8 +19,8 @@ import cn.rtast.fancybot.util.misc.toBufferedImage import cn.rtast.fancybot.util.misc.toByteArray import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import java.awt.Color import java.awt.Font import java.awt.image.BufferedImage 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 1cba6bb..5fc6b7c 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WikipediaCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/lookup/WikipediaCommand.kt @@ -14,8 +14,8 @@ import cn.rtast.fancybot.enums.CommandAction import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.file.insertActionRecord import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import org.jsoup.Jsoup @CommandDescription("查询wiki百科") 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 d1bb9f5..050c0f7 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/BullShitGenerateCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/BullShitGenerateCommand.kt @@ -13,9 +13,9 @@ import cn.rtast.fancybot.entity.bullshit.BullShit import cn.rtast.fancybot.util.misc.Resources import cn.rtast.fancybot.util.str.fromJson import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.NodeMessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.NodeMessageChain import kotlin.random.Random @CommandDescription("狗屁不通文章生成器") 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 5aadac4..d18c5f4 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/CompilerCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/CompilerCommand.kt @@ -17,8 +17,8 @@ import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.file.insertActionRecord import cn.rtast.fancybot.util.str.toJson import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("执行不同语言的代码") class CompilerCommand : BaseCommand() { 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 099a9b4..f58d667 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPCatCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPCatCommand.kt @@ -12,8 +12,8 @@ import cn.rtast.fancybot.enums.HttpStatusCode import cn.rtast.fancybot.util.misc.Resources import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("随机HTTP猫猫") class HTTPCatCommand : BaseCommand() { 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 f2bf107..0908011 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPDogCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/HTTPDogCommand.kt @@ -12,8 +12,8 @@ import cn.rtast.fancybot.enums.HttpStatusCode import cn.rtast.fancybot.util.misc.Resources import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("随机HTTP狗狗") class HTTPDogCommand : BaseCommand() { 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 553aa71..6aae911 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/HitokotoCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/HitokotoCommand.kt @@ -11,8 +11,8 @@ import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.fancybot.entity.Hitokoto import cn.rtast.fancybot.util.Http import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("一言") class HitokotoCommand : BaseCommand() { 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 d825501..eb3b364 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/JrrpCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/JrrpCommand.kt @@ -10,8 +10,8 @@ package cn.rtast.fancybot.commands.misc import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.fancybot.util.file.JrrpManager import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("今日人品~") class JrrpCommand : BaseCommand() { 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 bcea7f3..e506a51 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/JueCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/JueCommand.kt @@ -15,8 +15,8 @@ import cn.rtast.fancybot.util.misc.toBufferedImage import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import com.madgag.gif.fmsware.GifDecoder import java.awt.image.BufferedImage import java.net.URI 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 1a9e197..c9bb95d 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/MinecraftCommand.kt @@ -48,12 +48,12 @@ import cn.rtast.motdpinger.JavaPing import cn.rtast.rcon.exceptions.AuthFailedException import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.entity.PrivateMessage +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.toMessageChain +import cn.rtast.rob.onebot.toNode import cn.rtast.rob.segment.NewLine import cn.rtast.rob.segment.Text import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.toMessageChain -import cn.rtast.rob.util.ob.toNode import okhttp3.FormBody import java.awt.AlphaComposite import java.awt.Color 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 258b444..af132b0 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/QRCodeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/QRCodeCommand.kt @@ -15,8 +15,8 @@ import cn.rtast.fancybot.util.misc.toByteArray import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import com.google.zxing.BarcodeFormat import com.google.zxing.BinaryBitmap import com.google.zxing.EncodeHintType 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 40b5bef..14f9f90 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/RUACommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/RUACommand.kt @@ -10,8 +10,8 @@ package cn.rtast.fancybot.commands.misc import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("RUA!") class RUACommand : BaseCommand() { 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 bb5c72c..1118739 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/RandomMusicCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/RandomMusicCommand.kt @@ -13,8 +13,8 @@ import cn.rtast.fancybot.entity.music.TopSong import cn.rtast.fancybot.util.Http import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.MusicShareType +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("获取随机热榜音乐(网易云)") class RandomMusicCommand : BaseCommand() { 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 fa0bc43..85ce3bd 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/ReactionCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/ReactionCommand.kt @@ -10,8 +10,8 @@ package cn.rtast.fancybot.commands.misc import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.QQFace +import cn.rtast.rob.onebot.OneBotAction import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.OneBotAction @CommandDescription("让你的消息得到回应(reaction)!") class ReactionCommand : BaseCommand() { 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 aba8a4c..7326289 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/RemakeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/RemakeCommand.kt @@ -11,8 +11,8 @@ import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.fancybot.enums.CountryList import cn.rtast.fancybot.util.misc.randomBooleanWithProbability import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("人生重开模拟器") class RemakeCommand : BaseCommand() { 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 644cea6..8bfa5bb 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/SendLikeCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/SendLikeCommand.kt @@ -9,8 +9,8 @@ package cn.rtast.fancybot.commands.misc import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("资料卡点赞") class SendLikeCommand : BaseCommand() { 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 8ea2f33..a606f76 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/TTSCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/TTSCommand.kt @@ -13,8 +13,8 @@ import cn.rtast.fancybot.util.Http import cn.rtast.fancybot.util.str.proxy import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.AIRecordCharacter +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import okhttp3.FormBody @CommandDescription("将文字转换成语音(TTS)!") 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 27aa01b..37e6688 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/TenSetuCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/TenSetuCommand.kt @@ -9,8 +9,8 @@ package cn.rtast.fancybot.commands.misc import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @Deprecated("已迁移到兑换列表中") @CommandDescription("获得十张色图!") 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 452a57e..3096012 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/misc/ZiBiCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/misc/ZiBiCommand.kt @@ -10,8 +10,8 @@ package cn.rtast.fancybot.commands.misc import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.entity.PrivateMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain val users = mutableMapOf() 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 4ec88f3..82e1a31 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/MyNiuziCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/MyNiuziCommand.kt @@ -10,8 +10,8 @@ package cn.rtast.fancybot.commands.niuzi import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.fancybot.niuziManager import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("查询自己牛子的长度") 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 cab2ca0..4f24c99 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziBankCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziBankCommand.kt @@ -14,8 +14,8 @@ import cn.rtast.fancybot.niuziManager import cn.rtast.fancybot.util.misc.getUserName import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain private suspend fun noAccount(message: GroupMessage) { message.reply("你还没有银行账户呢, 发送`创建账户`来创建一个账户吧~") 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 fcee982..ef6e2e1 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziJiJianCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziJiJianCommand.kt @@ -11,8 +11,8 @@ import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.fancybot.niuziManager import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("来一起激情击剑吧!") class NiuziJiJianCommand : BaseCommand() { 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 d122f3f..5b76fee 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziManagerCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziManagerCommand.kt @@ -13,8 +13,8 @@ import cn.rtast.fancybot.niuziManager import cn.rtast.fancybot.util.misc.getUserName import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("在群内设置某个成员的牛子银行余额或者现金牛子长度") class NiuziManagerCommand : BaseCommand() { 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 2245212..ece72eb 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRankCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRankCommand.kt @@ -11,8 +11,8 @@ import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.fancybot.niuziBankManager import cn.rtast.fancybot.niuziManager import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("查询所有人的牛子的排行榜") class NiuziRankCommand : BaseCommand() { 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 e646f7c..da00f18 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRedeemCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziRedeemCommand.kt @@ -11,8 +11,8 @@ import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.fancybot.itemManager import cn.rtast.fancybot.niuziManager import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("使用牛子长度兑换物品") class NiuziRedeemCommand : BaseCommand() { 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 e4decba..b2d768c 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziSignCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/niuzi/NiuziSignCommand.kt @@ -11,8 +11,8 @@ import cn.rtast.fancybot.annotations.CommandDescription import cn.rtast.fancybot.niuziManager import cn.rtast.fancybot.util.misc.getUserName import cn.rtast.rob.entity.GroupMessage +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain @CommandDescription("牛子签到~") class NiuziSignCommand : BaseCommand() { 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 73be40b..c69d0c3 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/AsciiArtCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/AsciiArtCommand.kt @@ -18,9 +18,9 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GetMessage import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.toMessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.toMessageChain import com.madgag.gif.fmsware.GifDecoder import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext 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 b095cb8..3ec0886 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/BilibiliParseCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/BilibiliParseCommand.kt @@ -21,7 +21,7 @@ import cn.rtast.fancybot.util.str.fromJson 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.onebot.MessageChain import okhttp3.OkHttpClient import okhttp3.Request import java.awt.Color diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/parse/DouyinVideoParseCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/parse/DouyinVideoParseCommand.kt index c997f25..e9fab28 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/DouyinVideoParseCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/DouyinVideoParseCommand.kt @@ -19,7 +19,7 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.fancybot.util.str.formatNumber import cn.rtast.fancybot.util.str.proxy import cn.rtast.rob.entity.GroupMessage -import cn.rtast.rob.util.ob.MessageChain +import cn.rtast.rob.onebot.MessageChain import okhttp3.OkHttpClient import okhttp3.Request import java.awt.Color diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/parse/GitHubParseCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/parse/GitHubParseCommand.kt index 8a27d72..6604db2 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/GitHubParseCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/GitHubParseCommand.kt @@ -18,7 +18,7 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.fancybot.util.str.formatNumberEnglish import cn.rtast.fancybot.util.str.setTruncate import cn.rtast.rob.entity.GroupMessage -import cn.rtast.rob.util.ob.MessageChain +import cn.rtast.rob.onebot.MessageChain import java.awt.Color import java.awt.Font import java.awt.RenderingHints diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/parse/ImageURLCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/parse/ImageURLCommand.kt index 7bd9984..88aa6a4 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/ImageURLCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/ImageURLCommand.kt @@ -12,8 +12,8 @@ import cn.rtast.fancybot.configManager import cn.rtast.rob.entity.GetMessage 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.toNode +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.toNode object ImageURLCommand { 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 d06443d..419c7b5 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/ReverseGIFCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/ReverseGIFCommand.kt @@ -13,8 +13,8 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GetMessage import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.enums.ArrayMessageType +import cn.rtast.rob.onebot.MessageChain import cn.rtast.rob.util.BaseCommand -import cn.rtast.rob.util.ob.MessageChain import com.madgag.gif.fmsware.GifDecoder import java.net.URI diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/parse/YoutubeVideoParseCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/parse/YoutubeVideoParseCommand.kt index d80bee2..e77b19a 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/parse/YoutubeVideoParseCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/parse/YoutubeVideoParseCommand.kt @@ -17,7 +17,7 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.fancybot.util.str.formatNumber import cn.rtast.fancybot.util.str.proxy import cn.rtast.rob.entity.GroupMessage -import cn.rtast.rob.util.ob.MessageChain +import cn.rtast.rob.onebot.MessageChain import java.awt.Color import java.awt.Font import java.awt.RenderingHints diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/reply/ImageBedCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/reply/ImageBedCommand.kt index d64d172..d86674b 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/reply/ImageBedCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/reply/ImageBedCommand.kt @@ -15,8 +15,8 @@ import cn.rtast.fancybot.util.misc.ImageBed import cn.rtast.fancybot.util.misc.toURL import cn.rtast.rob.entity.GetMessage import cn.rtast.rob.entity.GroupMessage -import cn.rtast.rob.util.ob.MessageChain -import cn.rtast.rob.util.ob.toNode +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.toNode import okio.IOException object ImageBedCommand { diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/reply/InvertImageCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/reply/InvertImageCommand.kt index 053b502..a1ffdd6 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/reply/InvertImageCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/reply/InvertImageCommand.kt @@ -15,7 +15,7 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GetMessage import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.entity.images -import cn.rtast.rob.util.ob.MessageChain +import cn.rtast.rob.onebot.MessageChain object InvertImageCommand { diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/reply/RandomRGBCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/reply/RandomRGBCommand.kt index bac14c8..5ce966b 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/reply/RandomRGBCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/reply/RandomRGBCommand.kt @@ -15,7 +15,7 @@ import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GetMessage import cn.rtast.rob.entity.GroupMessage import cn.rtast.rob.entity.images -import cn.rtast.rob.util.ob.MessageChain +import cn.rtast.rob.onebot.MessageChain object RandomRGBCommand { diff --git a/src/main/kotlin/cn/rtast/fancybot/commands/reply/SpeedUpGIFCommand.kt b/src/main/kotlin/cn/rtast/fancybot/commands/reply/SpeedUpGIFCommand.kt index 13b77b3..7344ae3 100644 --- a/src/main/kotlin/cn/rtast/fancybot/commands/reply/SpeedUpGIFCommand.kt +++ b/src/main/kotlin/cn/rtast/fancybot/commands/reply/SpeedUpGIFCommand.kt @@ -15,7 +15,7 @@ import cn.rtast.fancybot.util.misc.toURL import cn.rtast.fancybot.util.str.encodeToBase64 import cn.rtast.rob.entity.GetMessage import cn.rtast.rob.entity.GroupMessage -import cn.rtast.rob.util.ob.MessageChain +import cn.rtast.rob.onebot.MessageChain import com.madgag.gif.fmsware.GifDecoder object SpeedUpGIFCommand { diff --git a/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt index 3eeb2ce..81d6057 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/BaisiItem.kt @@ -11,7 +11,7 @@ import cn.rtast.fancybot.entity.Baisi 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.onebot.MessageChain class BaisiItem : Item() { override val itemNames = listOf("baisi", "白丝", "bs") diff --git a/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt index 1150128..ae4a0e2 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/HeisiItem.kt @@ -11,7 +11,7 @@ import cn.rtast.fancybot.entity.Baisi 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.onebot.MessageChain class HeisiItem : Item() { override val itemNames = listOf("heisi", "黑丝", "hs") diff --git a/src/main/kotlin/cn/rtast/fancybot/items/NiuziItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/NiuziItem.kt index 354d724..b6d6503 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/NiuziItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/NiuziItem.kt @@ -10,7 +10,7 @@ package cn.rtast.fancybot.items 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.onebot.MessageChain class NiuziItem : Item() { override val itemNames = listOf("牛子", "nz", "niuzi") diff --git a/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt index 51e9d5c..63229a7 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/SetuItem.kt @@ -15,7 +15,7 @@ import cn.rtast.fancybot.util.item.Item 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.onebot.MessageChain import java.net.URI class SetuItem : Item() { diff --git a/src/main/kotlin/cn/rtast/fancybot/items/TenSetuItem.kt b/src/main/kotlin/cn/rtast/fancybot/items/TenSetuItem.kt index 6ec55d9..04db3dc 100644 --- a/src/main/kotlin/cn/rtast/fancybot/items/TenSetuItem.kt +++ b/src/main/kotlin/cn/rtast/fancybot/items/TenSetuItem.kt @@ -17,9 +17,9 @@ import cn.rtast.fancybot.util.item.Item 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.NodeMessageChain -import cn.rtast.rob.util.ob.toNode +import cn.rtast.rob.onebot.MessageChain +import cn.rtast.rob.onebot.NodeMessageChain +import cn.rtast.rob.onebot.toNode import java.io.File import java.net.URI 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 0a60407..90236b9 100644 --- a/src/main/kotlin/cn/rtast/fancybot/util/item/Item.kt +++ b/src/main/kotlin/cn/rtast/fancybot/util/item/Item.kt @@ -8,7 +8,7 @@ package cn.rtast.fancybot.util.item import cn.rtast.rob.entity.GroupMessage -import cn.rtast.rob.util.ob.MessageChain +import cn.rtast.rob.onebot.MessageChain abstract class Item { abstract val itemNames: List 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 f4cbd7d..21b4f03 100644 --- a/src/main/kotlin/cn/rtast/fancybot/util/misc/Misc.kt +++ b/src/main/kotlin/cn/rtast/fancybot/util/misc/Misc.kt @@ -11,7 +11,7 @@ import cn.rtast.fancybot.* 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.onebot.OneBotAction import java.io.File import kotlin.random.Random import kotlin.time.Duration.Companion.hours