From 77bc60e462f08c29edae29a16fe96f7bb71aa9a5 Mon Sep 17 00:00:00 2001
From: Charles <1140601003@qq.com>
Date: Wed, 16 Aug 2023 10:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
id.xml | 11 +++++++++++
wechatbot_client/com_wechat/message.py | 11 +++++++++--
wechatbot_client/onebot12/event.py | 6 +++++-
3 files changed, 25 insertions(+), 3 deletions(-)
create mode 100644 id.xml
diff --git a/id.xml b/id.xml
new file mode 100644
index 0000000..d459d53
--- /dev/null
+++ b/id.xml
@@ -0,0 +1,11 @@
+{"extrainfo":"
+\\n\\t\\n\\t\\t2\\n\\t\\n\\n
+\\n\\t1\\n\\t255\\n\\t
+ v1_OLvB7bI7\\n\\t\\n\\t\\t\\n\\t\\n\\n","filepath":"","isSendMsg":0,"message":"
+
+
+","msgid":1808215118870293793,"pid":184400,"self":"wxid_xq2w7jl6cbi811","sender":"43228505841@chatroom","sign":"d3f4881c234df93f914937a4703ae751","thumb_path":"","time":"2023-08-16
+10:05:57","timestamp":1692151557,"type":47,"wxid":"wxid_ludsalz9bgp322"}\n
\ No newline at end of file
diff --git a/wechatbot_client/com_wechat/message.py b/wechatbot_client/com_wechat/message.py
index 192fd92..223ab8f 100644
--- a/wechatbot_client/com_wechat/message.py
+++ b/wechatbot_client/com_wechat/message.py
@@ -146,6 +146,12 @@ def handle_text(self, msg: WechatMessage) -> E:
else:
at_xml = None
event_id = str(uuid4())
+
+ #向onebotv12是否自我发送
+ if msg.isSendMsg:
+ isSendMsg = True
+ else:
+ isSendMsg = False
if at_xml is None:
# 没有at
# 获取message
@@ -161,9 +167,9 @@ def handle_text(self, msg: WechatMessage) -> E:
alt_message=str(message),
user_id=msg.wxid,
group_id=msg.sender,
+ isSendMsg=isSendMsg
)
- if msg.isSendMsg:
- msg.wxid = msg.self
+
return PrivateMessageEvent(
id=event_id,
time=msg.timestamp,
@@ -172,6 +178,7 @@ def handle_text(self, msg: WechatMessage) -> E:
message=message,
alt_message=str(message),
user_id=msg.wxid,
+ isSendMsg =isSendMsg
)
# 获取at
diff --git a/wechatbot_client/onebot12/event.py b/wechatbot_client/onebot12/event.py
index 0e41689..8e3f69c 100644
--- a/wechatbot_client/onebot12/event.py
+++ b/wechatbot_client/onebot12/event.py
@@ -58,6 +58,10 @@ class MessageEvent(Event):
"""消息替代表示"""
user_id: str
"""用户id"""
+
+ isSendMsg: bool
+ """判断是否自我发送"""
+
class PrivateMessageEvent(MessageEvent):
@@ -65,7 +69,6 @@ class PrivateMessageEvent(MessageEvent):
detail_type: Literal["private"] = "private"
-
class GroupMessageEvent(MessageEvent):
"""群消息"""
@@ -74,6 +77,7 @@ class GroupMessageEvent(MessageEvent):
"""群聊id"""
+
class NoticeEvent(Event):
"""通知事件"""