diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandOwner.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandOwner.kt index c75d6de2e..a8682841d 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandOwner.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandOwner.kt @@ -10,10 +10,10 @@ package net.mamoe.mirai.console.command import net.mamoe.mirai.console.command.CommandManager.INSTANCE.unregisterAllCommands -import net.mamoe.mirai.console.permission.AncestorPermission import net.mamoe.mirai.console.permission.ExperimentalPermission import net.mamoe.mirai.console.permission.PermissionId import net.mamoe.mirai.console.permission.PermissionIdNamespace +import net.mamoe.mirai.console.permission.RootPermission import net.mamoe.mirai.console.plugin.jvm.JvmPlugin /** @@ -41,7 +41,7 @@ public interface CommandOwner : PermissionIdNamespace { internal object ConsoleCommandOwner : CommandOwner { @ExperimentalPermission override val basePermission: PermissionId - get() = AncestorPermission.id + get() = RootPermission.id @ExperimentalPermission override fun permissionId(id: String): PermissionId = PermissionId("console", id) diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/permission/AbstractConcurrentPermissionService.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/permission/AbstractConcurrentPermissionService.kt index 8b3ccd7c6..f76a769ef 100644 --- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/permission/AbstractConcurrentPermissionService.kt +++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/permission/AbstractConcurrentPermissionService.kt @@ -23,7 +23,7 @@ public abstract class AbstractConcurrentPermissionService
: Perm
protected abstract fun createPermission(
id: PermissionId,
description: String,
- base: PermissionId = AncestorPermission.id
+ base: PermissionId = RootPermission.id
): P
override fun get(id: PermissionId): P? = permissions[id]
diff --git a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/permission/Permission.kt b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/permission/Permission.kt
index afdd1bc81..81c34e43e 100644
--- a/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/permission/Permission.kt
+++ b/backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/permission/Permission.kt
@@ -29,7 +29,7 @@ public interface Permission {
* 所有权限的父权限.
*/
@ExperimentalPermission
-public object AncestorPermission :
+public object RootPermission :
Permission {
override val id: PermissionId = PermissionId("*", "*")
override val description: String get() = "The parent of any permission"
@@ -51,5 +51,5 @@ public fun Permission.parentsWithSelfSequence(): Sequence {
public fun register(
id: PermissionId,
description: String,
- base: PermissionId = AncestorPermission.id
+ base: PermissionId = RootPermission.id
): P
///////////////////////////////////////////////////////////////////////////