Commit 3c29474c authored by Him188's avatar Him188

Correct `groupCardOrNick` to `nameCardOrNick`

parent e66cfc95
...@@ -37,7 +37,7 @@ data class MemberDTO( ...@@ -37,7 +37,7 @@ data class MemberDTO(
val group: GroupDTO val group: GroupDTO
) : ContactDTO() { ) : ContactDTO() {
constructor(member: Member) : this( constructor(member: Member) : this(
member.id, member.groupCardOrNick, member.permission, member.id, member.nameCardOrNick, member.permission,
GroupDTO(member.group) GroupDTO(member.group)
) )
} }
......
...@@ -37,7 +37,7 @@ interface Member : QQ, Contact { ...@@ -37,7 +37,7 @@ interface Member : QQ, Contact {
* *
* 在修改时将会异步上传至服务器. * 在修改时将会异步上传至服务器.
* *
* @see [groupCardOrNick] 获取非空群名片或昵称 * @see [nameCardOrNick] 获取非空群名片或昵称
* *
* @see MemberCardChangeEvent 群名片被管理员, 自己或 [Bot] 改动事件 * @see MemberCardChangeEvent 群名片被管理员, 自己或 [Bot] 改动事件
* @throws PermissionDeniedException 无权限修改时 * @throws PermissionDeniedException 无权限修改时
...@@ -96,7 +96,7 @@ interface Member : QQ, Contact { ...@@ -96,7 +96,7 @@ interface Member : QQ, Contact {
* *
* 若 [群名片][Member.nameCard] 不为空则返回群名片, 为空则返回 [QQ.nick] * 若 [群名片][Member.nameCard] 不为空则返回群名片, 为空则返回 [QQ.nick]
*/ */
val Member.groupCardOrNick: String get() = this.nameCard.takeIf { it.isNotEmpty() } ?: this.nick val Member.nameCardOrNick: String get() = this.nameCard.takeIf { it.isNotEmpty() } ?: this.nick
@ExperimentalTime @ExperimentalTime
suspend inline fun Member.mute(duration: Duration) { suspend inline fun Member.mute(duration: Duration) {
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
package net.mamoe.mirai.message.data package net.mamoe.mirai.message.data
import net.mamoe.mirai.contact.Member import net.mamoe.mirai.contact.Member
import net.mamoe.mirai.contact.groupCardOrNick import net.mamoe.mirai.contact.nameCardOrNick
import net.mamoe.mirai.utils.MiraiInternalAPI import net.mamoe.mirai.utils.MiraiInternalAPI
import kotlin.jvm.JvmMultifileClass import kotlin.jvm.JvmMultifileClass
import kotlin.jvm.JvmName import kotlin.jvm.JvmName
...@@ -28,7 +28,7 @@ import kotlin.jvm.JvmName ...@@ -28,7 +28,7 @@ import kotlin.jvm.JvmName
*/ */
class At @MiraiInternalAPI constructor(val target: Long, val display: String) : Message { class At @MiraiInternalAPI constructor(val target: Long, val display: String) : Message {
@UseExperimental(MiraiInternalAPI::class) @UseExperimental(MiraiInternalAPI::class)
constructor(member: Member) : this(member.id, "@${member.groupCardOrNick}") constructor(member: Member) : this(member.id, "@${member.nameCardOrNick}")
override fun toString(): String = display override fun toString(): String = display
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment