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

允许使用 IPAD 协议发送戳一戳 #1711

Merged
merged 8 commits into from
Jan 6, 2022
Merged

允许使用 IPAD 协议发送戳一戳 #1711

merged 8 commits into from
Jan 6, 2022

Conversation

LaoLittle
Copy link
Contributor

No description provided.

@Him188 Him188 added N 优先级: 一般 t:problem 类型: 不容易归类为特性或 bug 的综合问题 labels Dec 6, 2021
@Him188 Him188 modified the milestones: 2.9.0-RC, 2.10 Dec 6, 2021
Initial-heart-1 and others added 2 commits December 6, 2021 22:06
@Initial-heart-1
修改注释
e345e1d 
“安卓协议”的描述并不准确，ANDROID_PAD 也是安卓协议，但是完全不支持戳一戳
修改进行明确
@LaoLittle
Merge pull request #1 from Initial-heart-1/patch-1
7a5f339 
修改注释
@Him188
Copy link
Member

Him188 commented Dec 9, 2021

测试过了吗

@Him188 Him188 changed the title 修正IPAD无法发送戳一戳的问题 允许使用 IPAD 协议发送戳一戳 Dec 10, 2021
@Him188 Him188 modified the milestones: 2.10, 2.10.0-RC Dec 10, 2021
@LaoLittle
Copy link
Contributor Author

LaoLittle commented Dec 14, 2021 •
edited

测试过了吗

嗯，测试过的

@Karlatemp Karlatemp self-requested a review December 14, 2021 14:08
@Him188 Him188 added the z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排 label Dec 22, 2021
@Him188
Copy link
Member

Him188 commented Dec 22, 2021 •
edited

  • After merge: 在源码注释添加自 2.10 起允许 IPAD 发送

@Him188 Him188 merged commit 0c964f3 into mamoe:dev Jan 6, 2022
strear pushed a commit to strear/mirai that referenced this pull request Feb 21, 2022
@LaoLittle @Initial-heart-1
@Him188 @strear
允许使用 IPAD 协议发送戳一戳 (mamoe#1711)
05a749e 
* 修改注释

* IPAD协议发送戳一戳时不抛出UnsupportedOperationException

* 修改注释

“安卓协议”的描述并不准确，ANDROID_PAD 也是安卓协议，但是完全不支持戳一戳
修改进行明确

* Apply suggestions from code review

* Update Nudge.kt

Co-authored-by: Initial-heart <63091661+Initial-heart-1@users.noreply.github.com>
Co-authored-by: Him188 <Him188@mamoe.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Him188 Him188 Him188 left review comments

@Karlatemp Karlatemp Karlatemp left review comments

Assignees
No one assigned
Labels
N 优先级: 一般 t:problem 类型: 不容易归类为特性或 bug 的综合问题 z:ready-to-merge 状态: PR 已经可以合并, 正在等待一些安排
Projects
2.10.0-RC
Status: Done
Milestone
2.10.0-RC
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@LaoLittle @Him188 @Karlatemp @Initial-heart-1