github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-11 02:50:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ExactMember, ExactTemp

Browse Source
This commit is contained in:
Him188 2020-09-08 17:24:02 +08:00
parent 5c2a9a9553
commit 60e13e73e9
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/command/CommandSender.kt
View File

@ -636,7 +636,7 @@ public open class MemberCommandSender internal constructor(
public override fun toString(): String = "MemberCommandSender($user)" public override fun toString(): String = "MemberCommandSender($user)"
@ExperimentalPermission @ExperimentalPermission
public override val identifier: PermissibleIdentifier = AbstractPermissibleIdentifier.ExactMember(user.id, group.id) public override val identifier: PermissibleIdentifier = AbstractPermissibleIdentifier.ExactMember(group.id, user.id)
@JvmBlockingBridge @JvmBlockingBridge
public override suspend fun sendMessage(message: String): MessageReceipt<Group> = sendMessage(PlainText(message)) public override suspend fun sendMessage(message: String): MessageReceipt<Group> = sendMessage(PlainText(message))
@ -659,7 +659,8 @@ public open class TempCommandSender internal constructor(
public override fun toString(): String = "TempCommandSender($user)" public override fun toString(): String = "TempCommandSender($user)"
@ExperimentalPermission @ExperimentalPermission
override val identifier: PermissibleIdentifier = AbstractPermissibleIdentifier.ExactTemp(user.id) public override val identifier: PermissibleIdentifier =
AbstractPermissibleIdentifier.ExactTemp(user.group.id, user.id)
@JvmBlockingBridge @JvmBlockingBridge
public override suspend fun sendMessage(message: String): MessageReceipt<Member> = sendMessage(PlainText(message)) public override suspend fun sendMessage(message: String): MessageReceipt<Member> = sendMessage(PlainText(message))

3
backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/permission/Permissible.kt
View File

@ -71,8 +71,9 @@ public sealed class AbstractPermissibleIdentifier(
public object AnyTemp : AbstractPermissibleIdentifier(AnyUser) public object AnyTemp : AbstractPermissibleIdentifier(AnyUser)
public data class ExactTemp( public data class ExactTemp(
public val groupId: Long,
public val id: Long public val id: Long
) : AbstractPermissibleIdentifier(ExactUser(id)) ) : AbstractPermissibleIdentifier(ExactUser(groupId)) // TODO: 2020/9/8 ExactMember ?
public object AnyUser : AbstractPermissibleIdentifier(AnyContact) public object AnyUser : AbstractPermissibleIdentifier(AnyContact)
public data class ExactUser( public data class ExactUser(