fix: blacklisted users can use commands in normal groups

Closes #59

Author: Samarium150

build.gradle.kts

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

src/main/kotlin/Lolicon.kt

@@ -20,6 +20,7 @@ import kotlinx.coroutines.*
 import kotlinx.serialization.decodeFromString
 import kotlinx.serialization.json.Json
 import net.mamoe.mirai.console.command.CommandSender
+import net.mamoe.mirai.console.command.CommandSenderOnMessage
 import net.mamoe.mirai.console.command.CompositeCommand
 import net.mamoe.mirai.console.command.descriptor.ExperimentalCommandDescriptors
 import net.mamoe.mirai.console.plugin.jvm.reloadPluginConfig
@@ -86,8 +87,8 @@ object Lolicon: CompositeCommand(
     @OptIn(DelicateCoroutinesApi::class)
     @SubCommand("get", "来一张")
     @Description("根据标签发送涩图, 不提供则随机发送一张")
-    suspend fun CommandSender.get(tags: String = "") {
-        if (!Utils.isPermitted(subject)) {
+    suspend fun CommandSenderOnMessage<*>.get(tags: String = "") {
+        if (!Utils.isPermitted(subject, user)) {
             val where = if (subject is Group) "@${(subject as Group).id}" else ""
             Main.logger.info("当前模式为'${PluginConfig.mode}'，${user?.id}${where}的命令已被无视")
             return
@@ -191,7 +192,7 @@ object Lolicon: CompositeCommand(
     @SubCommand("adv", "高级")
     @Description("根据JSON字符串发送涩图")
     suspend fun CommandSender.advanced(json: String) {
-        if (!Utils.isPermitted(subject)) {
+        if (!Utils.isPermitted(subject, user)) {
             val where = if (subject is Group) "@${(subject as Group).id}" else ""
             Main.logger.info("当前模式为'${PluginConfig.mode}'，${user?.id}${where}的命令已被无视")
             return

src/main/kotlin/Main.kt

@@ -41,7 +41,7 @@ import java.net.Proxy
 object Main: KotlinPlugin(
     JvmPluginDescription(
         id = "com.github.samarium150.mirai-console-lolicon",
-        version = "4.1.3",
+        version = "4.1.4",
         name = "mirai-console-lolicon"
     )
 ) {

src/main/kotlin/PluginConfig.kt

@@ -92,7 +92,7 @@ object PluginConfig : AutoSavePluginConfig("Config") {
      * 自定义代理
      */
     @ValueDescription("获取Pixiv图片的代理")
-    val proxy: String by value("i.pixiv.cat")
+    val proxy: String by value("i.pixiv.re")
 
     /**
      * Default recall time

src/main/kotlin/Utils.kt

@@ -135,28 +135,31 @@ object Utils {
     }
 
     /**
-     * Is the subject permitted to use the bot
+     * Is the subject/user permitted to use the bot
      * <br>
      * 是否能执行命令
      *
      * @param subject
+     * @param user
      * @return
      */
-    fun isPermitted(subject: Contact?): Boolean {
+    fun isPermitted(subject: Contact?, user: User?): Boolean {
         return when (PluginConfig.mode) {
             "whitelist" -> {
                 when {
                     subject == null -> true
                     subject is User && PluginData.userSet.contains(subject.id) -> true
-                    subject is Group && PluginData.groupSet.contains(subject.id) -> true
+                    subject is Group &&
+                        PluginData.groupSet.contains(subject.id) && PluginData.userSet.contains(user?.id) -> true
                     else -> false
                 }
             }
             "blacklist" -> {
                 when {
                     subject == null -> true
                     subject is User && !PluginData.userSet.contains(subject.id) -> true
-                    subject is Group && !PluginData.groupSet.contains(subject.id) -> true
+                    subject is Group &&
+                        !PluginData.groupSet.contains(subject.id) && !PluginData.userSet.contains(user?.id) -> true
                     else -> false
                 }
             }