github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-03-27 16:12:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ryoii 2020-04-10 23:39:59 +08:00
commit 847a073ac0
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CHANGELOG.md
View File

@ -2,6 +2,19 @@
开发版本. 频繁更新, 不保证高稳定性 开发版本. 频繁更新, 不保证高稳定性
## `0.36.0` 2020/4/10
- 支持临时会话: `TempMessage` (#16)
- 支持群员主动加入事件 `MemberJoinEvent.Active`
- 添加 `subscribeTempMessages` 等相关 DSL
- 添加 `FriendAddEvent`, `FriendDeleteEvent` (#216)
- 修复各种事件重复广播的问题 (#173, #212)
- 修复 `OfflineMessageSource.id`
- 修复 `Member.kick`
- 修复彩色群名片读取, 支持群名片更改事件 (#210)
- 增加超时 (#175)
- 支持合并转发消息的解析, 修复部分情况下长消息解析失败的问题
- 修复新成员加入时没有添加进成员列表的问题 (#172)
## `0.35.0` 2020/4/8 ## `0.35.0` 2020/4/8
- 新增处理加好友请求: `NewFriendRequestEvent` - 新增处理加好友请求: `NewFriendRequestEvent`
- 新增处理加群请求: `MemberJoinRequestEvent` - 新增处理加群请求: `MemberJoinRequestEvent`

2
buildSrc/src/main/kotlin/Versions.kt
View File

@ -9,7 +9,7 @@
object Versions { object Versions {
object Mirai { object Mirai {
const val version = "0.35.0" const val version = "0.36.0"
} }
object Kotlin { object Kotlin {

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

@ -74,7 +74,7 @@ internal class GroupImpl(
override lateinit var botAsMember: Member override lateinit var botAsMember: Member
override lateinit var botPermission: MemberPermission override val botPermission: MemberPermission get() = botAsMember.permission
// e.g. 600 // e.g. 600
override val botMuteRemaining: Int get() = botAsMember.muteTimeRemaining override val botMuteRemaining: Int get() = botAsMember.muteTimeRemaining

8
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.kt
View File

@ -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.network.protocol.packet.buildResponseUniPacket
import net.mamoe.mirai.qqandroid.utils._miraiContentToString import net.mamoe.mirai.qqandroid.utils._miraiContentToString
import net.mamoe.mirai.qqandroid.utils.encodeToString 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.ProtoBuf
import net.mamoe.mirai.qqandroid.utils.io.readString import net.mamoe.mirai.qqandroid.utils.io.readString
import net.mamoe.mirai.qqandroid.utils.io.serialization.* 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.read
import net.mamoe.mirai.qqandroid.utils.toUHexString import net.mamoe.mirai.qqandroid.utils.toUHexString
import net.mamoe.mirai.utils.LockFreeLinkedList 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? { override suspend fun QQAndroidBot.handle(packet: Response, sequenceId: Int): OutgoingPacket? {
return buildResponseUniPacket(client) { return buildResponseUniPacket(client) {
writeJceStruct( writeJceStruct(