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

修复戳一戳 ，机器人误以为有人戳自己 #2844

Merged
merged 5 commits into from
Mar 30, 2024
Merged

修复戳一戳 ，机器人误以为有人戳自己 #2844

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f95b208
修复戳一戳 ，机器人误以为有人戳自己
zhaodice Mar 21, 2024
852a888
Update GroupNotificationProcessor.kt
zhaodice Mar 21, 2024
c609bd1
呃，我简单粗暴写成bot了，应该是group.botAsMemebr
zhaodice Mar 21, 2024
9190808
代码格式fix
zhaodice Mar 21, 2024
e78b847
Apply suggestions from code review
Him188 Mar 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions mirai-core/src/commonMain/kotlin/network/notice/group/GroupNotificationProcessor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ package net.mamoe.mirai.internal.network.notice.group

import io.ktor.utils.io.core.*
import net.mamoe.mirai.contact.NormalMember
import net.mamoe.mirai.contact.UserOrBot
import net.mamoe.mirai.contact.getMember
import net.mamoe.mirai.data.GroupHonorType
import net.mamoe.mirai.event.events.*
Expand Down Expand Up @@ -315,6 +316,7 @@ internal class GroupNotificationProcessor(
}
}


/**
* @see NudgeEvent
* @see MemberHonorChangeEvent
Expand All @@ -324,25 +326,45 @@ internal class GroupNotificationProcessor(
private fun NoticePipelineContext.processGeneralGrayTip(
data: MsgType0x2DC,
) = data.context {

val grayTip = buf.loadAs(TroopTips0x857.NotifyMsgBody.serializer(), 1).optGeneralGrayTip
markAsConsumed()
when (grayTip?.templId) {
// 群戳一戳
10043L, 1133L, 1132L, 1134L, 1135L, 1136L -> {

fun String.findUser(): UserOrBot? {
return if (this == bot.id.toString()) {
group.botAsMember
} else {
this.findMember() ?: this.findFriendOrStranger()
}
}

// group nudge
// 预置数据，服务器将不会提供己方已知消息
val action = grayTip.msgTemplParam["action_str"].orEmpty()
val from = grayTip.msgTemplParam["uin_str1"]?.findMember() ?: group.botAsMember
val target = grayTip.msgTemplParam["uin_str2"]?.findMember() ?: group.botAsMember
val from = grayTip.msgTemplParam["uin_str1"]
val target = grayTip.msgTemplParam["uin_str2"]
val suffix = grayTip.msgTemplParam["suffix_str"].orEmpty()

collected += NudgeEvent(
from = if (from.id == bot.id) bot else from,
target = if (target.id == bot.id) bot else target,
action = action,
suffix = suffix,
subject = group,
)
val fromUser = from?.findUser()
val targetUser = target?.findUser()

if(fromUser == null || targetUser == null){
Him188 marked this conversation as resolved.
Show resolved Hide resolved
markNotConsumed()
logger.debug {
"Cannot find from or target in Transformers528 0x14 template\ntemplId=${grayTip.templId}\nPermList=${grayTip.msgTemplParam.structureToString()}"
}
}else{
Him188 marked this conversation as resolved.
Show resolved Hide resolved
collected += NudgeEvent(
from = fromUser,
target = targetUser,
action = action,
suffix = suffix,
subject = group,
)
}
}
// 群签到/打卡
10036L, 10038L -> {
Expand Down
Loading