Add `FriendDeleteEvent`, `FriendAddEvent`, also fix #216

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt

@@ -56,6 +56,7 @@ internal fun Group.checkIsGroupImpl() {
     GroupImpl.checkIsInstance(this)
 }
 
+@OptIn(MiraiExperimentalAPI::class, LowLevelAPI::class)
 @Suppress("PropertyName")
 internal class GroupImpl(
     bot: QQAndroidBot, override val coroutineContext: CoroutineContext,
@@ -70,44 +71,20 @@ internal class GroupImpl(
 
     override val bot: QQAndroidBot by bot.unsafeWeakRef()
 
-    @OptIn(LowLevelAPI::class)
     val uin: Long = groupInfo.uin
 
     override lateinit var owner: Member
 
-    @OptIn(MiraiExperimentalAPI::class)
-    override val botAsMember: Member by lazy {
-        newMember(object : MemberInfo {
-            override val nameCard: String
-                get() = bot.nick // TODO: 2020/2/21 机器人在群内的昵称获取
-            override val permission: MemberPermission
-                get() = botPermission
-            override val specialTitle: String
-                get() = "" // TODO: 2020/2/21 获取机器人在群里的头衔
-            override val muteTimestamp: Int
-                get() = botMuteRemaining
-            override val uin: Long
-                get() = bot.id
-            override val nick: String
-                get() = bot.nick
-        })
-    }
+    override lateinit var botAsMember: Member
 
-    @OptIn(MiraiExperimentalAPI::class)
     override lateinit var botPermission: MemberPermission
 
-    var _botMuteTimestamp: Int = groupInfo.botMuteTimestamp
-
-    override val botMuteRemaining: Int =
-        if (_botMuteTimestamp == 0 || _botMuteTimestamp == 0xFFFFFFFF.toInt()) {
-            0
-        } else {
-            _botMuteTimestamp - currentTimeSeconds.toInt() - bot.client.timeDifference.toInt()
-        }
+    // e.g. 600
+    override val botMuteRemaining: Int get() = botAsMember.muteTimeRemaining
 
     override val members: ContactList<Member> = ContactList(members.mapNotNull {
         if (it.uin == bot.id) {
-            botPermission = it.permission
+            botAsMember = newMember(it)
             if (it.permission == MemberPermission.OWNER) {
                 owner = botAsMember
             }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/MemberImpl.kt

@@ -109,7 +109,7 @@ internal class MemberImpl constructor(
         if (_muteTimestamp == 0 || _muteTimestamp == 0xFFFFFFFF.toInt()) {
             0
         } else {
-            _muteTimestamp - currentTimeSeconds.toInt() - bot.client.timeDifference.toInt()
+            (_muteTimestamp - currentTimeSeconds.toInt()).coerceAtLeast(0)
         }
 
     override var nameCard: String

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/message/MessageSourceImpl.kt

@@ -255,10 +255,6 @@ internal class OfflineMessageSourceImplBySourceMsg( // from others' quotation
     override val bot: Bot,
     groupIdOrZero: Long
 ) : OfflineMessageSource(), MessageSourceImpl {
-    init {
-        println(delegate._miraiContentToString())
-    }
-
     override val kind: Kind get() = if (delegate.srcMsg == null) Kind.GROUP else Kind.FRIEND
 
     private val isRecalled: AtomicBoolean = atomic(false)

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt

 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlinx.serialization.Serializable
+import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
+import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 
 @Serializable
 internal class AddGroup(
@@ -62,7 +63,7 @@ internal class MsgType0x210(
     @JceId(7) val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null,
     @JceId(8) val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null,
     @JceId(9) val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null,
-    @JceId(10) val vProtobuf: ByteArray? = null
+    @JceId(10) val vProtobuf: ByteArray = EMPTY_BYTE_ARRAY
 ) : JceStruct
 
 @Serializable

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/FriendListCommon.kt

@@ -74,7 +74,7 @@ internal class Vec0xd6b : ProtoBuf {
     internal class MutualMarkData(
         @ProtoId(1) val frdUin: Long = 0L,
         @ProtoId(2) val result: Int = 0
-        // @SerialId(11) val mutualmarkInfo: List<Mutualmark.MutualMark>? = null
+        // @SerialId(11) val mutualmarkInfo: List<net.mamoe.mirai.qqandroid.network.protocol.data.proto.onlinePush0x210.Mutualmark.MutualMark>? = null
     ) : ProtoBuf
 }
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/onlinePush0x210/OnlinePush0x210Factory.kt

-package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive.onlinePush0x210
-
-import kotlinx.io.core.String
-import net.mamoe.mirai.Bot
-import net.mamoe.mirai.event.events.MemberCardChangeEvent
-import net.mamoe.mirai.qqandroid.utils.io.serialization.loadAs
-
-internal object OnlinePush0x210Factory {
-
-//    fun solve(msg: MsgType0x210, bot: Bot): Any? = when (msg.uSubMsgType) {
-//        0x27L -> {
-//            val body = msg.vProtobuf?.loadAs(SubMsgType0x27.MsgBody.serializer())
-//            if (body?.msgModInfos != null) {
-//                body.msgModInfos.firstOrNull()?.msgModGroupMemberProfile?.run {
-//                    val member = bot.groups.getOrNull(groupUin)?.getOrNull(uin)
-//                    val new = msgGroupMemberProfileInfos?.firstOrNull()
-//                    if (member != null && new?.value != null) {
-//                        MemberCardChangeEvent(member.nameCard, String(new.value), member, member)
-//                    }
-//                }
-//            } else null
-//        }
-//        else -> null
-//    }
-}
\ No newline at end of file

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/event/events/BotEvents.kt

@@ -484,6 +484,39 @@ data class MemberUnmuteEvent(
 
 // region 好友、群认证
 
+/**
+ * 好友昵称改变事件. 目前仅支持解析 (来自 PC 端的修改).
+ */
+@SinceMirai("0.36.0")
+data class FriendRemarkChangeEvent(
+    override val bot: Bot,
+    val friend: QQ,
+    val newName: String
+) : BotEvent, Packet
+
+/**
+ * 成功添加了一个新好友的事件
+ */
+@SinceMirai("0.36.0")
+data class FriendAddEvent(
+    /**
+     * 新好友. 已经添加到 [Bot.friends]
+     */
+    val friend: QQ
+) : BotEvent, Packet {
+    override val bot: Bot get() = friend.bot
+}
+
+/**
+ * 好友已被删除的事件.
+ */
+@SinceMirai("0.36.0")
+data class FriendDeleteEvent(
+    val friend: QQ
+) : BotEvent, Packet {
+    override val bot: Bot get() = friend.bot
+}
+
 /**
  * 一个账号请求添加机器人为好友的事件
  */