EWS: Fix typo, Fix ehForwarderBot#8

ETM: Fallback mechanism for messages with `parse_mode` assigned.

Author: blueset

CONTRIBUTING.md

@@ -20,6 +20,7 @@ If you need help, or want to talk to the authors, feel free to chat with us at o
 * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
 * **Explain which behavior you expected to see instead and why.**
 * **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
+* **Provide log related to the issue.** Use `python3 main.py -vv` to start the logging process, and submit the entire log from the first step you performed.
 
 Provide more context by answering these questions:
 
@@ -32,6 +33,9 @@ Include details about your configuration and environment:
 * **What's the name and version of the OS you're using?**
 * **Which channel caused the problem?** Or did the framework cause it?
 
+!!! attention
+    When submitting your log, please remember to hide your private information.
+
 ## Suggesting enhancements
 
 If you have any suggestions, feel free to raise it up in the issue list. Please try to provide as much details as you can, that includes:

docs/CONTRIBUTING.md

@@ -20,6 +20,7 @@ If you need help, or want to talk to the authors, feel free to chat with us at o
 * **Describe the behavior you observed after following the steps** and point out what exactly is the problem with that behavior.
 * **Explain which behavior you expected to see instead and why.**
 * **If the problem wasn't triggered by a specific action**, describe what you were doing before the problem happened and share more information using the guidelines below.
+* **Provide log related to the issue.** Use `python3 main.py -vv` to start the logging process, and submit the entire log from the first step you performed.
 
 Provide more context by answering these questions:
 

docs/EWS.md

@@ -1,6 +1,6 @@
 # EFB WeChat Slave Channel
 
-EFB WeChat Slave Channel is a slave channel for EFB based on [ItChat](https://github.com/littlecodersh/ItChat) and WeChat Web <span style="font-size: 0.5em;">(rev.eng.)</span> API.
+EFB WeChat Slave (EWS) is a slave channel for EFB based on [ItChat](https://github.com/littlecodersh/ItChat) and WeChat Web <span style="font-size: 0.5em;">(rev.eng.)</span> API.
 
 ## Specs
 * Unique name: `eh_wechat_slave`

plugins/eh_telegram_master/__init__.py

@@ -236,21 +236,31 @@ def process_msg(self, msg):
                 if tg_chat_assoced and append_last_msg:
                     self.logger.debug("%s, process_msg_step_3_0_1", xid)
                     msg.text = "%s\n%s" % (last_msg.text, msg.text)
-                    tg_msg = self.bot.bot.editMessageText(chat_id=tg_dest,
-                                                          message_id=last_msg.master_msg_id.split(".", 1)[1],
-                                                          text=msg_template % msg.text,
-                                                          parse_mode=parse_mode)
+                    try:
+                        tg_msg = self.bot.bot.editMessageText(chat_id=tg_dest,
+                                                              message_id=last_msg.master_msg_id.split(".", 1)[1],
+                                                              text=msg_template % msg.text,
+                                                              parse_mode=parse_mode)
+                    except telegram.error.BadRequest:
+                        tg_msg = self.bot.bot.editMessageText(chat_id=tg_dest,
+                                                              message_id=last_msg.master_msg_id.split(".", 1)[1],
+                                                              text=msg_template % msg.text)
                 else:
                     self.logger.debug("%s, process_msg_step_3_0_3", xid)
-                    tg_msg = self.bot.bot.sendMessage(tg_dest, text=msg_template % msg.text, parse_mode=parse_mode)
+                    try:
+                        tg_msg = self.bot.bot.sendMessage(tg_dest, text=msg_template % msg.text, parse_mode=parse_mode)
+                    except telegram.error.BadRequest:
+                        tg_msg = self.bot.bot.sendMessage(tg_dest, text=msg_template % msg.text)
                     self.logger.debug("%s, process_msg_step_3_0_4, tg_msg = %s", xid, tg_msg)
                 self.logger.debug("%s, process_msg_step_3_1", xid)
             elif msg.type == MsgType.Link:
-                self.logger.info("Link msg:\n%s\n%s\n%s", msg.attributes["url"], msg.attributes["title"], msg.attributes['description'])
                 text = "🔗 <a href=\"%s\">%s</a>\n%s" % (urllib.parse.quote(msg.attributes["url"], safe="?=&#:/"),
                                                          html.escape(msg.attributes["title"]),
                                                          html.escape(msg.attributes["description"]))
-                tg_msg = self.bot.bot.sendMessage(tg_dest, text=msg_template % text, parse_mode="HTML")
+                try:
+                    tg_msg = self.bot.bot.sendMessage(tg_dest, text=msg_template % text, parse_mode="HTML")
+                except telegram.error.BadRequest:
+                    tg_msg = self.bot.bot.sendMessage(tg_dest, text=msg_template % msg.text)
             elif msg.type in [MsgType.Image, MsgType.Sticker]:
                 self.logger.debug("%s, process_msg_step_3_2", xid)
                 self.logger.info("Received %s \nPath: %s\nSize: %s\nMIME: %s", msg.type, msg.path,
@@ -751,6 +761,7 @@ def msg(self, bot, update):
             return self._reply_error(bot, update, "Internal error: Channel not found.")
         try:
             m = EFBMsg(self)
+            m.uid = "%s.%s" % (update.message.chat.id, update.message.message_id)
             mtype = get_msg_type(update.message)
             # Chat and author related stuff
             m.origin['uid'] = update.message.from_user.id

plugins/eh_wechat_slave.py

@@ -21,12 +21,13 @@ def incomeMsgMeta(func):
     def wcFunc(self, msg, isGroupChat=False):
         logger = logging.getLogger("plugins.eh_wechat_slave.incomeMsgMeta")
         mobj = func(self, msg, isGroupChat)
+        mobj.uid = msg.get("MsgId", time.time())
         me = msg['FromUserName'] == itchat.get_friends()[0]['UserName']
         logger.debug("me, %s", me)
         if me:
             msg['FromUserName'], msg['ToUserName'] = msg['ToUserName'], msg['FromUserName']
         FromUser = self.search_user(UserName=msg['FromUserName']) or \
-                   [{"NickName": "User error. (UE01)", "RemarkName": "User error. (UE01)", "Uin": 0}]
+                   [{"NickName": "Chat not found. (UE01)", "RemarkName": "Chat not found. (UE01)", "Uin": 0}]
         FromUser = FromUser[0]
         logger.debug("From user, %s", FromUser)
         if isGroupChat:
@@ -236,6 +237,13 @@ def search_user(self, UserName=None, uid=None, uin=None, name=None, ActualUserNa
         if all(i is None for i in [UserName, uid, uin, name]):
             raise ValueError("At least one of [UserName, uid, uin, name] should be provided.")
 
+        if UserName in self.SYSTEM_USERNAMES or uin in self.SYSTEM_USERNAMES:
+            sys_chat_id = UserName or uin
+            return [{"UserName": sys_chat_id,
+                     "NickName": "System (%s)" % sys_chat_id,
+                     "RemarkName": "System (%s)" % sys_chat_id,
+                     "Uin": sys_chat_id}]
+
         for i in itchat.get_friends(refresh) + itchat.get_mps(refresh):
             data = {"nickname": i.get('NickName', None),
                     "alias": i.get("RemarkName", None),
@@ -257,7 +265,7 @@ def search_user(self, UserName=None, uid=None, uin=None, name=None, ActualUserNa
                     "uin": i.get("Uin", None)}
             for j in fallback_order:
                 if str(crc32(data[j.lower()].encode("utf-8"))) == uid:
-                    result.append(j.copy())
+                    result.append(i.copy())
             if str(i.get('Uin', '')) == uin or \
                str(i.get('NickName', '')) == name or \
                str(i.get('DisplayName', '')) == name or \
@@ -719,7 +727,7 @@ def uin_rate(self, param=""):
 
     def add_friend(self, UserName=None, status=2, ticket="", UserInfo={}):
         if not UserName:
-            return "Username is empty. (UE01)"
+            return "Username is empty. (UE02)"
         try:
             itchat.add_friend(UserName, status, ticket, UserInfo)
             return "Success."
@@ -734,13 +742,14 @@ def get_chats(self, group=True, user=True):
             t[0]['NickName'] = "File Helper"
             t[0]['UserName'] = "filehelper"
             t[0]['RemarkName'] = ""
+            t[0]['Uin'] = "filehelper"
             for i in t:
                 r.append({
                     'channel_name': self.channel_name,
                     'channel_id': self.channel_id,
                     'name': i['NickName'],
                     'alias': i['RemarkName'] or i['NickName'],
-                    'uid': self.get_uid(NickName=i['NickName'], alias=i.get("RemarkName", None), Uin=i.get("Uin", None)),
+                    'uid': self.get_uid(UserName=i['UserName'], NickName=i['NickName'], alias=i.get("RemarkName", None), Uin=i.get("Uin", None)),
                     'type': MsgSource.User
                 })
         if group: