修复戳一戳，同时阻止自身的戳一戳回调

src/recv_handler/notice_handler.py

@@ -165,68 +165,67 @@ class NoticeHandler:
             logger.info("发送到Maibot处理通知信息")
             await message_send_instance.message_send(message_base)
 
-    async def handle_poke_notify(self, raw_message: dict, group_id: int, user_id: int) -> Tuple[Seg | None, UserInfo]:
+    async def handle_poke_notify(self, raw_message: dict, group_id: int, user_id: int) -> Tuple[Seg | None, UserInfo | None]:
         self_info: dict = await get_self_info(self.server_connection)
+
         if not self_info:
             logger.error("自身信息获取失败")
-            return None
+            return None, None
+        
         self_id = raw_message.get("self_id")
         target_id = raw_message.get("target_id")
         target_name: str = None
         raw_info: list = raw_message.get("raw_info")
 
-        # 计算user_info
-        source_name: str = None
-        source_cardname: str = None
-        if group_id:
-            member_info: dict = await get_member_info(self.server_connection, group_id, user_id)
-            if member_info:
-                source_name = member_info.get("nickname")
-                source_cardname = member_info.get("card")
-            else:
-                logger.warning("无法获取戳一戳消息发送者的昵称，消息可能会无效")
-                source_name = "QQ用户"
+        user_qq_info: dict = await get_member_info(
+                    self.server_connection, group_id, user_id
+                )
+        if user_qq_info:
+            user_name = user_qq_info.get("nickname")
+            user_cardname = user_qq_info.get("card")
         else:
-            stranger_info = await get_stranger_info(self.server_connection, user_id)
-            if stranger_info:
-                source_name = stranger_info.get("nickname")
-            else:
-                logger.warning("无法获取戳一戳消息发送者的昵称，消息可能会无效")
-                source_name = "QQ用户"
-
-        user_info: UserInfo = UserInfo(
-            platform=global_config.maibot_server.platform_name,
-            user_id=user_id,
-            user_nickname=source_name,
-            user_cardname=source_cardname,
-        )
+            user_name = "QQ用户"
+            user_cardname = "QQ用户"
+            logger.info("无法获取戳一戳对方的用户昵称")
 
         # 计算Seg
-        if self_id == target_id:
+        if self_id == target_id: # 现在这里应当是专注于处理私聊戳一戳的，也就是说当私聊里，被戳的是另一方时，不会给这个消息。
+            display_name = ""
             target_name = self_info.get("nickname")
+
+        elif self_id == user_id:
+            return None, None # 这应当让ada不发送麦麦戳别人的消息，因为这个消息已经被mmc的命令记录了，没必要记第二次。
+
         else:
-            return None
+            if group_id: # 如果是群聊环境，老实说做这一步判定没啥意义，毕竟私聊是没有其他人之间的戳一戳的，但是感觉可以有这个判定来强限制群聊环境
+                fetched_member_info: dict = await get_member_info(
+                    self.server_connection, group_id, target_id
+                )
+                if fetched_member_info:
+                    target_name = fetched_member_info.get("nickname")
+                else:
+                    target_name = "QQ用户"
+                    logger.info("无法获取被戳一戳方的用户昵称")
+                display_name = user_name
+            else:
+                return None, None
         try:
             first_txt = raw_info[2].get("txt", "戳了戳")
             second_txt = raw_info[4].get("txt", "")
         except Exception as e:
             logger.warning(f"解析戳一戳消息失败: {str(e)}，将使用默认文本")
             first_txt = "戳了戳"
-            second_txt = ""
-        """
-        # 不启用戳其他人的处理
-        else:
-            # 由于Napcat不支持获取昵称，所以需要单独获取
-            group_id = raw_message.get("group_id")
-            fetched_member_info: dict = await get_member_info(
-                self.server_connection, group_id, target_id
-            )
-            if fetched_member_info:
-                target_name = fetched_member_info.get("nickname")
-        """
+
+        user_info: UserInfo = UserInfo(
+            platform=global_config.maibot_server.platform_name,
+            user_id=user_id,
+            user_nickname=user_name,
+            user_cardname=user_cardname,
+        )
+
         seg_data: Seg = Seg(
             type="text",
-            data=f"{first_txt}{target_name}{second_txt}（这是QQ的一个功能，用于提及某人，但没那么明显）",
+            data=f"{display_name}{first_txt}{target_name}{second_txt}（这是QQ的一个功能，用于提及某人，但没那么明显）",
         )
         return seg_data, user_info
 
@@ -503,4 +502,4 @@ class NoticeHandler:
             await asyncio.sleep(1)
 
 
-notice_handler = NoticeHandler()
+notice_handler = NoticeHandler()