fix

Kloping · May 2, 2022 · c749cf0 · c749cf0
1 parent 5548080
commit c749cf0
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 14 deletions.
diff --git a/out/artifacts/a1-miraiLSys.jar b/out/artifacts/a1-miraiLSys.jar
diff --git a/src/main/java/cn/kloping/lsys/PluginMain.kt b/src/main/java/cn/kloping/lsys/PluginMain.kt
@@ -19,7 +19,7 @@ import kotlin.coroutines.CoroutineContext
  * @Author hrs [email protected]
  */
 class PluginMain() : KotlinPlugin(
-    JvmPluginDescriptionBuilder("cn.kloping.Lsys", "0.2.9")
+    JvmPluginDescriptionBuilder("cn.kloping.Lsys", "0.3")
         .name("p_0-Author-HRS-LSys-Loaded")
         .info("Lsys-main")
         .author("HRS")

diff --git a/src/main/java/cn/kloping/lsys/Resource.kt b/src/main/java/cn/kloping/lsys/Resource.kt
@@ -25,6 +25,8 @@ object Resource {
             put("存积分.*", "m3")
             put("开启", "mOpen")
             put("关闭", "mClose")
+            put("开启群.*?", "mOpen0")
+            put("关闭.*?", "mClose0")
             put("开启私聊", "mpOpen")
             put("关闭私聊", "mpClose")
             put("菜单", "menuN")

diff --git a/src/main/java/cn/kloping/lsys/workers/Methods.kt b/src/main/java/cn/kloping/lsys/workers/Methods.kt
@@ -10,7 +10,6 @@ import cn.kloping.lsys.toLink
 import io.github.kloping.number.NumberUtils
 import kotlinx.coroutines.runBlocking
 import net.mamoe.mirai.contact.Contact
-import net.mamoe.mirai.event.events.MessageEvent
 import net.mamoe.mirai.message.code.MiraiCode
 import net.mamoe.mirai.message.data.MessageChainBuilder
 import java.util.concurrent.ConcurrentHashMap
@@ -120,18 +119,47 @@ object Methods {
         val gq: Number = any?.gId!!
         if (user.qq == Resource.conf.qq) {
             if (Resource.conf.opens.contains(gq)) {
-                /*    Resource.conf.opens = Resource.conf.opens.apply {
-                        for ((i, gi) in this.withIndex()) {
-                            when (gi) {
-                                gq -> {
-                                    this.drop(i)
-                                    break
-                                }
-                            }
-                        }
-                    }
-                    Resource.conf.apply()
-                */
+                conf.opens.remove(gq);
+                conf.apply();
+                Result(null, 0)
+            } else {
+                Result(null, 1)
+            }
+        } else {
+            null
+        }
+    }
+
+    /**
+     * 开启
+     */
+    @JvmField
+    val mOpen0: (arg: User, args: Request?) -> Result? = { user: User, any: Request? ->
+        val t1 = any?.str
+        val numStr = NumberUtils.findNumberFromString(t1);
+        val gq: Number = Integer.parseInt(numStr);
+        if (user.qq == Resource.conf.qq) {
+            if (conf.opens.add(gq.toLong())) {
+                Resource.conf.apply()
+                Result(null, 0)
+            } else {
+                Result(null, 1)
+            }
+        } else {
+            null
+        }
+    }
+
+    /**
+     * 关闭
+     */
+    @JvmField
+    val mClose0: (arg: User, args: Request?) -> Result? = { user: User, any: Request? ->
+        val t1 = any?.str
+        val numStr = NumberUtils.findNumberFromString(t1);
+        val gq: Number = Integer.parseInt(numStr);
+        if (user.qq == Resource.conf.qq) {
+            if (Resource.conf.opens.contains(gq)) {
                 conf.opens.remove(gq);
                 conf.apply();
                 Result(null, 0)