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.

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

Support detect official bot, fix #439 #810

Merged
merged 9 commits into from
Jan 20, 2021
Merged

Conversation

sandtechnology
Copy link
Collaborator

No description provided.

@Him188 Him188 added t:feature 类型: 新特性 N 优先级: 一般 x:protocol 属性: 协议相关 labels Jan 4, 2021
@Him188 Him188 added this to the 2.1.0 milestone Jan 4, 2021
@Him188 Him188 linked an issue Jan 12, 2021 that may be closed by this pull request
@Him188 Him188 added the z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排 label Jan 14, 2021
@Him188
Copy link
Member

Him188 commented Jan 20, 2021

@sandtechnology 请更新 dev 分支的修改

# Conflicts:
#	mirai-core-api/src/commonMain/kotlin/data/MemberInfo.kt
#	mirai-core/src/commonMain/kotlin/contact/MemberInfoImpl.kt
@sandtechnology
Copy link
Collaborator Author

@Him188 OK了

@Him188 Him188 merged commit 3a5d707 into mamoe:dev Jan 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
N 优先级: 一般 t:feature 类型: 新特性 x:protocol 属性: 协议相关 z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排
Projects
None yet
Development

Successfully merging this pull request may close these issues.

支持官方机器人入群/退群处理
3 participants