Merge branch 'dev' of https://github.com/Dituon/petpet into dev

Dituon · Jan 25, 2025 · d7e71bd · d7e71bd
2 parents 7f48588 + bf819c1
commit d7e71bd
Showing 1 changed file with 16 additions and 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
@@ -38,10 +38,22 @@ public void handleNudge() {
 
         @Override
         protected RequestContext buildRequestContext() {
-            List<QQMessageElement.ResizeableImageElement> imageList = List.of(
-                    QQMessageElement.AtElement.from(getTargetId(), getTargetName()), // Target
-                    QQMessageElement.AtElement.from(getSenderId(), getSenderName()) // Sender
-            );
+            List<QQMessageElement.ResizeableImageElement> 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);