diff --git a/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api b/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api index 8561def1f..9ff25a02d 100644 --- a/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api +++ b/mirai-console/backend/mirai-console/compatibility-validation/jvm/api/jvm.api @@ -1784,6 +1784,7 @@ public abstract interface class net/mamoe/mirai/console/permission/PermitteeId { public static fun getAllParentsWithSelf (Lnet/mamoe/mirai/console/permission/PermitteeId;)Lkotlin/sequences/Sequence; public abstract fun getDirectParents ()[Lnet/mamoe/mirai/console/permission/PermitteeId; public static fun hasChild (Lnet/mamoe/mirai/console/permission/PermitteeId;Lnet/mamoe/mirai/console/permission/PermitteeId;)Z + public static fun isChildOf (Lnet/mamoe/mirai/console/permission/PermitteeId;Lnet/mamoe/mirai/console/permission/PermitteeId;)Z } public final class net/mamoe/mirai/console/permission/PermitteeId$Companion { @@ -1796,6 +1797,7 @@ public final class net/mamoe/mirai/console/permission/PermitteeId$Companion { public final synthetic fun getPermitteeId (Lnet/mamoe/mirai/contact/User;)Lnet/mamoe/mirai/console/permission/AbstractPermitteeId$ExactUser; public final synthetic fun getPermitteeIdOnTemp (Lnet/mamoe/mirai/contact/Member;)Lnet/mamoe/mirai/console/permission/AbstractPermitteeId$ExactGroupTemp; public final fun hasChild (Lnet/mamoe/mirai/console/permission/PermitteeId;Lnet/mamoe/mirai/console/permission/PermitteeId;)Z + public final fun isChildOf (Lnet/mamoe/mirai/console/permission/PermitteeId;Lnet/mamoe/mirai/console/permission/PermitteeId;)Z } public abstract interface class net/mamoe/mirai/console/plugin/NotYetLoadedPlugin : net/mamoe/mirai/console/plugin/Plugin { diff --git a/mirai-console/backend/mirai-console/src/internal/permission/AbstractConcurrentPermissionService.kt b/mirai-console/backend/mirai-console/src/internal/permission/AbstractConcurrentPermissionService.kt index 53c5bee19..ac9fc410f 100644 --- a/mirai-console/backend/mirai-console/src/internal/permission/AbstractConcurrentPermissionService.kt +++ b/mirai-console/backend/mirai-console/src/internal/permission/AbstractConcurrentPermissionService.kt @@ -13,7 +13,7 @@ import net.mamoe.mirai.console.data.PluginDataExtensions import net.mamoe.mirai.console.permission.* import net.mamoe.mirai.console.permission.Permission.Companion.parentsWithSelf import net.mamoe.mirai.console.permission.PermitteeId.Companion.allParentsWithSelf -import net.mamoe.mirai.console.permission.PermitteeId.Companion.hasChild +import net.mamoe.mirai.console.permission.PermitteeId.Companion.isChildOf internal abstract class AbstractConcurrentPermissionService
: PermissionService
{
protected abstract val permissions: MutableMap : Pe
override fun getPermittedPermissions(permitteeId: PermitteeId): Sequence = sequence {
for ((permissionIdentifier, permissibleIdentifiers) in grantedPermissionsMap) {
- val granted = permissibleIdentifiers.any { permitteeId.hasChild(it) }
+ val granted = permissibleIdentifiers.any { permitteeId.isChildOf(it) }
if (granted) get(permissionIdentifier)?.let { yield(it) }
}
@@ -84,7 +84,7 @@ internal abstract class AbstractConcurrentPermissionService : Pe
internal fun getPermittedPermissionsAndSource(permitteeId: PermitteeId): Sequence