From 49387950607234db5ea8b599a2b267a19643b6b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=8F=E5=BD=B1?= Date: Sat, 25 Jan 2025 01:43:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(Bot):=20=E4=BF=AE=E5=A4=8D=E6=88=B3?= =?UTF-8?q?=E4=B8=80=E6=88=B3=E7=9B=AE=E6=A0=87=E9=94=99=E8=AF=AF=20&=20?= =?UTF-8?q?=E5=AF=B9=E7=89=B9=E6=AE=8A=E6=83=85=E5=86=B5=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bot/qq/handler/QQNudgeEventHandler.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/bot/shared/src/main/java/moe/dituon/petpet/bot/qq/handler/QQNudgeEventHandler.java b/bot/shared/src/main/java/moe/dituon/petpet/bot/qq/handler/QQNudgeEventHandler.java index c394f930..18383058 100644 --- a/bot/shared/src/main/java/moe/dituon/petpet/bot/qq/handler/QQNudgeEventHandler.java +++ b/bot/shared/src/main/java/moe/dituon/petpet/bot/qq/handler/QQNudgeEventHandler.java @@ -38,10 +38,22 @@ public void handleNudge() { @Override protected RequestContext buildRequestContext() { - List imageList = List.of( - QQMessageElement.AtElement.from(getTargetId(), getTargetName()), // Target - QQMessageElement.AtElement.from(getSenderId(), getSenderName()) // Sender - ); + List imageList; + String BotId = getBotId(); + String SenderId = getSenderId(); + String TargetId = getTargetId(); + if (BotId.equals(TargetId) || SenderId.equals(TargetId)){ + //特殊情况：戳Bot或戳自己 + imageList = List.of( + QQMessageElement.AtElement.from(getBotId(), getBotName()), // Sender + QQMessageElement.AtElement.from(getSenderId(), getSenderName()) // Target + ); + } else { + imageList = List.of( + QQMessageElement.AtElement.from(getSenderId(), getSenderName()), // Sender + QQMessageElement.AtElement.from(getTargetId(), getTargetName()) // Target + ); + } // 构建 imageUrlMap 和 textMap return buildRequestContext(imageList);