feat: update item

src/main/kotlin/cn/rtast/fancybot/commands/AntiRevokeCommand.kt

@@ -32,7 +32,7 @@ class AntiRevokeCommand : BaseCommand() {
         suspend fun getMessageCallback(listener: OBMessage, message: GetMessage) {
             val msgList = mutableListOf<ArrayMessage>()
             msgList.add(ArrayMessage(ArrayMessageType.at, ArrayMessage.Data(qq = message.data.sender.userId.toString())))
-            msgList.add(ArrayMessage(ArrayMessageType.text, ArrayMessage.Data(text = "\n被撤回的消息如下: ")))
+            msgList.add(ArrayMessage(ArrayMessageType.text, ArrayMessage.Data(text = "\n被撤回的消息如下: \n")))
             msgList.addAll(message.data.message)
             listener.sendGroupMessage(message.data.groupId!!, msgList)
         }

src/main/kotlin/cn/rtast/fancybot/commands/RedeemCommand.kt

@@ -7,9 +7,7 @@
 
 package cn.rtast.fancybot.commands
 
-import cn.rtast.fancybot.entity.Baisi
-import cn.rtast.fancybot.entity.Setu
-import cn.rtast.fancybot.util.Http
+import cn.rtast.fancybot.itemManager
 import cn.rtast.rob.entity.GroupMessage
 import cn.rtast.rob.util.BaseCommand
 import cn.rtast.rob.util.ob.MessageChain
@@ -18,12 +16,6 @@ import cn.rtast.rob.util.ob.OBMessage
 class RedeemCommand : BaseCommand() {
     override val commandNames = listOf("/redeem", "/兑换", "/rdm")
 
-    private val items = mapOf(
-        "色图" to 50,
-        "黑丝" to 60,
-        "白丝" to 70
-    )
-
     override suspend fun executeGroup(listener: OBMessage, message: GroupMessage, args: List<String>) {
         val status = signManager.getStatus(message.sender.userId)
         if (status == null) {
@@ -36,7 +28,8 @@ class RedeemCommand : BaseCommand() {
         }
         val item = args.first()
         if (item == "list" || item == "列表") {
-            val priceTable = items.entries.joinToString("\n") { (key, value) -> "名称: $key=$value 积分" }
+            val priceTable =
+                itemManager.items.joinToString("\n") { "[${it.itemNames.joinToString("|")}]:${it.itemPrice}积分" }
             val msg = MessageChain.Builder()
                 .addAt(message.sender.userId)
                 .addNewLine()
@@ -45,8 +38,8 @@ class RedeemCommand : BaseCommand() {
             listener.sendGroupMessage(message.groupId, msg)
             return
         }
-        val selectedItemKey = items.keys.find { it == item }
-        if (selectedItemKey == null) {
+        val selectedItem = itemManager.items.find { it.itemNames.any { any -> any == item } }
+        if (selectedItem == null) {
             val msg = MessageChain.Builder()
                 .addAt(message.sender.userId)
                 .addText("没有找到你想兑换的东西呢")
@@ -56,8 +49,8 @@ class RedeemCommand : BaseCommand() {
             listener.sendGroupMessage(message.groupId, msg)
             return
         }
-        val selectedItemPrice = items[item]!!
-        if (selectedItemPrice > status?.points!!) {
+        val selectedItemPrice =selectedItem.itemPrice
+        if (selectedItemPrice > status.points) {
             val msg = MessageChain.Builder()
                 .addAt(message.sender.userId)
                 .addText("你的积分不够兑换这个物品呢~")
@@ -75,37 +68,6 @@ class RedeemCommand : BaseCommand() {
             .addText("你花费了 $selectedItemPrice 点积分来兑换奖品, 还剩 $afterStatus 点积分")
             .build()
         listener.sendGroupMessage(message.groupId, msg)
-        when (selectedItemKey) {
-            "黑丝" -> {
-                val url = Http.get<Baisi>("https://v2.api-m.com/api/heisi").data
-                val msg = MessageChain.Builder()
-                    .addAt(message.sender.userId)
-                    .addImage(url)
-                    .build()
-                listener.sendGroupMessage(message.groupId, msg)
-            }
-
-            "色图" -> {
-                val url = Http.get<Setu>("https://setu.yuban10703.xyz/setu?r18=1&num=1")
-                    .data.first().urls.original.replace(
-                        "https://i.pximg.net",
-                        "https://proxy.rtast.cn/https/i.pixiv.cat"
-                    )
-                val msg = MessageChain.Builder()
-                    .addAt(message.sender.userId)
-                    .addImage(url)
-                    .build()
-                listener.sendGroupMessage(message.groupId, msg)
-            }
-
-            "白丝" -> {
-                val url = Http.get<Baisi>("https://v2.api-m.com/api/baisi").data
-                val msg = MessageChain.Builder()
-                    .addAt(message.sender.userId)
-                    .addImage(url)
-                    .build()
-                listener.sendGroupMessage(message.groupId, msg)
-            }
-        }
+        selectedItem.redeemGroup(listener, message, afterStatus)
     }
 }