feat!: merge #18

feat!: restrict set command permission

Author: Samarium150

.editorconfig

@@ -1,5 +1,10 @@
+root = true
+
+[*]
+insert_final_newline = true
+
 [*.{kt, kts}]
 max_line_length = 120
 tab_width = 4
 ij_continuation_indent_size = 4
-indent_size = 4
+indent_size = 4

build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 group = "com.github.samarium150"
-version = "1.5.2"
+version = "1.6"
 
 repositories {
     mavenLocal()

src/main/kotlin/APIError.kt

@@ -26,7 +26,7 @@ package com.github.samarium150.mirai.plugin
 class APIError internal constructor(
     private val code: Int,
     override val message: String
-): Exception(message) {
+) : Exception(message) {
 
     /**
      * Override toString() for logging
@@ -51,4 +51,4 @@ class APIError internal constructor(
             else -> throw Exception(this.toString())
         }
     }
-}
+}

src/main/kotlin/Config.kt

@@ -42,4 +42,4 @@ object Config: AutoSavePluginConfig("Config") {
      */
     @ValueDescription("默认的冷却时间(单位: s)")
     var cooldown: Int by value(60)
-}
+}

src/main/kotlin/ImageData.kt

@@ -73,4 +73,4 @@ data class ImageData (
             "链接: $url"
         )
     }
-}
+}

src/main/kotlin/Lolicon.kt

@@ -19,14 +19,10 @@ package com.github.samarium150.mirai.plugin
 import com.github.kittinunf.fuel.core.FuelError
 import kotlinx.coroutines.*
 import kotlinx.io.errors.IOException
-import net.mamoe.mirai.Mirai
 import net.mamoe.mirai.console.command.CommandSender
 import net.mamoe.mirai.console.command.CompositeCommand
-import net.mamoe.mirai.contact.Contact
+import net.mamoe.mirai.contact.*
 import net.mamoe.mirai.contact.Contact.Companion.sendImage
-import net.mamoe.mirai.contact.Group
-import net.mamoe.mirai.contact.User
-import net.mamoe.mirai.message.MessageReceipt
 import java.net.URL
 
 /**
@@ -52,24 +48,6 @@ object Lolicon: CompositeCommand(
         } else throw Exception("$helpFileName does not found")
     }
 
-    /**
-     * Asynchronously recall the image sent by the bot
-     *
-     * @param receipt [MessageReceipt]<[Contact]> Receipt of sending the image
-     * @return [Deferred]<[Boolean]> The result of the recall
-     */
-    private suspend fun recallAsync(receipt: MessageReceipt<Contact>) = GlobalScope.async(
-        start = CoroutineStart.LAZY
-    ) {
-        delay(30000L)
-        try {
-            Mirai.recallMessage(receipt.target.bot, receipt.source)
-        } catch (e: Exception) {
-            return@async false
-        }
-        return@async true
-    }
-
     /**
      * Load necessary information
      *
@@ -124,12 +102,12 @@ object Lolicon: CompositeCommand(
                 val receipt = subject?.sendImage(stream)
                 sendMessage(imageData.toReadable())
                 if (receipt != null) {
-                   Timer.setCooldown(subject)
+                    Timer.setCooldown(subject)
                     GlobalScope.launch {
-                        val result = recallAsync(receipt).await()
+                        val result = receipt.recallIn(30000L).awaitIsSuccess()
                         withContext(Dispatchers.Default) {
-                            if (!result) Main.logger.warning(receipt.target.toString()+"撤回失败")
-                            else Main.logger.info(receipt.target.toString()+"图片已撤回")
+                            if (!result) Main.logger.warning(receipt.target.toString() + "撤回失败")
+                            else Main.logger.info(receipt.target.toString() + "图片已撤回")
                         }
                     }
                     GlobalScope.launch {
@@ -163,7 +141,11 @@ object Lolicon: CompositeCommand(
     @SubCommand("set")
     @Description("设置属性, 详见帮助信息")
     suspend fun CommandSender.set(property: String, value: String) {
-        when(property) {
+        if (subject is Group && (user as Member).permission == MemberPermission.MEMBER) {
+            sendMessage("set仅限群主和管理员操作")
+            return
+        }
+        when (property) {
             "r18" -> {
                 if (subject is Group) {
                     val setting: Int
@@ -228,4 +210,4 @@ object Lolicon: CompositeCommand(
     suspend fun CommandSender.help() {
         sendMessage(help)
     }
-}
+}

src/main/kotlin/Main.kt

@@ -44,7 +44,7 @@ import net.mamoe.mirai.utils.info
 object Main: KotlinPlugin(
     JvmPluginDescription(
         id = "com.github.samarium150.mirai-console-lolicon",
-        version = "1.5.2",
+        version = "1.6",
         name = "mirai-console-lolicon"
     )
 ) {
@@ -118,4 +118,4 @@ object Main: KotlinPlugin(
         Lolicon.unregister()
         logger.info { "Plugin mirai-console-lolicon unloaded" }
     }
-}
+}

src/main/kotlin/PluginData.kt

@@ -54,4 +54,4 @@ object PluginData: AutoSavePluginData("Data") {
      */
     @ValueDescription("自定义了冷却时间的群和对应的值")
     var customCooldownGroups: MutableMap<Long, Int> by value()
-}
+}

src/main/kotlin/Request.kt

@@ -66,4 +66,4 @@ data class Request(
             "num: $num"
         )
     }
-}
+}

src/main/kotlin/RequestHandler.kt

@@ -65,4 +65,4 @@ object RequestHandler {
         if (result is Result.Failure) throw result.getException()
         return ByteArrayInputStream(response.data)
     }
-}
+}