github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2026-08-19 12:43:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Review remark

Browse Source 
- Change DeprecationLevel of FriendRemarkChangeEvent.newName to ERROR
- Simplify logic
This commit is contained in:
Karlatemp
2020-10-29 12:51:45 +08:00
parent d1d5435e99
commit 75f3f9de93
3 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mirai-core-api/src/commonMain/kotlin/event/events/friend.kt
View File

@@ -39,7 +39,7 @@ public data class FriendRemarkChangeEvent internal constructor(
@Deprecated(
message = "Please use newRemark",
replaceWith = ReplaceWith("newRemark"),
level = DeprecationLevel.WARNING
level = DeprecationLevel.ERROR
)
val newName: String get() = newRemark
}

8
mirai-core/src/commonMain/kotlin/contact/FriendImpl.kt
View File

@@ -56,13 +56,9 @@ import kotlin.time.measureTime
internal class FriendInfoImpl(
@JvmField private val jceFriendInfo: net.mamoe.mirai.internal.network.protocol.data.jce.FriendInfo
) : FriendInfo {
@JvmField
var cachedNick: String? = null
override val nick: String get() = cachedNick ?: jceFriendInfo.nick.also { cachedNick = it }
override var nick: String = jceFriendInfo.nick
override val uin: Long get() = jceFriendInfo.friendUin
@JvmField
var cachedRemark: String? = null
override val remark: String get() = cachedRemark ?: jceFriendInfo.remark.also { cachedRemark = it }
override var remark: String = jceFriendInfo.remark
}
@OptIn(ExperimentalContracts::class)

4
mirai-core/src/commonMain/kotlin/network/protocol/packet/chat/receive/OnlinePush.ReqPush.kt
View File

@@ -568,7 +568,7 @@ internal object Transformers528 : Map<Long, Lambda528> by mapOf(
val old: String
friend.checkIsFriendImpl().friendInfo.checkIsInfoImpl()
.also { info -> old = info.remark }
.cachedRemark = it.rmkName
.remark = it.rmkName
// TODO: 2020/4/10 ADD REMARK QUERY
FriendRemarkChangeEvent(friend, old, it.rmkName)
} ?: emptySequence()
@@ -701,7 +701,7 @@ internal object Transformers528 : Map<Long, Lambda528> by mapOf(
val from = info.nick
when (info) {
is FriendInfoImpl -> {
info.cachedNick = to
info.nick = to
}
is MemberInfoImpl -> {
info._nick = to