feat(quote): support quote messages (#33)

* feat: support reply message by srvid

* feat: add new emoticon conversions

* fix: refer msg is not found if sent from telegram

* feat: support reply the quoted message

* fix: fix list index out of range

* fix: fix variable type

* feat: support ews style qutoed message

* feat: eager load contact list

Author: jiz4oh

efb_wechat_comwechat_slave/ComWechat.py

@@ -11,7 +11,7 @@
 
 import re
 import json
-from ehforwarderbot.chat import SystemChat, PrivateChat , SystemChatMember, ChatMember
+from ehforwarderbot.chat import SystemChat, PrivateChat , SystemChatMember, ChatMember, SelfChatMember
 from typing import Tuple, Optional, Collection, BinaryIO, Dict, Any , Union , List
 from datetime import datetime
 from cachetools import TTLCache
@@ -30,7 +30,7 @@
 
 from .ChatMgr import ChatMgr
 from .CustomTypes import EFBGroupChat, EFBPrivateChat, EFBGroupMember, EFBSystemUser
-from .MsgDeco import efb_text_simple_wrapper
+from .MsgDeco import qutoed_text
 from .MsgProcess import MsgProcess
 from .Utils import download_file , load_config , load_temp_file_to_local , WC_EMOTICON_CONVERSION
 
@@ -565,7 +565,7 @@ def scheduled_job(self):
         count = 1
         while True:
             time.sleep(1)
-            if count % 1800 == 0:
+            if count % 1800 == 1:
                 self.GetGroupListBySql()
                 self.GetContactListBySql()
                 count = 1
@@ -695,7 +695,15 @@ def send_message(self, msg : Message) -> Message:
                 else:
                     self.bot.SendText(wxid = chat_uid , msg = msg.text)
             else:
-                res = self.bot.SendText(wxid = chat_uid , msg = msg.text)
+                text = msg.text
+                if isinstance(msg.target, Message):
+                        qt_txt = msg.target.text or msg.target.type.name
+                        if self.group_members.get(msg.chat.uid, None) is not None and not isinstance(msg.target.author, SelfChatMember):
+                            tgt_alias = "@%s\u2005：" % msg.target.author.display_name
+                        else:
+                            tgt_alias = ""
+                        text = qutoed_text(qt_txt, msg.text, tgt_alias)
+                res = self.bot.SendText(wxid = chat_uid , msg = text)
         elif msg.type in [MsgType.Link]:
             self.bot.SendText(wxid = chat_uid , msg = msg.text)
         elif msg.type in [MsgType.Image , MsgType.Sticker]:

efb_wechat_comwechat_slave/MsgDeco.py

@@ -8,6 +8,14 @@
 from ehforwarderbot import MsgType, Chat
 from ehforwarderbot.chat import ChatMember
 from ehforwarderbot.message import Substitutions, Message, LinkAttribute, LocationAttribute
+from ehforwarderbot.types import MessageID
+
+QUOTE_DIVIDER = " - - - - - - - - - - - - - - - "
+
+def qutoed_text(qutoed_text: str, text: str, prefix: str = "") -> str:
+    if QUOTE_DIVIDER in qutoed_text:
+        qutoed_text = qutoed_text.split(QUOTE_DIVIDER)[-1]
+    return f"「{prefix}{qutoed_text}」\n{QUOTE_DIVIDER}\n{text}"
 
 def efb_text_simple_wrapper(text: str, ats: Union[Mapping[Tuple[int, int], Union[Chat, ChatMember]], None] = None) -> Message:
     """
@@ -138,7 +146,7 @@ def efb_mp_post_wrapper(item: etree.Element, show_name: str = None) -> Message:
         text=f'{title}\n  - - - - - - - - - - - - - - - \n{digest}' if digest else str(title),
     )
 
-def efb_share_link_wrapper(text: str) -> Message:
+def efb_share_link_wrapper(message: dict, chat) -> Message:
     """
     处理msgType49消息 - 复合xml, xml 中 //appmsg/type 指示具体消息类型.
     /msg/appmsg/type
@@ -164,10 +172,11 @@ def efb_share_link_wrapper(text: str) -> Message:
     //appmsg/type = 74 : 文件 (收到文件的第一个提示)
     //appmsg/type = 87 : 群公告
     //appmsg/type = 2000 : 转账
-    :param text: The content of the message
+    :param message: The message
     :return: EFB Message
     """
 
+    text: str = message['message']
     xml = etree.fromstring(text)
     result_text = ""
     try:
@@ -383,19 +392,43 @@ def efb_share_link_wrapper(text: str) -> Message:
         elif type == 57: # 引用（回复）消息
             msg = xml.xpath('/msg/appmsg/title/text()')[0]
             refer_msgType = int(xml.xpath('/msg/appmsg/refermsg/type/text()')[0]) # 被引用消息类型
+            e = xml.xpath('/msg/appmsg/refermsg/svrid/text()') # 被引用消息 id
+            refer_svrid = len(e) > 0 and e[0] or None
             # refer_fromusr = xml.xpath('/msg/appmsg/refermsg/fromusr/text()')[0] # 被引用消息所在房间
-            # refer_fromusr = xml.xpath('/msg/appmsg/refermsg/chatusr/text()')[0] # 被引用消息发送人微信号
-            refer_displayname = xml.xpath('/msg/appmsg/refermsg/displayname/text()')[0] # 被引用消息发送人微信名称
-            if refer_msgType == 1: # 被引用的消息是文本
-                refer_content = xml.xpath('/msg/appmsg/refermsg/content/text()')[0] # 被引用消息内容
-                result_text += f"「{refer_displayname}: {refer_content}」\n  - - - - - - - - - - - - - - - \n{msg}"
-            else: # 被引用的消息非文本，提示不支持
-                result_text += f"「{refer_displayname}: 系统消息: 被引用的消息不是文本,暂不支持展示」\n  - - - - - - - - - - - - - - - \n{msg}"
+            e = xml.xpath('/msg/appmsg/refermsg/chatusr/text()') # 被引用消息发送人微信号
+            refer_chatusr = len(e) > 0 and e[0] or None
+            e = xml.xpath('/msg/appmsg/refermsg/displayname/text()') # 被引用消息发送人微信名称
+            refer_displayname = len(e) > 0 and e[0] or refer_chatusr
             efb_msg = Message(
                 type=MsgType.Text,
-                text=result_text,
+                text=msg,
                 vendor_specific={ "is_refer": True }
             )
+            prefix = ""
+            if refer_displayname is not None:
+                prefix = f"{refer_displayname}:"
+            if refer_svrid is None or refer_chatusr == message["self"]:
+                if refer_msgType == 1: # 被引用的消息是文本
+                    refer_content = xml.xpath('/msg/appmsg/refermsg/content/text()')[0] # 被引用消息内容
+                    result_text = qutoed_text(refer_content, msg, prefix)
+                elif refer_msgType == 49: # 被引用的消息也是引用消息
+                    try:
+                        refer_msg_content = xml.xpath('/msg/appmsg/refermsg/content/text()')[0] # 被引用消息引用的消息
+                        refer_msg_xml = etree.fromstring(refer_msg_content)
+                        type = int(refer_msg_xml.xpath('/msg/appmsg/type/text()')[0])
+                        if type == 57:
+                            refer_msg_text = refer_msg_xml.xpath('/msg/appmsg/title/text()')[0]
+                            result_text = qutoed_text(refer_msg_text, msg, prefix)
+                    except Exception as e:
+                        print_exc()
+                else: # 被引用的消息非文本，提示不支持
+                    result_text = qutoed_text(" 系统消息: 被引用的消息不是文本,暂不支持展示", msg, prefix)
+                efb_msg.text = result_text
+            else:
+                efb_msg.target = Message(
+                    uid=MessageID(refer_svrid),
+                    chat=chat,
+                )
         elif type == 63: # 直播（微信视频号分享）
             title = xml.xpath('/msg/appmsg/title/text()')[0]
             url = xml.xpath('/msg/appmsg/url/text()')[0]
@@ -634,4 +667,4 @@ def efb_other_wrapper(text: str) -> Union[Message, None]:
     if efb_msg:
         return efb_msg
     else:
-        return None
+        return None

efb_wechat_comwechat_slave/MsgProcess.py

@@ -49,7 +49,7 @@ def MsgProcess(msg : dict , chat) -> Union[Message, List[Message]]:
         if ("FileStorage" in msg["filepath"]) and ("Cache" not in msg["filepath"]):
             file = load_local_file_to_temp(msg["filepath"])
             return efb_file_wrapper(file , msg["filepath"].split("/")[-1])
-        return efb_share_link_wrapper(msg['message'])  # may return msgs in a list
+        return efb_share_link_wrapper(msg, chat)  # may return msgs in a list
 
     elif msg["type"] == "voice":
         file = convert_silk_to_mp3(load_local_file_to_temp(msg["filepath"]))

efb_wechat_comwechat_slave/Utils.py

@@ -187,8 +187,8 @@ def convert_silk_to_mp3(file : tempfile) -> tempfile:
     '[月亮]': '🌃', '[Moon]': '🌃',
     '[太阳]': '🌞', '[Sun]': '🌞',
     '[拥抱]': '🤗', '[Hug]': '🤗',
-    '[强]': '👍', '[Strong]': '👍',
-    '[弱]': '👎', '[Weak]': '👎',
+    '[强]': '👍', '[Strong]': '👍', '[ThumbsUp]': '👍',
+    '[弱]': '👎', '[Weak]': '👎', '[ThumbsDown]': '👎',
     '[握手]': '🤝', '[Shake]': '🤝',
     '[胜利]': '✌️', '[Victory]': '✌️',
     '[抱拳]': '🙏', '[Salute]': '🙏',