1.2

Kloping · Jun 9, 2022 · c6ca808 · c6ca808
1 parent 1cbab1d
commit c6ca808
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 13 deletions.
diff --git a/Lsys-GetSong/src/main/java/cn/kloping/lsys/getSong/PluginMain.java b/Lsys-GetSong/src/main/java/cn/kloping/lsys/getSong/PluginMain.java
@@ -16,7 +16,7 @@ private PluginMain() {
         super(new JvmPluginDescriptionBuilder("cn.kloping.lsys.getSong.PluginMain", "1.0")
                 .name("plugin_5 Author - HRS LSys GetSong Loaded")
                 .info("plugin-song")
-                .author("HRS").dependsOn("cn.kloping.Lsys", "1.1", true)
+                .author("HRS").dependsOn("cn.kloping.Lsys", "1.2", true)
                 .build());
     }
 

diff --git a/Lsys-PicParser/src/main/java/cn/kloping/lsys/picParser/PluginMain.java b/Lsys-PicParser/src/main/java/cn/kloping/lsys/picParser/PluginMain.java
@@ -18,7 +18,7 @@ private PluginMain() {
                 .name("p_6 Author - HRS LSys picParser Loaded")
                 .info("plugin-picP")
                 .author("HRS")
-                .dependsOn("cn.kloping.Lsys", "1.1", true)
+                .dependsOn("cn.kloping.Lsys", "1.2", true)
                 .build());
     }
 

diff --git a/Lsys-Score1/src/main/java/cn/kloping/lsys/sc1/PluginMain.java b/Lsys-Score1/src/main/java/cn/kloping/lsys/sc1/PluginMain.java
@@ -20,7 +20,7 @@ private PluginMain() {
                 .name("p_7 Author - HRS LSys sco1 Loaded")
                 .info("plugin-sco1")
                 .author("HRS")
-                .dependsOn("cn.kloping.Lsys", "1.1", true)
+                .dependsOn("cn.kloping.Lsys", "1.2", true)
                 .build());
     }
 

diff --git a/Lsys-Score2/src/main/java/cn/kloping/lsys/sc2/PluginMain.java b/Lsys-Score2/src/main/java/cn/kloping/lsys/sc2/PluginMain.java
@@ -17,7 +17,7 @@ private PluginMain() {
                 .name("p_8 Author-HRS-LSys-sco2-Loaded")
                 .info("plugin-sco2")
                 .author("HRS")
-                .dependsOn("cn.kloping.Lsys", "1.1", true)
+                .dependsOn("cn.kloping.Lsys", "1.2", true)
                 .build());
     }
 

diff --git a/Lsys-idiom/src/main/java/io/github/kloping/Idiom/PluginMain.java b/Lsys-idiom/src/main/java/io/github/kloping/Idiom/PluginMain.java
@@ -19,7 +19,7 @@ private PluginMain() {
                 .name("plugin_9 Author - HRS LSys idiom Loaded")
                 .info("plugin-idiom")
                 .author("HRS")
-                .dependsOn("cn.kloping.Lsys", "1.1", true)
+                .dependsOn("cn.kloping.Lsys", "1.2", true)
                 .build());
     }
 

diff --git a/Lsys-repeat/src/main/java/com/github/kloping/lsys/Repeat.java b/Lsys-repeat/src/main/java/com/github/kloping/lsys/Repeat.java
@@ -19,7 +19,7 @@ public Repeat() {
                 .name("lsys Author HRS LSys repeat Loaded")
                 .info("plugin-sco1")
                 .author("HRS")
-                .dependsOn("cn.kloping.Lsys", "1.1", true)
+                .dependsOn("cn.kloping.Lsys", "1.2", true)
                 .build());
     }
 

diff --git a/src/main/java/cn/kloping/lsys/PluginMain.kt b/src/main/java/cn/kloping/lsys/PluginMain.kt
@@ -20,7 +20,7 @@ import kotlin.coroutines.CoroutineContext
  * @Author hrs [email protected]
  */
 class PluginMain() : KotlinPlugin(
-    JvmPluginDescriptionBuilder("cn.kloping.Lsys", "1.1")
+    JvmPluginDescriptionBuilder("cn.kloping.Lsys", "1.2")
         .name("p_0-Author-HRS-LSys-Loaded")
         .info("Lsys-main")
         .author("HRS")

diff --git a/src/main/java/cn/kloping/lsys/entitys/Conf.kt b/src/main/java/cn/kloping/lsys/entitys/Conf.kt
@@ -1,12 +1,17 @@
 package cn.kloping.lsys.entitys
 
+import cn.kloping.lsys.PluginMain
 import cn.kloping.lsys.Resource
 import cn.kloping.lsys.Resource.ROOT_PATH
 import com.alibaba.fastjson.annotation.JSONField
 import io.github.kloping.initialize.FileInitializeValue
+import net.mamoe.mirai.console.permission.AbstractPermitteeId
+import net.mamoe.mirai.console.permission.PermissionService.Companion.hasPermission
+import net.mamoe.mirai.console.permission.PermitteeId
 import java.io.File
 import java.util.concurrent.ConcurrentHashMap
 
+
 data class Conf(
     var path: String,
     var qq: Number,
@@ -30,6 +35,11 @@ data class Conf(
         }
     }
 
+    fun hasPerm(qid: Long): Boolean {
+        val permitee: PermitteeId = AbstractPermitteeId.ExactUser(qid);
+        return qid == qq || permitee.hasPermission(PluginMain.INSTANCE.parentPermission.id)
+    }
+
     override fun apply() {
         FileInitializeValue.putValues(File("$ROOT_PATH/", "conf/LSys/conf.json").absolutePath, Resource.conf, true)
     }

diff --git a/src/main/java/cn/kloping/lsys/workers/Methods.kt b/src/main/java/cn/kloping/lsys/workers/Methods.kt
@@ -99,7 +99,7 @@ object Methods {
     @JvmField
     val mOpen: (arg: User, args: Request?) -> Result? = { user: User, any: Request? ->
         val gq: Number = any?.gId!!
-        if (user.qq == Resource.conf.qq) {
+        if (Resource.conf.hasPerm(user.qq.toLong())) {
             if (conf.opens.add(gq.toLong())) {
                 Resource.conf.apply()
                 Result(null, 0)
@@ -117,7 +117,7 @@ object Methods {
     @JvmField
     val mClose: (arg: User, args: Request?) -> Result? = { user: User, any: Request? ->
         val gq: Number = any?.gId!!
-        if (user.qq == Resource.conf.qq) {
+        if (Resource.conf.hasPerm(user.qq.toLong())) {
             if (Resource.conf.opens.contains(gq)) {
                 conf.opens.remove(gq);
                 conf.apply();
@@ -141,7 +141,7 @@ object Methods {
             null
         } else {
             val gq: Number = Integer.parseInt(numStr);
-            if (user.qq == Resource.conf.qq) {
+            if (Resource.conf.hasPerm(user.qq.toLong())) {
                 if (conf.opens.add(gq.toLong())) {
                     Resource.conf.apply()
                     Result(null, 0)
@@ -165,7 +165,7 @@ object Methods {
             null
         } else {
             val gq: Number = Integer.parseInt(numStr);
-            if (user.qq == Resource.conf.qq) {
+            if (Resource.conf.hasPerm(user.qq.toLong())) {
                 if (Resource.conf.opens.contains(gq)) {
                     conf.opens.remove(gq);
                     conf.apply();
@@ -186,7 +186,7 @@ object Methods {
 
     @JvmField
     val mpOpen: (arg: User, args: Request?) -> Result? = { user: User, any: Request? ->
-        if (user.qq == Resource.conf.qq) {
+        if (Resource.conf.hasPerm(user.qq.toLong())) {
             Resource.conf.prK = true
             Resource.conf.apply()
             Result(null, 0)
@@ -196,7 +196,7 @@ object Methods {
 
     @JvmField
     val mpClose: (arg: User, args: Request?) -> Result? = { user: User, any: Request? ->
-        if (user.qq == Resource.conf.qq) {
+        if (Resource.conf.hasPerm(user.qq.toLong())) {
             Resource.conf.prK = false
             Resource.conf.apply()
             Result(null, 0)