Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support Stranger & Fix #664 #795

Merged
merged 29 commits into from
Jan 1, 2021
Merged

Support Stranger & Fix #664 #795

merged 29 commits into from
Jan 1, 2021

Conversation

sandtechnology
Copy link
Collaborator

@sandtechnology sandtechnology commented Dec 30, 2020 •
edited
Loading

仍未测试充分，因此暂时作为草稿

sandtechnology and others added 15 commits December 30, 2020 11:37
@sandtechnology
Introduce UserInfo and change uin to id
f75754b
@sandtechnology
Stranger api: List and asStranger
dff1028
@sandtechnology
Stranger api: Events
94eab28
@sandtechnology
Stranger api: MessageDSL and MessageSource
0997006
@Him188 @Karlatemp
Update docs
e139d2a
@Karlatemp
Improve LoginSolver
89f88f5 
fix project-mirai/mirai-login-solver-selenium#4
@Karlatemp
Improve SeleniumLoginSolver loading
810c5d6
@Karlatemp
Fix MessageChain.fragmented
01bbe8f
@Karlatemp
2.0-M2-1
a05280c
@sandtechnology
Stranger api change: StrangerRelationChangeEvent
55c4b30
@sandtechnology
Stranger impl: list and asStranger
49f7f2b
@sandtechnology
Stranger impl: get stranger list and del stranger protocol
8430bd0
@sandtechnology
Stranger impl: add stranger protocol
fb80743
@sandtechnology
Stranger impl: MessageSource refactor and sending&receiving message
375321a
@sandtechnology
Merge branch 'dev' of https://github.com/mamoe/mirai into dev
aaf42df 
� Conflicts:
�	mirai-core-api/src/commonMain/kotlin/message/action/Nudge.kt
@sandtechnology sandtechnology marked this pull request as draft December 30, 2020 16:18
@Him188 Him188 requested review from Him188 and Karlatemp and removed request for Him188 December 30, 2020 16:20
@Him188 Him188 added t:feature 类型: 新特性 N 优先级: 一般 x:protocol 属性: 协议相关 labels Dec 30, 2020
@Him188 Him188 linked an issue Dec 30, 2020 that may be closed by this pull request
支持单向好友会话 #447
Closed
@Him188 Him188 added this to the 2.0-RC milestone Dec 30, 2020
@sandtechnology sandtechnology marked this pull request as ready for review December 31, 2020 11:09
@sandtechnology
Copy link
Collaborator Author

sandtechnology commented Dec 31, 2020 •
edited
Loading

除上传图片功能不可用（好友私聊也有此bug）外其余功能测试完毕，因此Ready for review
因为重写了Nudge的识别逻辑，此PR也修复了 #664

@sandtechnology sandtechnology changed the title Support Stranger Support Stranger & Fix #664 Dec 31, 2020
@Him188
Copy link
Member

Him188 commented Dec 31, 2020

在 QQAndroidBot close 或 QQAndroidBotNetworkHandler close 时有同时 close 一些 ContactList 实例（或 clear），（现有对 Bot.friends 和 Bot.groups 的处理）也需要对 Bot.strangers 做这样的处理

@Him188 Him188 removed the request for review from Karlatemp December 31, 2020 18:52
@Him188
Copy link
Member

Him188 commented Jan 1, 2021

在 QQAndroidBot close 或 QQAndroidBotNetworkHandler close 时有同时 close 一些 ContactList 实例（或 clear），（现有对 Bot.friends 和 Bot.groups 的处理）也需要对 Bot.strangers 做这样的处理

network/QQAndroidBotNetworkHandler.kt:382

@Him188
Copy link
Member

Him188 commented Jan 1, 2021

在 QQAndroidBot close 或 QQAndroidBotNetworkHandler close 时有同时 close 一些 ContactList 实例（或 clear），（现有对 Bot.friends 和 Bot.groups 的处理）也需要对 Bot.strangers 做这样的处理

network/QQAndroidBotNetworkHandler.kt:382

发现这个PR处理到了

@Him188 Him188 added the z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排 label Jan 1, 2021
@Him188 Him188 merged commit 1117c14 into mamoe:dev Jan 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Him188 Him188 Him188 approved these changes

Assignees
No one assigned
Labels
N 优先级: 一般 t:feature 类型: 新特性 x:protocol 属性: 协议相关 z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排
Projects
None yet
Milestone
2.0-RC
Development

Successfully merging this pull request may close these issues.

支持单向好友会话
3 participants
@sandtechnology @Him188 @Karlatemp