From e32b0a6d8f3dfbf0443dbd80e5ef3245c2c767ee Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 10 Apr 2020 22:36:06 +0800 Subject: [PATCH 1/5] 0.36.0 released --- CHANGELOG.md | 13 +++++++++++++ buildSrc/src/main/kotlin/Versions.kt | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 49680e22d..b44ff5bd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ 开发版本. 频繁更新, 不保证高稳定性 +## `0.36.0` 2020/4/10 +- 支持临时会话: `TempMessage` +- 支持群员主动加入事件 `MemberJoinEvent.Active` +- 添加 `subscribeTempMessages` 等相关 DSL +- 添加 `FriendAddEvent`, `FriendDeleteEvent` (#216) +- 修复各种事件重复广播的问题 (#173, #212) +- 修复 `OfflineMessageSource.id` +- 修复 `Member.kick` +- 修复彩色群名片读取, 支持群名片更改事件 (#210) +- 增加超时 (#28) +- 支持合并转发消息的解析, 修复部分情况下长消息解析失败的问题 +- 修复新成员加入时没有添加进成员列表的问题 (#172) + ## `0.35.0` 2020/4/8 - 新增处理加好友请求: `NewFriendRequestEvent` - 新增处理加群请求: `MemberJoinRequestEvent` diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index ba4d48077..b59cbbc9d 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -9,7 +9,7 @@ object Versions { object Mirai { - const val version = "0.35.0" + const val version = "0.36.0" } object Kotlin { From 4d52078c88c97ab7fea5549fe325484b145b6b85 Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 10 Apr 2020 22:39:44 +0800 Subject: [PATCH 2/5] Remove unused class --- .../network/protocol/packet/chat/receive/OnlinePush.kt | 8 -------- 1 file changed, 8 deletions(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt index 2e048c1d5..021b87ded 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt @@ -41,11 +41,9 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket import net.mamoe.mirai.qqandroid.network.protocol.packet.buildResponseUniPacket import net.mamoe.mirai.qqandroid.utils._miraiContentToString import net.mamoe.mirai.qqandroid.utils.encodeToString -import net.mamoe.mirai.qqandroid.utils.io.JceStruct import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf import net.mamoe.mirai.qqandroid.utils.io.readString import net.mamoe.mirai.qqandroid.utils.io.serialization.* -import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId import net.mamoe.mirai.qqandroid.utils.read import net.mamoe.mirai.qqandroid.utils.toUHexString import net.mamoe.mirai.utils.LockFreeLinkedList @@ -537,12 +535,6 @@ internal class OnlinePush { } } - @Serializable - private class Resp( - @JceId(0) val var1: Long, - @JceId(2) val var2: Int - ) : JceStruct - override suspend fun QQAndroidBot.handle(packet: Response, sequenceId: Int): OutgoingPacket? { return buildResponseUniPacket(client) { writeJceStruct( From 2e714fcee797a6414daefd78ef73826b8fa9c580 Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 10 Apr 2020 22:41:01 +0800 Subject: [PATCH 3/5] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b44ff5bd4..9d8110b2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ 开发版本. 频繁更新, 不保证高稳定性 ## `0.36.0` 2020/4/10 -- 支持临时会话: `TempMessage` +- 支持临时会话: `TempMessage` (#16) - 支持群员主动加入事件 `MemberJoinEvent.Active` - 添加 `subscribeTempMessages` 等相关 DSL - 添加 `FriendAddEvent`, `FriendDeleteEvent` (#216) From f5721e1268ca771b02063bb6ab308214aac1c8a8 Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 10 Apr 2020 22:46:41 +0800 Subject: [PATCH 4/5] Update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d8110b2f..b21a2ccf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ - 修复 `OfflineMessageSource.id` - 修复 `Member.kick` - 修复彩色群名片读取, 支持群名片更改事件 (#210) -- 增加超时 (#28) +- 增加超时 (#175) - 支持合并转发消息的解析, 修复部分情况下长消息解析失败的问题 - 修复新成员加入时没有添加进成员列表的问题 (#172) From 125f53a72ea612c617a1dcac7d4dae7b21e2927c Mon Sep 17 00:00:00 2001 From: Him188 Date: Fri, 10 Apr 2020 23:38:37 +0800 Subject: [PATCH 5/5] Fix botPermission --- .../kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt index b0cb9da63..9686ab8ce 100644 --- a/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt +++ b/mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/contact/GroupImpl.kt @@ -74,7 +74,7 @@ internal class GroupImpl( override lateinit var botAsMember: Member - override lateinit var botPermission: MemberPermission + override val botPermission: MemberPermission get() = botAsMember.permission // e.g. 600 override val botMuteRemaining: Int get() = botAsMember.muteTimeRemaining