Skip to content

fix: fix quote message campatibility #50

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

Merged
0honus0 merged 6 commits into from
Jul 15, 2025
Merged

fix: fix quote message campatibility #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b75e35d
feat: store xml in vendor_specific
jiz4oh Jul 15, 2025
f4d80a5
feat: add displayname and content in quoto message
jiz4oh Jul 15, 2025
6089f88
fix: add chatusr in quoto message
jiz4oh Jul 15, 2025
c455e66
refator: move constants
jiz4oh Jul 15, 2025
1dc7825
fix: set chatusr as wxid in group message
jiz4oh Jul 15, 2025
bca0501
feat: set content as proper format
jiz4oh Jul 15, 2025
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
24 changes: 15 additions & 9 deletions efb_wechat_comwechat_slave/ComWechat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import os
import base64
from pathlib import Path
from xml.sax.saxutils import escape

import re
import json
Expand All @@ -32,18 +33,16 @@
from .ChatMgr import ChatMgr
from .CustomTypes import EFBGroupChat, EFBPrivateChat, EFBGroupMember, EFBSystemUser
from .MsgDeco import qutoed_text
from .MsgProcess import MsgProcess
from .MsgProcess import MsgProcess, MsgWrapper
from .Utils import download_file , load_config , load_temp_file_to_local , WC_EMOTICON_CONVERSION
from .Constant import QUOTE_MESSAGE, QUOTE_GROUP_MESSAGE

from rich.console import Console
from rich import print as rprint
from io import BytesIO
from PIL import Image
from pyqrcode import QRCode

QUOTE_MESSAGE = '<?xml version="1.0"?><msg><appmsg appid="" sdkver="0"><title>%s</title><des /><action /><type>57</type><showtype>0</showtype><soundtype>0</soundtype><mediatagname /><messageext /><messageaction /><content /><contentattr>0</contentattr><url /><lowurl /><dataurl /><lowdataurl /><songalbumurl /><songlyric /><appattach><totallen>0</totallen><attachid /><emoticonmd5 /><fileext /><aeskey /></appattach><extinfo /><sourceusername /><sourcedisplayname /><thumburl /><md5 /><statextstr /><refermsg><type>1</type><svrid>%s</svrid><fromusr>%s</fromusr><chatusr /></refermsg></appmsg><fromusername>%s</fromusername><scene>0</scene><appinfo><version>1</version><appname></appname></appinfo><commenturl></commenturl></msg>'
QUOTE_GROUP_MESSAGE = '<?xml version="1.0"?><msg><appmsg appid="" sdkver="0"><title>%s</title><des /><action /><type>57</type><showtype>0</showtype><soundtype>0</soundtype><mediatagname /><messageext /><messageaction /><content /><contentattr>0</contentattr><url /><lowurl /><dataurl /><lowdataurl /><songalbumurl /><songlyric /><appattach><totallen>0</totallen><attachid /><emoticonmd5 /><fileext /><aeskey /></appattach><extinfo /><sourceusername /><sourcedisplayname /><thumburl /><md5 /><statextstr /><refermsg><type>1</type><svrid>%s</svrid><fromusr>%s</fromusr><chatusr>%s</chatusr></refermsg></appmsg><fromusername>%s</fromusername><scene>0</scene><appinfo><version>1</version><appname></appname></appinfo><commenturl></commenturl></msg>'

class ComWeChatChannel(SlaveChannel):
channel_name : str = "ComWechatChannel"
channel_emoji : str = "💻"
Expand Down Expand Up @@ -86,7 +85,8 @@ def __init__(self, instance_id: InstanceID = None):

self.qrcode_timeout = self.config.get("qrcode_timeout", 10)
self.login()
self.wxid = self.bot.GetSelfInfo()["data"]["wxId"]
self.me = self.bot.GetSelfInfo()["data"]
self.wxid = self.me["wxId"]
self.base_path = self.config["base_path"] if "base_path" in self.config else self.bot.get_base_path()
self.dir = self.config["dir"]
if not self.dir.endswith(os.path.sep):
Expand Down Expand Up @@ -501,7 +501,7 @@ def handle_msg(self , msg : Dict[str, Any] , author : 'ChatMember' , chat : 'Cha
self.file_msg[msg["filepath"]] = ( msg , author , chat )
return

self.send_efb_msgs(MsgProcess(msg, chat), author=author, chat=chat, uid=MessageID(str(msg['msgid'])))
self.send_efb_msgs(MsgWrapper(msg["message"], MsgProcess(msg, chat)), author=author, chat=chat, uid=MessageID(str(msg['msgid'])))

def handle_file_msg(self):
while True:
Expand Down Expand Up @@ -533,7 +533,7 @@ def handle_file_msg(self):

if flag:
del self.file_msg[path]
self.send_efb_msgs(MsgProcess(msg, chat), author=author, chat=chat, uid=msg['msgid'])
self.send_efb_msgs(MsgWrapper(msg["message"], MsgProcess(msg, chat)), author=author, chat=chat, uid=MessageID(str(msg['msgid'])))

if len(self.delete_file):
for k in list(self.delete_file.keys()):
Expand Down Expand Up @@ -794,10 +794,16 @@ def send_text(self, wxid: ChatID, msg: Message) -> 'Message':
else:
msgid = msg.target.uid
sender = msg.target.author.uid
displayname = msg.target.author.name
content = escape(msg.target.vendor_specific.get("wx_xml", ""))
if content:
content = "<content>%s</content>" % content
else:
content = "<content />"
if "@chatroom" in msg.author.chat.uid:
xml = QUOTE_GROUP_MESSAGE % (text, msgid, sender, msg.author.chat.uid, self.wxid)
xml = QUOTE_GROUP_MESSAGE % (self.wxid, text, msgid, sender, sender, displayname, content)
else:
xml = QUOTE_MESSAGE % (text, msgid, sender, self.wxid)
xml = QUOTE_MESSAGE % (self.wxid, text, msgid, sender, sender, displayname, content)
return self.bot.SendXml(wxid = wxid , xml = xml, img_path = "")
return self.bot.SendText(wxid = wxid , msg = text)

Expand Down
102 changes: 102 additions & 0 deletions efb_wechat_comwechat_slave/Constant.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
QUOTE_GROUP_MESSAGE="""<msg>
<fromusername>%s</fromusername>
<scene>0</scene>
<commenturl></commenturl>
<appmsg appid="" sdkver="0">
<title>%s</title>
<des></des>
<action>view</action>
<type>57</type>
<showtype>0</showtype>
<content></content>
<url></url>
<dataurl></dataurl>
<lowurl></lowurl>
<lowdataurl></lowdataurl>
<recorditem></recorditem>
<thumburl></thumburl>
<messageaction></messageaction>
<refermsg>
<type>1</type>
<svrid>%s</svrid>
<fromusr>%s</fromusr>
<chatusr>%s</chatusr>
<displayname>%s</displayname>
%s
</refermsg>
<extinfo></extinfo>
<sourceusername></sourceusername>
<sourcedisplayname></sourcedisplayname>
<commenturl></commenturl>
<appattach>
<totallen>0</totallen>
<attachid></attachid>
<emoticonmd5></emoticonmd5>
<fileext></fileext>
<aeskey></aeskey>
</appattach>
<weappinfo>
<pagepath></pagepath>
<username></username>
<appid></appid>
<appservicetype>0</appservicetype>
</weappinfo>
<websearch />
</appmsg>
<appinfo>
<version>1</version>
<appname>Window wechat</appname>
</appinfo>
</msg>
"""
QUOTE_MESSAGE="""<msg>
<fromusername>%s</fromusername>
<scene>0</scene>
<commenturl></commenturl>
<appmsg appid="" sdkver="0">
<title>%s</title>
<des></des>
<action>view</action>
<type>57</type>
<showtype>0</showtype>
<content></content>
<url></url>
<dataurl></dataurl>
<lowurl></lowurl>
<lowdataurl></lowdataurl>
<recorditem></recorditem>
<thumburl></thumburl>
<messageaction></messageaction>
<refermsg>
<type>1</type>
<svrid>%s</svrid>
<fromusr>%s</fromusr>
<chatusr>%s</chatusr>
<displayname>%s</displayname>
%s
</refermsg>
<extinfo></extinfo>
<sourceusername></sourceusername>
<sourcedisplayname></sourcedisplayname>
<commenturl></commenturl>
<appattach>
<totallen>0</totallen>
<attachid></attachid>
<emoticonmd5></emoticonmd5>
<fileext></fileext>
<aeskey></aeskey>
</appattach>
<weappinfo>
<pagepath></pagepath>
<username></username>
<appid></appid>
<appservicetype>0</appservicetype>
</weappinfo>
<websearch />
</appmsg>
<appinfo>
<version>1</version>
<appname>Window wechat</appname>
</appinfo>
</msg>
"""
10 changes: 10 additions & 0 deletions efb_wechat_comwechat_slave/MsgProcess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,16 @@
from ehforwarderbot import utils as efb_utils
from ehforwarderbot.message import Message

def MsgWrapper(xml, efb_msgs: Union[Message, List[Message]]):
efb_msgs = [efb_msgs] if isinstance(efb_msgs, Message) else efb_msgs
if not efb_msgs:
return
for efb_msg in efb_msgs:
vendor_specific = getattr(efb_msg, "vendor_specific", {})
vendor_specific["wx_xml"] = xml
setattr(efb_msg, "vendor_specific", vendor_specific)
return efb_msgs

def MsgProcess(msg : dict , chat) -> Union[Message, List[Message]]:

if msg["type"] == "text":
Expand Down