Skip to content

Commit bc2241b

Browse files
committed
refactor: add Group prefix to permission level Admin and Owner
1 parent c37dccb commit bc2241b

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/EventExtension.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ public val Event.MessageReceive.senderPermissionLevel: PermissionLevel
4545
in SaltifyBotConfig.superUsers -> PermissionLevel.SuperUser
4646
in SaltifyBotConfig.restrictedUsers -> PermissionLevel.Restricted
4747
else -> when ((data as? IncomingMessage.Group)?.groupMember?.role) {
48-
"owner" -> PermissionLevel.Owner
49-
"admin" -> PermissionLevel.Admin
48+
"owner" -> PermissionLevel.GroupOwner
49+
"admin" -> PermissionLevel.GroupAdmin
5050
else -> PermissionLevel.Everyone
5151
}
5252
}

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/extension/RequirementExtension.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import org.ntqqrev.saltify.model.PermissionLevel
77

88
public fun SaltifyCommandRequirementContext.user(vararg targetId: Long): CommandRequirement =
99
CommandRequirement {
10-
context.event.data.senderId in targetId
10+
context.event.senderId in targetId
1111
}
1212

1313
public fun SaltifyCommandRequirementContext.group(vararg targetId: Long): CommandRequirement =

saltify-core/src/commonMain/kotlin/org/ntqqrev/saltify/model/PermissionLevel.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ public open class PermissionLevel(
1919
/**
2020
* 群管理
2121
*/
22-
public object Admin : PermissionLevel(100)
22+
public object GroupAdmin : PermissionLevel(100)
2323

2424
/**
2525
* 群主
2626
*/
27-
public object Owner : PermissionLevel(200)
27+
public object GroupOwner : PermissionLevel(200)
2828

2929
/**
3030
* 超级用户

saltify-docs/content/docs-core/command.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ client.command("stop") {
130130
```kotlin
131131
fun SaltifyCommandRequirementContext.user(vararg targetId: Long) =
132132
CommandRequirement {
133-
context.event.data.senderId in targetId
133+
context.event.senderId in targetId
134134
}
135135
```
136136

saltify-docs/content/docs-core/permission.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,26 @@
22

33
Saltify 提供了内置的一套简易权限管理方案。默认支持如下几个权限等级,括号内是权重(大的更重):
44

5-
- Restricted – 受限制 (Int.MIN_VALUE)
6-
- Everyone – 所有人 (0)
7-
- Admin – 群管理员 (100)
8-
- Owner – 群主 (200)
9-
- SuperUser – 最高权限 (Int.MAX_VALUE)
5+
- **Restricted** – 受限制 (Int.MIN_VALUE)
6+
- **Everyone** – 所有人 (0)
7+
- **GroupAdmin** – 群管理员 (100)
8+
- **GroupOwner** – 群主 (200)
9+
- **SuperUser** – 最高权限 (Int.MAX_VALUE)
1010

1111
可以这样使用权限 API:
1212

1313
```kotlin
14+
SaltifyBotConfig.superUsers += 123456789
15+
SaltifyBotConfig.restrictedUsers += 987654321
16+
1417
client.command("stop") {
1518
require { perm(PermissionLevel.SuperUser) }
1619

1720
onExecute { /** ... */ }
1821
}
1922

2023
client.on<Event.MessageReceive> { event ->
21-
if (event.senderPermissionLevel >= PermissionLevel.Admin) {
24+
if (event.senderPermissionLevel >= PermissionLevel.GroupAdmin) {
2225
TODO()
2326
}
2427
}

0 commit comments

Comments
 (0)